From 3cbfabe287df13d63a9b71680febd9c6ef04a3d6 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 23 Jun 2016 16:55:42 -0500
Subject: [PATCH] Remove more style attributes

---
 src/main/res/layout/control_set_title.xml    |  2 +-
 src/main/res/layout/fragment_comment_bar.xml |  2 +-
 src/main/res/values/attrs.xml                |  4 ----
 src/main/res/values/styles.xml               | 19 +++++++------------
 src/main/res/values/theme_base_dark.xml      |  4 ----
 src/main/res/values/theme_base_light.xml     |  4 ----
 6 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index 1f7623f51..de1a66149 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -33,7 +33,7 @@
             android:id="@+id/title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/asEditTextBackground"
+            android:background="@null"
             android:freezesText="true"
             android:hint="@string/TEA_title_hint"
             android:imeOptions="flagNoExtractUi"
diff --git a/src/main/res/layout/fragment_comment_bar.xml b/src/main/res/layout/fragment_comment_bar.xml
index 5c5bf7746..b5313c87f 100644
--- a/src/main/res/layout/fragment_comment_bar.xml
+++ b/src/main/res/layout/fragment_comment_bar.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_weight="100"
-        android:background="?attr/asEditTextBackground"
+        android:background="@null"
         android:freezesText="true"
         android:hint="@string/TVA_add_comment"
         android:imeOptions="flagNoExtractUi|actionDone"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 01f5a6fca..b69c54bde 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -11,10 +11,6 @@
     <attr name="asContentBackground" format="color" />
     <attr name="asTextColor" format="color" />
     <attr name="asTextColorHint" format="color" />
-    <attr name="asDetailsColor" format="color" />
-    <attr name="asDueDateColor" format="color" />
-    <attr name="asDueDateCompletedColor" format="color" />
-    <attr name="asEditTextBackground" format="reference" />
     <attr name="popup_theme" format="reference" />
 
     <attr name="alpha_primary" format="dimension" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 545fc068e..1ef00fead 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -92,21 +92,16 @@
 
     <style name="task_list_container"/>
 
-    <style name="TextAppearance.TAd_ItemTitle">
-        <item name="android:textColorLink">#ff88aaff</item>
-    </style>
-    
+    <style name="TextAppearance.TAd_ItemTitle"/>
+
     <style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle">
-        <item name="android:textColor">#ff555555</item>
-    </style>
-    
-    <style name="TextAppearance.TAd_ItemDetails">
-        <item name="android:textColor">?attr/asDetailsColor</item>
-        <item name="android:textColorLink">#ff88aaff</item>
+        <item name="android:textColor">?android:attr/textColorHint</item>
     </style>
     
+    <style name="TextAppearance.TAd_ItemDetails"/>
+
     <style name="TextAppearance.TAd_ItemDueDate" parent="TextAppearance.TAd_ItemDetails">
-        <item name="android:textColor">?attr/asDueDateColor</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
     
     <style name="TextAppearance.TAd_ItemDueDate_Overdue" parent="TextAppearance.TAd_ItemDueDate">
@@ -114,7 +109,7 @@
     </style>
     
     <style name="TextAppearance.TAd_ItemDueDate_Completed" parent="TextAppearance.TAd_ItemDueDate">
-        <item name="android:textColor">?attr/asDueDateCompletedColor</item>
+        <item name="android:textColor">?android:attr/textColorHint</item>
     </style>
 
     <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
diff --git a/src/main/res/values/theme_base_dark.xml b/src/main/res/values/theme_base_dark.xml
index 27d832f14..87a9961ed 100644
--- a/src/main/res/values/theme_base_dark.xml
+++ b/src/main/res/values/theme_base_dark.xml
@@ -4,16 +4,12 @@
     <style name="DarkBase" parent="Theme.AppCompat.NoActionBar">
         <item name="popup_theme">@style/ThemeOverlay.AppCompat</item>
         <item name="android:windowBackground">@color/md_dark_background</item>
-        <item name="asEditTextBackground">@null</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="drawer_background">@color/drawer_background_dark</item>
         <item name="drawer_background_selected">@color/drawer_background_selected_dark</item>
-        <item name="asDueDateCompletedColor">#ff777777</item>
         <item name="asContentBackground">@color/md_dark_background</item>
         <item name="asTextColor">@android:color/white</item>
         <item name="asTextColorHint">@android:color/darker_gray</item>
-        <item name="asDetailsColor">#6666aa</item>
-        <item name="asDueDateColor">#c3c3c3</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/DialogBaseDark</item>
diff --git a/src/main/res/values/theme_base_light.xml b/src/main/res/values/theme_base_light.xml
index a3895e37a..29834a3f1 100644
--- a/src/main/res/values/theme_base_light.xml
+++ b/src/main/res/values/theme_base_light.xml
@@ -4,16 +4,12 @@
     <style name="LightBase" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="android:windowBackground">@color/md_light_background</item>
-        <item name="asEditTextBackground">@null</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="drawer_background">@color/drawer_background</item>
         <item name="drawer_background_selected">@color/drawer_background_selected</item>
-        <item name="asDueDateCompletedColor">#ff777777</item>
         <item name="asContentBackground">@color/md_light_background</item>
         <item name="asTextColor">@android:color/black</item>
         <item name="asTextColorHint">@android:color/darker_gray</item>
-        <item name="asDetailsColor">#6666aa</item>
-        <item name="asDueDateColor">#878787</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/LightDialogBase</item>