diff --git a/.gitignore b/.gitignore index 0ff9bf6..996394a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ build/ # Local configuration file (sdk path, etc) local.properties +*.DS_Store # Proguard folder generated by Eclipse proguard/ diff --git a/app/src/main/res/drawable-hdpi/mdpi_test.xml b/app/src/main/res/drawable-hdpi/mdpi_test.xml new file mode 100644 index 0000000..d660c37 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/mdpi_test.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/design/assets/Air Plant.png b/app/src/main/res/drawable-mdpi/Air_Plant.png similarity index 100% rename from design/assets/Air Plant.png rename to app/src/main/res/drawable-mdpi/Air_Plant.png diff --git a/design/assets/Bike.png b/app/src/main/res/drawable-mdpi/Bike.png similarity index 100% rename from design/assets/Bike.png rename to app/src/main/res/drawable-mdpi/Bike.png diff --git a/design/assets/F Train.png b/app/src/main/res/drawable-mdpi/F_Train.png similarity index 100% rename from design/assets/F Train.png rename to app/src/main/res/drawable-mdpi/F_Train.png diff --git a/design/assets/Grocery Bag.png b/app/src/main/res/drawable-mdpi/Grocery_Bag.png similarity index 100% rename from design/assets/Grocery Bag.png rename to app/src/main/res/drawable-mdpi/Grocery_Bag.png diff --git a/design/assets/Air Plant@2x.png b/app/src/main/res/drawable-xhdpi/air_plant.png similarity index 100% rename from design/assets/Air Plant@2x.png rename to app/src/main/res/drawable-xhdpi/air_plant.png diff --git a/design/assets/Bike@2x.png b/app/src/main/res/drawable-xhdpi/bike.png similarity index 100% rename from design/assets/Bike@2x.png rename to app/src/main/res/drawable-xhdpi/bike.png diff --git a/design/assets/F Train@2x.png b/app/src/main/res/drawable-xhdpi/f_train.png similarity index 100% rename from design/assets/F Train@2x.png rename to app/src/main/res/drawable-xhdpi/f_train.png diff --git a/design/assets/Grocery Bag@2x.png b/app/src/main/res/drawable-xhdpi/grocery_bag.png similarity index 100% rename from design/assets/Grocery Bag@2x.png rename to app/src/main/res/drawable-xhdpi/grocery_bag.png diff --git a/app/src/main/res/drawable-xhdpi/mdpi_test.xml b/app/src/main/res/drawable-xhdpi/mdpi_test.xml new file mode 100644 index 0000000..a010ebd --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/mdpi_test.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7abaa09..79fc7ca 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -56,6 +56,7 @@ style="@style/MirrorText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:drawableRight="@drawable/bike" tools:text="Don't Bike Today" /> sans-serif-light - right + right|center_vertical 16dp