From ad4b311f7461fd6256d29e91d853b87a8b1ddf63 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 23 Jun 2016 13:59:55 -0500
Subject: [PATCH] Add alpha attributes

---
 src/main/res/layout/control_set_clear_button.xml |  2 +-
 src/main/res/layout/control_set_template.xml     |  2 +-
 src/main/res/layout/control_set_timers.xml       |  6 +++---
 src/main/res/layout/filter_adapter_row.xml       |  6 +++---
 src/main/res/layout/task_list_body_empty.xml     |  4 ++--
 src/main/res/values/attrs.xml                    |  5 +++++
 src/main/res/values/dimens.xml                   | 14 ++++++++++----
 src/main/res/values/theme_base_dark.xml          |  4 ++++
 src/main/res/values/theme_base_light.xml         |  4 ++++
 9 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/main/res/layout/control_set_clear_button.xml b/src/main/res/layout/control_set_clear_button.xml
index 2233bdf39..90f6d33db 100644
--- a/src/main/res/layout/control_set_clear_button.xml
+++ b/src/main/res/layout/control_set_clear_button.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:layout_weight="1"
-    android:alpha="@dimen/alpha_secondary_text_icons"
+    android:alpha="?attr/alpha_secondary"
     android:background="?attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:src="@drawable/ic_cancel_24dp"
diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml
index e9d379b42..0cffd4eb6 100644
--- a/src/main/res/layout/control_set_template.xml
+++ b/src/main/res/layout/control_set_template.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:tint="?attr/colorControlNormal"
-        android:alpha="@dimen/alpha_secondary_text_icons"
+        android:alpha="?attr/alpha_secondary"
         android:paddingRight="@dimen/keyline_second"
         android:paddingEnd="@dimen/keyline_second"
         tools:ignore="ContentDescription" />
diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml
index 7b53bef68..6b37700dc 100644
--- a/src/main/res/layout/control_set_timers.xml
+++ b/src/main/res/layout/control_set_timers.xml
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:textColor="?attr/asTextColor"
             android:text="@string/TEA_timer_controls"
-            android:alpha="@dimen/alpha_secondary_text_icons"
+            android:alpha="?attr/alpha_secondary"
             android:textSize="@dimen/task_edit_text_size" />
 
     </LinearLayout>
@@ -40,7 +40,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:paddingLeft="5dip"
             android:paddingRight="5dip"
-            android:alpha="@dimen/alpha_secondary_text_icons"
+            android:alpha="?attr/alpha_secondary"
             android:scaleType="centerInside"
             android:tint="?attr/colorControlNormal" />
 
@@ -51,7 +51,7 @@
             android:layout_weight="2"
             android:gravity="center_horizontal"
             android:textColor="?attr/asTextColor"
-            android:alpha="@dimen/alpha_secondary_text_icons"
+            android:alpha="?attr/alpha_secondary"
             android:textSize="10sp"
             android:visibility="visible" />
     </LinearLayout>
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index a364bbd9a..76fe26406 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -10,7 +10,7 @@
         android:layout_height="fill_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:alpha="@dimen/alpha_secondary_text_icons"
+        android:alpha="?attr/alpha_secondary"
         android:fontFamily="@string/font_fontFamily_medium"
         android:gravity="center_vertical|end"
         android:minEms="3"
@@ -35,7 +35,7 @@
             android:layout_width="56dp"
             android:layout_height="wrap_content"
             android:tint="?attr/colorControlNormal"
-            android:alpha="@dimen/alpha_secondary_text_icons"
+            android:alpha="?attr/alpha_secondary"
             android:scaleType="fitStart" />
 
         <!-- filter name -->
@@ -44,7 +44,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:alpha="@dimen/alpha_text"
+            android:alpha="?attr/alpha_primary"
             android:checked="false"
             android:ellipsize="end"
             android:fontFamily="@string/font_fontFamily_medium"
diff --git a/src/main/res/layout/task_list_body_empty.xml b/src/main/res/layout/task_list_body_empty.xml
index 91e7e285b..decd09205 100644
--- a/src/main/res/layout/task_list_body_empty.xml
+++ b/src/main/res/layout/task_list_body_empty.xml
@@ -19,7 +19,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:alpha="@dimen/alpha_disabled_hint_text"
+                android:alpha="?attr/alpha_disabled"
                 android:src="@drawable/ic_inbox_168px"
                 android:tint="?attr/colorControlNormal" />
 
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:alpha="@dimen/alpha_disabled_hint_text"
+                android:alpha="?attr/alpha_disabled"
                 android:text="@string/TLA_no_items"
                 android:textColor="?attr/asTextColor"
                 android:textSize="20sp" />
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index b04469d68..a67ca08d0 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -21,6 +21,11 @@
     <attr name="separatorHeight" format="dimension" />
     <attr name="popup_theme" format="reference" />
 
+    <attr name="alpha_primary" format="dimension" />
+    <attr name="alpha_secondary" format="dimension" />
+    <attr name="alpha_disabled" format="dimension" />
+    <attr name="alpha_divider" format="dimension" />
+
     <declare-styleable name="TimePreference">
         <attr name="summary" format="string" />
     </declare-styleable>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index a83fe456b..e37565afc 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -14,10 +14,16 @@
     <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
     <dimen name="task_edit_drawable_padding_top_bottom">17dp</dimen>
     <dimen name="task_edit_text_size">16sp</dimen>
-    <item name="alpha_text" format="float" type="dimen">0.87</item>
-    <item name="alpha_secondary_text_icons" format="float" type="dimen">0.54</item>
-    <item name="alpha_disabled_hint_text" format="float" type="dimen">0.38</item>
-    <item name="alpha_dividers" format="float" type="dimen">0.12</item>
+
+    <item name="alpha_primary_light" format="float" type="dimen">0.87</item>
+    <item name="alpha_secondary_light" format="float" type="dimen">0.54</item>
+    <item name="alpha_disabled_light" format="float" type="dimen">0.38</item>
+
+    <item name="alpha_primary_dark" format="float" type="dimen">1.0</item>
+    <item name="alpha_secondary_dark" format="float" type="dimen">0.70</item>
+    <item name="alpha_disabled_dark" format="float" type="dimen">0.50</item>
+
+    <item name="alpha_divider" format="float" type="dimen">0.12</item>
 
     <dimen name="elevation_toolbar">8dp</dimen>
     <dimen name="elevation_task_list">6dp</dimen>
diff --git a/src/main/res/values/theme_base_dark.xml b/src/main/res/values/theme_base_dark.xml
index e58e1274e..88d848e74 100644
--- a/src/main/res/values/theme_base_dark.xml
+++ b/src/main/res/values/theme_base_dark.xml
@@ -21,6 +21,10 @@
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/DialogBaseDark</item>
+        <item name="alpha_primary">@dimen/alpha_primary_dark</item>
+        <item name="alpha_secondary">@dimen/alpha_secondary_dark</item>
+        <item name="alpha_disabled">@dimen/alpha_disabled_dark</item>
+        <item name="alpha_divider">@dimen/alpha_divider</item>
     </style>
 
     <style name="DarkOverride" parent="DarkBase">
diff --git a/src/main/res/values/theme_base_light.xml b/src/main/res/values/theme_base_light.xml
index c05823254..08ce79d08 100644
--- a/src/main/res/values/theme_base_light.xml
+++ b/src/main/res/values/theme_base_light.xml
@@ -21,6 +21,10 @@
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
         <item name="alertDialogTheme">@style/LightDialogBase</item>
+        <item name="alpha_primary">@dimen/alpha_primary_light</item>
+        <item name="alpha_secondary">@dimen/alpha_secondary_light</item>
+        <item name="alpha_disabled">@dimen/alpha_disabled_light</item>
+        <item name="alpha_divider">@dimen/alpha_divider</item>
     </style>
 
     <style name="LightOverride" parent="LightBase">