From 48546653c710c38b8a18b970171c934cce84bd06 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Fri, 7 Oct 2016 16:50:45 -0700
Subject: [PATCH] Fix cardBackgroundColor not applying on 23+, fix centering of
 duration text in EditTimerActivity layout

---
 app/src/main/res/layout-land/item_timer.xml   |  4 +-
 .../main/res/layout/activity_edit_timer.xml   | 73 ++++++++-----------
 .../main/res/layout/item_expanded_alarm.xml   |  1 +
 app/src/main/res/layout/item_timer.xml        |  4 +-
 app/src/main/res/values/colors.xml            |  7 +-
 app/src/main/res/values/styles.xml            |  2 +-
 6 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/app/src/main/res/layout-land/item_timer.xml b/app/src/main/res/layout-land/item_timer.xml
index 4273464..f171c16 100644
--- a/app/src/main/res/layout-land/item_timer.xml
+++ b/app/src/main/res/layout-land/item_timer.xml
@@ -17,10 +17,12 @@
 
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/cardview_margin"
-    android:layout_marginEnd="@dimen/cardview_margin">
+    android:layout_marginEnd="@dimen/cardview_margin"
+    app:cardBackgroundColor="?cardBackgroundColor">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_edit_timer.xml b/app/src/main/res/layout/activity_edit_timer.xml
index 5b01547..c7cb3b0 100644
--- a/app/src/main/res/layout/activity_edit_timer.xml
+++ b/app/src/main/res/layout/activity_edit_timer.xml
@@ -55,54 +55,45 @@
 
         </android.support.v7.widget.Toolbar>
 
-        <EditText
-            android:id="@+id/hour"
-            android:layout_below="@id/toolbar"
-            style="@style/TimerText.EditField"
-            android:layout_marginStart="72dp"/>
-        
-        <TextView
-            android:id="@+id/hour_label"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="h"
-            android:layout_below="@id/toolbar"
-            android:layout_toEndOf="@id/hour"
-            android:layout_alignBaseline="@id/hour"
-            style="@style/TimerText.FieldLabel"/>
+            android:orientation="horizontal"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@id/toolbar">
 
-        <EditText
-            android:id="@+id/minute"
-            android:layout_below="@id/toolbar"
-            android:layout_toEndOf="@id/hour_label"
-            style="@style/TimerText.EditField"/>
+            <EditText
+                android:id="@+id/hour"
+                style="@style/TimerText.EditField"/>
 
-        <TextView
-            android:id="@+id/minute_label"
-            android:text="m"
-            android:layout_below="@id/toolbar"
-            android:layout_toEndOf="@id/minute"
-            android:layout_alignBaseline="@id/minute"
-            style="@style/TimerText.FieldLabel"/>
+            <TextView
+                android:id="@+id/hour_label"
+                android:text="h"
+                style="@style/TimerText.FieldLabel"/>
 
-        <EditText
-            android:id="@+id/second"
-            android:layout_below="@id/toolbar"
-            android:layout_toEndOf="@id/minute_label"
-            style="@style/TimerText.EditField"/>
+            <EditText
+                android:id="@+id/minute"
+                style="@style/TimerText.EditField"/>
 
-        <TextView
-            android:id="@+id/second_label"
-            android:text="s"
-            android:layout_below="@id/toolbar"
-            android:layout_toEndOf="@id/second"
-            android:layout_alignBaseline="@id/minute"
-            style="@style/TimerText.FieldLabel"/>
+            <TextView
+                android:id="@+id/minute_label"
+                android:text="m"
+                style="@style/TimerText.FieldLabel"/>
 
-        <View
-            android:id="@+id/focus_grabber"
-            style="@style/FocusGrabber"
-            android:layout_toEndOf="@id/second_label"/> <!-- Required for right focus search -->
+            <EditText
+                android:id="@+id/second"
+                style="@style/TimerText.EditField"/>
+
+            <TextView
+                android:id="@+id/second_label"
+                android:text="s"
+                style="@style/TimerText.FieldLabel"/>
+
+            <View
+                android:id="@+id/focus_grabber"
+                style="@style/FocusGrabber"/>
+
+        </LinearLayout>
         
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_expanded_alarm.xml b/app/src/main/res/layout/item_expanded_alarm.xml
index 4eefd61..46981d0 100644
--- a/app/src/main/res/layout/item_expanded_alarm.xml
+++ b/app/src/main/res/layout/item_expanded_alarm.xml
@@ -35,6 +35,7 @@
     android:layout_height="wrap_content"
     app:cardElevation="@dimen/expanded_alarm_elevation"
     app:cardCornerRadius="0dp"
+    app:cardBackgroundColor="?cardBackgroundColor"
     android:foreground="?selectableItemBackground"
     android:clickable="true"
     android:layout_marginTop="@dimen/cardview_margin"
diff --git a/app/src/main/res/layout/item_timer.xml b/app/src/main/res/layout/item_timer.xml
index a00f238..f12dee9 100644
--- a/app/src/main/res/layout/item_timer.xml
+++ b/app/src/main/res/layout/item_timer.xml
@@ -17,11 +17,13 @@
 
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/cardview_margin"
     android:layout_marginTop="@dimen/cardview_margin"
-    android:layout_marginEnd="@dimen/cardview_margin">
+    android:layout_marginEnd="@dimen/cardview_margin"
+    app:cardBackgroundColor="?cardBackgroundColor">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77922cb..d5baeea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,12 +29,13 @@
 
     <color name="colorAccentBlack">#FF5252</color>
 
-    <color name="card_background_color">#1fffffff</color> <!--12% white, not from MD spec-->
-    <color name="card_background_color_inverse">#0fffffff</color> <!--6% white, not from MD spec-->
+    <color name="card_background_color">@color/alert_dialog_background_color</color>
+    <color name="card_background_color_inverse">@color/alert_dialog_background_color_inverse</color>
+    <color name="card_background_color_black">@color/alert_dialog_background_color_black</color>
 
     <color name="alert_dialog_background_color">@color/colorPrimaryFallback</color>
     <color name="alert_dialog_background_color_inverse">@color/colorPrimaryFallbackInverse</color>
-    <color name="alert_dialog_background_color_black">#111111</color>
+    <color name="alert_dialog_background_color_black">@android:color/black</color>
 
     <color name="empty_recyclerview_text_color">#4dffffff</color> <!--30% white-->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 36fee66..538851d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -54,7 +54,7 @@
         <item name="colorPrimary">@android:color/black</item>
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorAccent">@color/colorAccentBlack</item>
-        <item name="cardBackgroundColor">@color/card_background_color_inverse</item>
+        <item name="cardBackgroundColor">@color/card_background_color_black</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle.Black</item>
         <item name="android:windowBackground">@android:color/black</item>
     </style>