From aab67bd3f9cbf24cdfaba4b03aeaacc2ab46ea44 Mon Sep 17 00:00:00 2001
From: Hannah Mittelstaedt <hannahmittel@gmail.com>
Date: Sun, 23 Aug 2015 13:37:12 -0400
Subject: [PATCH] Fixed drawable folders

---
 .gitignore                                          |   1 +
 app/src/main/res/drawable-hdpi/mdpi_test.xml        |   4 ++++
 .../src/main/res/drawable-mdpi/Air_Plant.png        | Bin
 .../src/main/res/drawable-mdpi}/Bike.png            | Bin
 .../src/main/res/drawable-mdpi/F_Train.png          | Bin
 .../src/main/res/drawable-mdpi/Grocery_Bag.png      | Bin
 .../src/main/res/drawable-xhdpi/air_plant.png       | Bin
 .../src/main/res/drawable-xhdpi/bike.png            | Bin
 .../src/main/res/drawable-xhdpi/f_train.png         | Bin
 .../src/main/res/drawable-xhdpi/grocery_bag.png     | Bin
 app/src/main/res/drawable-xhdpi/mdpi_test.xml       |   4 ++++
 app/src/main/res/layout/activity_main.xml           |   3 +++
 app/src/main/res/values/styles.xml                  |   2 +-
 13 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-hdpi/mdpi_test.xml
 rename design/assets/Air Plant.png => app/src/main/res/drawable-mdpi/Air_Plant.png (100%)
 rename {design/assets => app/src/main/res/drawable-mdpi}/Bike.png (100%)
 rename design/assets/F Train.png => app/src/main/res/drawable-mdpi/F_Train.png (100%)
 rename design/assets/Grocery Bag.png => app/src/main/res/drawable-mdpi/Grocery_Bag.png (100%)
 rename design/assets/Air Plant@2x.png => app/src/main/res/drawable-xhdpi/air_plant.png (100%)
 rename design/assets/Bike@2x.png => app/src/main/res/drawable-xhdpi/bike.png (100%)
 rename design/assets/F Train@2x.png => app/src/main/res/drawable-xhdpi/f_train.png (100%)
 rename design/assets/Grocery Bag@2x.png => app/src/main/res/drawable-xhdpi/grocery_bag.png (100%)
 create mode 100644 app/src/main/res/drawable-xhdpi/mdpi_test.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#0000ff"/>
+</shape>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#00ff00"/>
+</shape>
\ 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" />
 
         <TextView
@@ -70,6 +71,7 @@
             style="@style/MirrorText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:drawableRight="@drawable/air_plant"
             android:text="@string/water_plants" />
 
         <TextView
@@ -77,6 +79,7 @@
             style="@style/MirrorText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:drawableRight="@drawable/grocery_bag"
             android:text="@string/grocery_list" />
 
         <ImageView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d977720..a654ff6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
 
     <style name="MirrorText">
         <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:gravity">right</item>
+        <item name="android:gravity">right|center_vertical</item>
         <item name="android:drawablePadding">16dp</item>
     </style>
 </resources>