From 4c6eea5ffc11eea8a2352bbdb8c227eb137982d0 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Wed, 27 Jul 2016 23:34:00 -0700
Subject: [PATCH] Layout modifications

---
 .../clock2/edittimer/EditTimerActivity.java   | 22 +++++++
 .../main/res/layout/activity_edit_timer.xml   | 52 ++++++++--------
 .../main/res/layout/content_numpad_timer.xml  | 60 +++++++++++++++++++
 3 files changed, 109 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/layout/content_numpad_timer.xml

diff --git a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java b/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
index 06045ab..ff0a230 100644
--- a/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/edittimer/EditTimerActivity.java
@@ -1,12 +1,34 @@
 package com.philliphsu.clock2.edittimer;
 
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v7.widget.GridLayout;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import com.philliphsu.clock2.BaseActivity;
 import com.philliphsu.clock2.R;
 
+import butterknife.Bind;
+
 public class EditTimerActivity extends BaseActivity {
 
+    @Bind(R.id.label) TextView mLabel;
+    @Bind(R.id.duration) TextView mDuration; // TODO: Change to something suitable for input fields
+    @Bind(R.id.add_one_minute) ImageButton mAddOneMinute;
+    @Bind(R.id.fab) FloatingActionButton mFab;
+    @Bind(R.id.stop) ImageButton mStop;
+    // TODO: Consider making an abstract EditItemActivity.
+    // Define these buttons in a layout file that subclasses can include
+    // into their own activity layouts. Bind OnClick listeners to abstract
+    // protected methods deleteItem() and saveItem().
+    @Bind(R.id.delete) Button mDelete;
+    @Bind(R.id.save) Button mSave;
+    @Bind(R.id.numpad) GridLayout mNumpad; // TODO: Actual numpad type
+    @Bind(R.id.progress_bar) ProgressBar mProgressBar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/res/layout/activity_edit_timer.xml b/app/src/main/res/layout/activity_edit_timer.xml
index 46fb9e5..c77b634 100644
--- a/app/src/main/res/layout/activity_edit_timer.xml
+++ b/app/src/main/res/layout/activity_edit_timer.xml
@@ -28,12 +28,16 @@
                 app:contentInsetStart="72dp">
 
                 <!-- Set inputType to text to get single-line input -->
-                <EditText
+                <TextView
+                    android:id="@+id/label"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:background="?selectableItemBackground"
+                    style="@style/TextAppearance.AppCompat.Title"
                     android:hint="Add label"
-                    android:background="@android:color/transparent"
-                    android:inputType="text"/>
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:ellipsize="end"/>
 
             </android.support.v7.widget.Toolbar>
 
@@ -41,10 +45,11 @@
                 android:id="@+id/duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="00h 00m 00s"
+                android:text="99h 99m 99s"
                 android:textSize="45sp"
                 android:layout_below="@id/toolbar"
-                android:layout_centerHorizontal="true"/>
+                android:layout_marginStart="72dp"
+                style="@style/TextAppearance.AppCompat"/>
 
             <Space
                 android:id="@+id/space"
@@ -54,12 +59,14 @@
 
             <!-- Keep same dimens as FAB for proper alignment -->
             <ImageButton
+                android:id="@+id/add_one_minute"
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:src="@drawable/ic_half_day_1_black_24dp"
                 android:layout_alignParentStart="true"
                 android:background="?selectableItemBackground"
-                android:layout_below="@id/space"/>
+                android:layout_below="@id/space"
+                android:layout_marginStart="16dp"/>
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"
@@ -77,7 +84,8 @@
                 android:src="@drawable/ic_half_day_1_black_24dp"
                 android:layout_alignParentEnd="true"
                 android:background="?selectableItemBackground"
-                android:layout_below="@id/space"/>
+                android:layout_below="@id/space"
+                android:layout_marginEnd="16dp"/>
 
             <Space
                 android:layout_width="match_parent"
@@ -96,6 +104,7 @@
             android:layout_alignParentBottom="true">
 
             <Button
+                android:id="@+id/delete"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -105,6 +114,7 @@
             <View style="@style/Divider.Vertical"/>
 
             <Button
+                android:id="@+id/save"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -113,13 +123,18 @@
 
         </LinearLayout>
 
-        <!-- For the synced devices list. Probably better than a ScrollView. -->
-        <android.support.v7.widget.RecyclerView
+        <!-- TODO: Make and use (Timer/DurationPicker)Numpad -->
+        <android.support.v7.widget.GridLayout
+            android:id="@+id/numpad"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:columnCount="3"
             android:layout_below="@id/appbar"
-            android:layout_above="@id/footer"
-            android:paddingTop="8dp"/>
+            android:layout_above="@id/footer">
+
+            <include layout="@layout/content_grid_layout_numpad"/>
+
+        </android.support.v7.widget.GridLayout>
 
         <View style="@style/Divider.Horizontal"
               android:layout_above="@id/footer"/>
@@ -127,6 +142,7 @@
     </RelativeLayout>
 
     <ProgressBar
+        android:id="@+id/progress_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_anchor="@id/appbar"
@@ -134,18 +150,4 @@
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:progress="90"/>
 
-    <android.support.v7.widget.GridLayout
-        android:id="@+id/bottom_sheet_numpad"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/numpad_height"
-        app:columnCount="3"
-        app:layout_behavior="@string/bottom_sheet_behavior"
-        app:behavior_hideable="true"
-        app:behavior_peekHeight="100dp"
-        android:background="#FFF">
-
-        <include layout="@layout/content_grid_layout_numpad"/>
-
-    </android.support.v7.widget.GridLayout>
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_numpad_timer.xml b/app/src/main/res/layout/content_numpad_timer.xml
new file mode 100644
index 0000000..9b87651
--- /dev/null
+++ b/app/src/main/res/layout/content_numpad_timer.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:grid="http://schemas.android.com/apk/res-auto">
+    <Button
+        android:id="@+id/one"
+        style="@style/GridLayoutNumpadButton"
+        android:text="1"/>
+
+    <Button
+        android:id="@+id/two"
+        style="@style/GridLayoutNumpadButton"
+        android:text="2"/>
+
+    <Button
+        android:id="@+id/three"
+        style="@style/GridLayoutNumpadButton"
+        android:text="3"/>
+
+    <Button
+        android:id="@+id/four"
+        style="@style/GridLayoutNumpadButton"
+        android:text="4"/>
+
+    <Button
+        android:id="@+id/five"
+        style="@style/GridLayoutNumpadButton"
+        android:text="5"/>
+
+    <Button
+        android:id="@+id/six"
+        style="@style/GridLayoutNumpadButton"
+        android:text="6"/>
+
+    <Button
+        android:id="@+id/seven"
+        style="@style/GridLayoutNumpadButton"
+        android:text="7"/>
+
+    <Button
+        android:id="@+id/eight"
+        style="@style/GridLayoutNumpadButton"
+        android:text="8"/>
+
+    <Button
+        android:id="@+id/nine"
+        style="@style/GridLayoutNumpadButton"
+        android:text="9"/>
+
+    <Button
+        android:id="@+id/zero"
+        style="@style/GridLayoutNumpadButton"
+        grid:layout_column="1"
+        android:text="0"/>
+
+    <ImageButton
+        android:id="@+id/backspace"
+        android:src="@drawable/ic_backspace_24dp"
+        style="@style/GridLayoutNumpadElement"
+        grid:layout_column="2"/>
+</merge>
\ No newline at end of file