From 6b7c9cedee94481881ac2e76b8123e43d9209f3b Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Sat, 6 Aug 2016 03:34:53 -0700
Subject: [PATCH] New ringtone activity layout

---
 .../clock2/alarms/AlarmActivity.java          | 10 +++
 .../clock2/ringtone/RingtoneActivity.java     | 20 ++++--
 .../clock2/timers/TimesUpActivity.java        | 10 +++
 app/src/main/res/layout/activity_ringtone.xml | 70 ++++++++++++-------
 app/src/main/res/layout/item_timer.xml        |  2 -
 5 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
index 946edc6..90e99a1 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmActivity.java
@@ -62,6 +62,16 @@ public class AlarmActivity extends RingtoneActivity<Alarm> {
         return R.string.alarm_auto_silenced_text;
     }
 
+    @Override
+    protected int getLeftButtonText() {
+        return R.string.snooze;
+    }
+
+    @Override
+    protected int getRightButtonText() {
+        return R.string.dismiss;
+    }
+
     @Override
     protected int getLeftButtonDrawable() {
         // TODO: correct icon
diff --git a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
index 691017f..f8ade06 100644
--- a/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
@@ -8,9 +8,7 @@ import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.StringRes;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -44,9 +42,9 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
     @Bind(R.id.auto_silenced_container) LinearLayout mAutoSilencedContainer;
     @Bind(R.id.auto_silenced_text) TextView mAutoSilencedText;
     @Bind(R.id.ok) Button mOkButton;
-    @Bind(R.id.buttons_container) GridLayout mButtonsContainer;
-    @Bind(R.id.btn_left) FloatingActionButton mLeftButton;
-    @Bind(R.id.btn_right) FloatingActionButton mRightButton;
+    @Bind(R.id.buttons_container) LinearLayout mButtonsContainer;
+    @Bind(R.id.btn_text_left) TextView mLeftButton;
+    @Bind(R.id.btn_text_right) TextView mRightButton;
 
     protected abstract Class<? extends RingtoneService> getRingtoneServiceClass();
 
@@ -64,6 +62,12 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
     @StringRes
     protected abstract int getAutoSilencedText();
 
+    @StringRes
+    protected abstract int getLeftButtonText();
+
+    @StringRes
+    protected abstract int getRightButtonText();
+
     @DrawableRes
     protected abstract int getLeftButtonDrawable();
 
@@ -95,8 +99,10 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
         getHeaderContent((LinearLayout) findViewById(R.id.header));
         mAutoSilencedText.setCompoundDrawablesWithIntrinsicBounds(0, getAutoSilencedDrawable(), 0, 0);
         mAutoSilencedText.setText(getAutoSilencedText());
-        mLeftButton.setImageResource(getLeftButtonDrawable());
-        mRightButton.setImageResource(getRightButtonDrawable());
+        mLeftButton.setText(getLeftButtonText());
+        mRightButton.setText(getRightButtonText());
+        mLeftButton.setCompoundDrawablesWithIntrinsicBounds(0, getLeftButtonDrawable(), 0, 0);
+        mRightButton.setCompoundDrawablesWithIntrinsicBounds(0, getRightButtonDrawable(), 0, 0);
 
         Intent intent = new Intent(this, getRingtoneServiceClass())
                 .putExtra(EXTRA_RINGING_OBJECT, mRingingObject);
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
index ad0a48f..cc03e07 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java
@@ -67,6 +67,16 @@ public class TimesUpActivity extends RingtoneActivity<Timer> {
         return R.string.timer_auto_silenced_text;
     }
 
+    @Override
+    protected int getLeftButtonText() {
+        return R.string.add_one_minute;
+    }
+
+    @Override
+    protected int getRightButtonText() {
+        return R.string.stop;
+    }
+
     @Override
     protected int getLeftButtonDrawable() {
         // TODO: correct icon
diff --git a/app/src/main/res/layout/activity_ringtone.xml b/app/src/main/res/layout/activity_ringtone.xml
index 99aae7f..172fe54 100644
--- a/app/src/main/res/layout/activity_ringtone.xml
+++ b/app/src/main/res/layout/activity_ringtone.xml
@@ -1,7 +1,8 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="match_parent"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:orientation="vertical"
              android:background="@color/colorPrimary">
 
     <LinearLayout
@@ -24,20 +25,20 @@
     <LinearLayout
         android:id="@+id/auto_silenced_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:gravity="center"
         android:visibility="gone">
 
         <TextView
             android:id="@+id/auto_silenced_text"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:keepScreenOn="true"
-            android:gravity="center_horizontal"
+            android:drawableTop="@drawable/ic_half_day_1_black_24dp"
+            android:drawablePadding="8dp"
+            android:text="@string/alarm_auto_silenced_text"
             style="@style/TextAppearance.AppCompat.Large.Inverse"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="16dp"/>
 
         <Button
             android:id="@+id/ok"
@@ -48,30 +49,47 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.GridLayout
+    <LinearLayout
         android:id="@+id/buttons_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="bottom"
-        android:layout_marginBottom="72dp"
-        app:columnCount="2">
+        android:orientation="horizontal">
 
-        <android.support.design.widget.FloatingActionButton
+        <FrameLayout
             android:id="@+id/btn_left"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_columnWeight="1"
-            app:layout_gravity="center"
-            app:elevation="0dp"/>
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="?selectableItemBackground">
 
-        <android.support.design.widget.FloatingActionButton
+            <TextView
+                android:id="@+id/btn_text_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawablePadding="8dp"
+                style="@style/TextAppearance.AppCompat.Medium.Inverse"/>
+
+        </FrameLayout>
+
+        <FrameLayout
             android:id="@+id/btn_right"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_columnWeight="1"
-            app:layout_gravity="center"
-            app:elevation="0dp"/>
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="?selectableItemBackground">
 
-    </android.support.v7.widget.GridLayout>
+            <TextView
+                android:id="@+id/btn_text_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawablePadding="8dp"
+                style="@style/TextAppearance.AppCompat.Medium.Inverse"/>
 
-</FrameLayout>
+        </FrameLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_timer.xml b/app/src/main/res/layout/item_timer.xml
index 91f8e9e..be3eca7 100644
--- a/app/src/main/res/layout/item_timer.xml
+++ b/app/src/main/res/layout/item_timer.xml
@@ -3,8 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:foreground="?android:attr/selectableItemBackground"
     android:layout_marginStart="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginTop="8dp">