Numpad looking good

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

@@ -43,7 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:src="@drawable/ic_add_24dp"
+        app:srcCompat="@drawable/ic_add_24dp"
         android:layout_margin="@dimen/fab_margin"
         android:tint="@android:color/white"/>
 

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

@@ -0,0 +1,54 @@
+<?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.Inverse"
+        android:text="1"/>
+
+    <Button
+        android:id="@+id/two"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="2"/>
+
+    <Button
+        android:id="@+id/three"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="3"/>
+
+    <Button
+        android:id="@+id/four"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="4"/>
+
+    <Button
+        android:id="@+id/five"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="5"/>
+
+    <Button
+        android:id="@+id/six"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="6"/>
+
+    <Button
+        android:id="@+id/seven"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="7"/>
+
+    <Button
+        android:id="@+id/eight"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="8"/>
+
+    <Button
+        android:id="@+id/nine"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        android:text="9"/>
+
+    <Button
+        android:id="@+id/zero"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        grid:layout_column="1"
+        android:text="0"/>
+</merge>

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

@@ -20,12 +20,13 @@
         android:layout_height="wrap_content"
         app:layout_gravity="center"
         app:layout_column="1"
-        android:src="@drawable/ic_done_24dp"
+        app:srcCompat="@drawable/ic_done_24dp"
+        app:borderWidth="0dp"
         android:layout_marginBottom="@dimen/numeric_keypad_fab_bottom_margin"/>
 
     <ImageButton
         android:id="@+id/backspace"
-        android:src="@drawable/ic_backspace_24dp"
+        app:srcCompat="@drawable/ic_backspace_24dp"
         android:layout_height="@dimen/numeric_keypad_backspace_height"
         style="@style/GridLayoutNumpadElement"
         app:layout_column="2"/>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <include layout="@layout/content_grid_layout_numpad_dark"/>
+
+    <Button
+        android:id="@+id/leftAlt"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        app:layout_column="0"/>
+
+    <Button
+        android:id="@+id/rightAlt"
+        style="@style/GridLayoutNumpadButton.Inverse"
+        app:layout_column="2"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_gravity="center"
+        app:layout_column="1"
+        android:src="@drawable/ic_done_24dp"
+        android:layout_marginBottom="@dimen/numeric_keypad_fab_bottom_margin"/>
+
+    <ImageButton
+        android:id="@+id/backspace"
+        android:src="@drawable/ic_backspace_24dp"
+        android:layout_height="@dimen/numeric_keypad_backspace_height"
+        style="@style/GridLayoutNumpadElement"
+        app:layout_column="2"/>
+
+</merge>

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

@@ -13,21 +13,17 @@ doesn't work. -->
         android:layout_height="@dimen/numeric_keypad_output_box_height"
         android:gravity="center"
         android:textSize="@dimen/text_size_display_3"
-        android:fontFamily="sans-serif-light"
+        android:fontFamily="sans-serif"
         style="@style/TextAppearance.AppCompat"/>
 
     <!--<View style="@style/FocusGrabber"
           android:id="@+id/focus_grabber"/>-->
 
-    <View style="@style/Divider.Horizontal"
-          android:id="@+id/header_divider"
-        android:layout_below="@id/input_time"/>
-
     <com.philliphsu.clock2.editalarm.NumpadTimePicker
         android:id="@+id/number_grid"
         android:layout_width="match_parent"
         android:layout_height="@dimen/numeric_keypad_height"
-        android:layout_below="@id/header_divider"
+        android:layout_below="@id/input_time"
         android:layout_marginTop="@dimen/bottom_sheet_vertical_space"
         android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
         android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"/>