Increased tap target size of buttons

app/src/main/res/layout/content_number_grid_minute_tuners.xml

@@ -3,17 +3,11 @@
        xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- TODO: Use fixed width and height -->
     <ImageButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         style="@style/GridLayoutNumpadElement"
         android:src="@drawable/ic_minus_circle_24dp"
-        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_column="2"/>
 </merge>

app/src/main/res/layout/dialog_time_picker_number_grid.xml

@@ -52,7 +52,6 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     android:gravity="center"
                     android:layout_gravity="center"
                     style="@style/TextAppearance.AppCompat.Button"
@@ -70,7 +69,6 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     android:gravity="center"
                     android:layout_gravity="center"
                     style="@style/TextAppearance.AppCompat.Button"

app/src/main/res/layout/item_24h_number_grid.xml

@@ -4,9 +4,6 @@
 
     <!-- TODO: Define a grid item style with the first 3 attrs-->
     <com.philliphsu.clock2.editalarm.TwentyFourHourGridItem
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_gravity="center"
         style="@style/GridLayoutNumpadElement"/>
 
 </merge>

app/src/main/res/layout/item_number_grid.xml

@@ -2,12 +2,9 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <!-- TODO: Define another style with LWW and LHW -->
     <!-- TODO: Use a fixed height so the circular indicator doesn't stretch into an oval. -->
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/GridLayoutNumpadButton"
-        app:layout_gravity="center"/>
+    <!-- Or measure the text dimensions and use the larger of its width and height, plus some
+    small integer extra, and use that as the diameter of the circle indicator. -->
+    <TextView style="@style/GridLayoutNumpadButton"/>
 
 </merge>

app/src/main/res/values/styles.xml

@@ -34,6 +34,7 @@
         <item name="layout_columnWeight">1</item>
         <item name="layout_rowWeight">1</item>
         <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <!-- TODO: Rename to GridLayout[Text/Button/TextView]? -->