From 84fe2b697a818fb2e4747969c93f262eb3cf83b3 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 23 Jun 2016 14:54:14 -0500
Subject: [PATCH] Use foreground color with alpha for dividers

---
 src/main/res/layout/control_set_tag_list.xml  |  7 +++----
 .../res/layout/control_set_timers_dialog.xml  |  6 +-----
 src/main/res/layout/control_set_title.xml     |  3 ++-
 .../res/layout/filter_adapter_separator.xml   |  5 +----
 .../res/layout/filter_adapter_subheader.xml   |  7 ++-----
 src/main/res/layout/fragment_task_list.xml    |  2 +-
 src/main/res/layout/separator.xml             |  4 ----
 .../res/layout/task_adapter_row_simple.xml    |  5 +----
 src/main/res/layout/task_edit_divider.xml     | 14 -------------
 src/main/res/values-v21/styles.xml            |  2 +-
 src/main/res/values/attrs.xml                 |  4 ----
 src/main/res/values/colors.xml                |  1 -
 src/main/res/values/styles.xml                | 21 ++++++++++++-------
 src/main/res/values/theme_base_dark.xml       |  5 -----
 src/main/res/values/theme_base_light.xml      |  5 -----
 15 files changed, 25 insertions(+), 66 deletions(-)
 delete mode 100644 src/main/res/layout/separator.xml
 delete mode 100644 src/main/res/layout/task_edit_divider.xml

diff --git a/src/main/res/layout/control_set_tag_list.xml b/src/main/res/layout/control_set_tag_list.xml
index f343f7adc..92c064276 100644
--- a/src/main/res/layout/control_set_tag_list.xml
+++ b/src/main/res/layout/control_set_tag_list.xml
@@ -21,10 +21,9 @@
       android:layout_marginBottom="5dip" />
   
   <View
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      android:padding="5dip"
-      android:background="@android:drawable/divider_horizontal_dark"/>  
+      style="@style/horizontal_divider"
+      android:padding="5dip" />
+
   <ListView
       android:id="@+id/existingTags"
       android:layout_width="fill_parent"
diff --git a/src/main/res/layout/control_set_timers_dialog.xml b/src/main/res/layout/control_set_timers_dialog.xml
index 1462918c5..1087a3ece 100644
--- a/src/main/res/layout/control_set_timers_dialog.xml
+++ b/src/main/res/layout/control_set_timers_dialog.xml
@@ -36,11 +36,7 @@
              android:textColor="?attr/asTextColor" />
     </LinearLayout>
 
-    <View
-          android:id="@+id/TEA_Separator"
-          android:layout_width="fill_parent"
-          android:layout_height="1px"
-        android:background="?android:attr/listDivider" />
+    <View style="@style/horizontal_divider" />
 
     <!-- elapsed time -->
     <LinearLayout
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index 7f4a113a7..1f7623f51 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -26,6 +26,7 @@
             android:paddingEnd="@dimen/keyline_second"
             android:paddingRight="@dimen/keyline_second"
             android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+            android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
             android:scaleType="center" />
 
         <EditText
@@ -45,7 +46,7 @@
 
     </LinearLayout>
 
-    <include layout="@layout/task_edit_divider" />
+    <View style="@style/horizontal_divider"/>
 
 </LinearLayout>
 
diff --git a/src/main/res/layout/filter_adapter_separator.xml b/src/main/res/layout/filter_adapter_separator.xml
index 2d4793e26..3be3ae357 100644
--- a/src/main/res/layout/filter_adapter_separator.xml
+++ b/src/main/res/layout/filter_adapter_separator.xml
@@ -7,9 +7,6 @@
     android:paddingTop="8dp"
     android:focusable="false">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="?attr/asListDividerColor" />
+    <View style="@style/horizontal_divider" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/filter_adapter_subheader.xml b/src/main/res/layout/filter_adapter_subheader.xml
index 73b4850e8..1b6c8093d 100644
--- a/src/main/res/layout/filter_adapter_subheader.xml
+++ b/src/main/res/layout/filter_adapter_subheader.xml
@@ -5,11 +5,8 @@
     android:orientation="vertical"
     android:paddingTop="8dp">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_gravity="top"
-        android:background="?attr/asListDividerColor" />
+    <View style="@style/horizontal_divider"
+        android:layout_gravity="top" />
 
     <TextView
         android:paddingLeft="@dimen/keyline_first"
diff --git a/src/main/res/layout/fragment_task_list.xml b/src/main/res/layout/fragment_task_list.xml
index 16e7cdfa6..d97c7bf11 100644
--- a/src/main/res/layout/fragment_task_list.xml
+++ b/src/main/res/layout/fragment_task_list.xml
@@ -36,7 +36,7 @@
 
             </FrameLayout>
 
-            <View style="@style/double_pane_divider" />
+            <View style="@style/vertical_divider" />
 
         </LinearLayout>
 
diff --git a/src/main/res/layout/separator.xml b/src/main/res/layout/separator.xml
deleted file mode 100644
index cbae20ae7..000000000
--- a/src/main/res/layout/separator.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/separatorHeight"
-    android:background="?attr/asSeparator" />
diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml
index 9d6a49431..0e6165e79 100644
--- a/src/main/res/layout/task_adapter_row_simple.xml
+++ b/src/main/res/layout/task_adapter_row_simple.xml
@@ -102,9 +102,6 @@
 	
 	</RelativeLayout>
 
-	<View
-		android:layout_width="fill_parent"
-		android:layout_height="1px"
-		android:background="?attr/asListDividerColor" />
+	<View style="@style/horizontal_divider" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/task_edit_divider.xml b/src/main/res/layout/task_edit_divider.xml
deleted file mode 100644
index 710145bf3..000000000
--- a/src/main/res/layout/task_edit_divider.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:paddingTop="@dimen/task_edit_padding_top_bottom"
-    android:layout_marginTop="@dimen/task_edit_padding_top_bottom">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/task_edit_divider"
-        android:layout_gravity="end|bottom" />
-</LinearLayout>
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index b0abd755e..c76b8e7fd 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -4,7 +4,7 @@
     <style name="priority_button" parent="priority_button_base">
     </style>
 
-    <style name="double_pane_divider">
+    <style name="vertical_divider">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">0dp</item>
         <item name="android:visibility">gone</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index a67ca08d0..01f5a6fca 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -8,17 +8,13 @@
     <!-- theme attributes -->
     <attr name="drawer_background" format="color" />
     <attr name="drawer_background_selected" format="color" />
-    <attr name="task_edit_divider" format="color" />
     <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="asSeparator" format="color" />
-    <attr name="asListDividerColor" format="color" />
     <attr name="asEditTextBackground" format="reference" />
-    <attr name="separatorHeight" format="dimension" />
     <attr name="popup_theme" format="reference" />
 
     <attr name="alpha_primary" format="dimension" />
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index f726dd4d7..976c28a8b 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -99,7 +99,6 @@
     <color name="white_text_hint">#eee</color>
     <color name="black_text">#000</color>
     <color name="black_text_hint">#535353</color>
-    <color name="task_edit_divider">#b6b6b6</color>
 
     <color name="importance_1">@color/red_500</color>
     <color name="importance_2">@color/amber_500</color>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 2b0f0178f..545fc068e 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -67,19 +67,24 @@
 
     <style name="TaskListView" parent="ListView" />
 
-    <style name="double_pane_divider">
+    <style name="divider">
+        <item name="android:background">?android:attr/colorForeground</item>
+        <item name="android:alpha">?attr/alpha_divider</item>
+    </style>
+
+    <style name="vertical_divider" parent="divider">
         <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_width">1px</item>
-        <item name="android:background">?attr/asListDividerColor</item>
-        <item name="android:minWidth">1px</item>
+        <item name="android:layout_width">1dp</item>
+    </style>
+
+    <style name="horizontal_divider" parent="divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
     </style>
 
-    <style name="task_edit_row_divider">
+    <style name="task_edit_row_divider" parent="horizontal_divider">
         <item name="android:layout_marginLeft">@dimen/keyline_content_inset</item>
         <item name="android:layout_marginStart">@dimen/keyline_content_inset</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1px</item>
-        <item name="android:background">?attr/task_edit_divider</item>
         <item name="android:layout_gravity">end|bottom</item>
     </style>
 
diff --git a/src/main/res/values/theme_base_dark.xml b/src/main/res/values/theme_base_dark.xml
index 88d848e74..27d832f14 100644
--- a/src/main/res/values/theme_base_dark.xml
+++ b/src/main/res/values/theme_base_dark.xml
@@ -9,15 +9,11 @@
         <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="asSeparator">@android:color/transparent</item>
-        <item name="separatorHeight">1px</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="asListDividerColor">#dddddd</item>
-        <item name="task_edit_divider">@color/task_edit_divider</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/DialogBaseDark</item>
@@ -34,7 +30,6 @@
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="asTextColor">@android:color/white</item>
-        <item name="asListDividerColor">#dddddd</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/theme_base_light.xml b/src/main/res/values/theme_base_light.xml
index 08ce79d08..a3895e37a 100644
--- a/src/main/res/values/theme_base_light.xml
+++ b/src/main/res/values/theme_base_light.xml
@@ -9,15 +9,11 @@
         <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="asSeparator">#888888</item>
-        <item name="separatorHeight">1px</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="asListDividerColor">#dddddd</item>
-        <item name="task_edit_divider">@color/task_edit_divider</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/LightDialogBase</item>
@@ -34,7 +30,6 @@
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="asTextColor">@android:color/black</item>
-        <item name="asListDividerColor">#dddddd</item>
     </style>
 
 </resources>
\ No newline at end of file