From 454851e2bf3070fc83244c962230d1e74bf04e64 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Sat, 23 Jul 2016 01:43:11 -0700
Subject: [PATCH] Changed minute tuner positions in grid, renamed NumberGrid to
 NumbersGridView

---
 .../editalarm/{NumberGrid.java => NumbersGridView.java}   | 8 ++++----
 .../main/res/layout/content_number_grid_minute_tuners.xml | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename app/src/main/java/com/philliphsu/clock2/editalarm/{NumberGrid.java => NumbersGridView.java} (96%)

diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGrid.java b/app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGridView.java
similarity index 96%
rename from app/src/main/java/com/philliphsu/clock2/editalarm/NumberGrid.java
rename to app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGridView.java
index b8d4d2c..b462444 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGrid.java
+++ b/app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGridView.java
@@ -13,7 +13,7 @@ import com.philliphsu.clock2.R;
  * Created by Phillip Hsu on 7/21/2016.
  */
 @Deprecated
-public class NumberGrid extends GridLayout {
+public class NumbersGridView extends GridLayout {
     private static final String TAG = "NumberGrid";
     private static final int COLUMNS = 3;
 
@@ -32,12 +32,12 @@ public class NumberGrid extends GridLayout {
         void onNumberSelected(int number);
     }
 
-    public NumberGrid(Context context, AttributeSet attrs) {
+    public NumbersGridView(Context context, AttributeSet attrs) {
         super(context, attrs);
         init();
     }
 
-    public NumberGrid(Context context) {
+    public NumbersGridView(Context context) {
         super(context);
         init();
     }
@@ -111,7 +111,7 @@ public class NumberGrid extends GridLayout {
                     @Override
                     public void onClick(View v) {
                         setNumbers(new int[] {0,5,10,15,20,25,30,35,40,45,50,55}, true);
-                        inflate(getContext(), R.layout.content_number_grid_minute_tuners, NumberGrid.this);
+                        inflate(getContext(), R.layout.content_number_grid_minute_tuners, NumbersGridView.this);
                     }
                 });
                 i++;
diff --git a/app/src/main/res/layout/content_number_grid_minute_tuners.xml b/app/src/main/res/layout/content_number_grid_minute_tuners.xml
index fd09575..5cb4608 100644
--- a/app/src/main/res/layout/content_number_grid_minute_tuners.xml
+++ b/app/src/main/res/layout/content_number_grid_minute_tuners.xml
@@ -7,11 +7,13 @@
         android:layout_height="wrap_content"
         style="@style/GridLayoutNumpadElement"
         android:src="@drawable/ic_minus_circle_24dp"
-        app:layout_gravity="center"/>
+        app:layout_gravity="center"
+        app:layout_column="1"/>
     <ImageButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/GridLayoutNumpadElement"
         android:src="@drawable/ic_add_circle_24dp"
-        app:layout_gravity="center"/>
+        app:layout_gravity="center"
+        app:layout_column="2"/>
 </merge>
\ No newline at end of file