Updated sleep timer UI

1 files changed, 75 insertions, 47 deletions

diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index b3742c20c..8ada0d6cf 100644
--- a/app/src/main/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
@@ -1,67 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center"
-    android:padding="16dp">
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:gravity="center"
+              android:padding="16dp">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <EditText
-            android:id="@+id/etxtTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="8dp"
-            android:ems="2"
-            android:hint="@string/enter_time_here_label"
-            android:inputType="number"
-            android:maxLength="2" >
-
-            <requestFocus />
-        </EditText>
-
-        <Spinner
-            android:id="@+id/spTimeUnit"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp" />
+            android:id="@+id/timeSetup"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            <EditText
+                    android:id="@+id/etxtTime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_margin="8dp"
+                    android:ems="2"
+                    android:inputType="number"
+                    android:maxLength="3"/>
+
+            <Spinner
+                    android:id="@+id/spTimeUnit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"/>
+        </LinearLayout>
+
+        <Button
+                android:text="@string/set_sleeptimer_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/setSleeptimerButton"/>
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/timeDisplay"
+            android:orientation="vertical"
+            android:visibility="gone">
 
         <TextView
-            android:layout_width="wrap_content"
+                android:text="00:00:00"
+                android:layout_gravity="center"
+                android:textSize="32sp"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/time"/>
+
+        <Button
+                android:text="@string/disable_sleeptimer_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/disableSleeptimerButton"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/timer_about_to_expire_label"
-            android:textSize="16sp" />
+            android:orientation="vertical"
+            android:layout_marginTop="8dp">
 
         <CheckBox
-            android:id="@+id/cbShakeToReset"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/shake_to_reset_label" />
+                android:id="@+id/cbShakeToReset"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/shake_to_reset_label"/>
 
         <CheckBox
-            android:id="@+id/cbVibrate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/timer_vibration_label" />
+                android:id="@+id/cbVibrate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/timer_vibration_label"/>
 
         <CheckBox
-            android:id="@+id/chAutoEnable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/auto_enable_label" />
+                android:id="@+id/chAutoEnable"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/auto_enable_label"/>
 
     </LinearLayout>