From 7be71ba4f85481738c24073cd77880b0e540117e Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 29 Apr 2016 07:44:06 -0400
Subject: [PATCH] Fix icon colors and remove some warnings

---
 app/src/main/res/layout/show_habit.xml | 13 +++++++++----
 app/src/main/res/values/attrs.xml      |  2 ++
 app/src/main/res/values/styles.xml     |  5 +++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/show_habit.xml b/app/src/main/res/layout/show_habit.xml
index 98fbf51b8..3316e5e2b 100644
--- a/app/src/main/res/layout/show_habit.xml
+++ b/app/src/main/res/layout/show_habit.xml
@@ -42,6 +42,9 @@
             android:orientation="vertical"
             android:paddingBottom="10dp"
             android:paddingLeft="60dp"
+            android:paddingStart="60dp"
+            android:paddingRight="10dp"
+            android:paddingEnd="10dp"
             android:paddingTop="15dp">
 
             <TextView
@@ -65,15 +68,16 @@
                     android:layout_width="18dp"
                     android:layout_height="18dp"
                     android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:alpha="0.3"
-                    android:src="@drawable/ic_repeat_black"
+                    android:src="?iconFrequency"
                     />
 
                 <TextView
                     android:id="@+id/frequencyLabel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Every day"
+                    android:text="@string/every_day"
                     android:textColor="?mediumContrastTextColor"
                     android:textSize="@dimen/smallTextSize"
                     />
@@ -83,9 +87,11 @@
                     android:layout_width="18dp"
                     android:layout_height="18dp"
                     android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:alpha="0.3"
-                    android:src="@drawable/ic_alarm_black"
+                    android:src="?iconReminder"
                     />
 
                 <TextView
@@ -93,7 +99,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingTop="1dp"
-                    android:text="7:30"
                     android:textColor="?mediumContrastTextColor"
                     android:textSize="@dimen/smallTextSize"
                     />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 014ed2c09..3fcf43e96 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -41,6 +41,8 @@
     <attr name="iconEdit" format="reference"/>
     <attr name="iconUnarchive" format="reference"/>
     <attr name="dialogIconChangeColor" format="reference"/>
+    <attr name="iconReminder" format="reference"/>
+    <attr name="iconFrequency" format="reference"/>
 
     <attr name="toolbarPopupTheme" format="reference"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b77721581..40af7448f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,6 +56,8 @@
         <item name="iconEdit">@drawable/ic_action_edit_dark</item>
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="iconFrequency">@drawable/ic_repeat_black</item>
+        <item name="iconReminder">@drawable/ic_alarm_black</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
@@ -106,6 +108,9 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="iconFrequency">@drawable/ic_repeat_white</item>
+        <item name="iconReminder">@drawable/ic_alarm_white</item>
+
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
 
         <item name="palette">@array/darkPalette</item>