hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bottom sheet time picker working

Browse Source
This commit is contained in:
Phillip Hsu
2016-07-19 20:45:05 -07:00
parent ae6f4fc723
commit ae83786b3c
7 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/content_grid_layout_numpad.xml
+10 -30
View File
@@ -3,72 +3,52 @@
xmlns:grid="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/one"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="1"/>
<Button
android:id="@+id/two"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="2"/>
<Button
android:id="@+id/three"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="3"/>
<Button
android:id="@+id/four"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="4"/>
<Button
android:id="@+id/five"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="5"/>
<Button
android:id="@+id/six"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="6"/>
<Button
android:id="@+id/seven"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="7"/>
<Button
android:id="@+id/eight"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="8"/>
<Button
android:id="@+id/nine"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
android:text="9"/>
<Button
android:id="@+id/zero"
style="@style/grid_element_single"
grid:layout_rowWeight="1"
grid:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
grid:layout_column="1"
android:text="0"/>
</merge>
app/src/main/res/layout/content_numpad_time_picker.xml
+4 -12
View File
@@ -6,23 +6,17 @@
<Button
android:id="@+id/leftAlt"
style="@style/grid_element_single"
app:layout_rowWeight="1"
app:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
app:layout_column="0"/>
<Button
android:id="@+id/rightAlt"
style="@style/grid_element_single"
app:layout_rowWeight="1"
app:layout_columnWeight="1"
style="@style/GridLayoutNumpadButton"
app:layout_column="2"/>
<!-- Used to properly position the FAB -->
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="@dimen/fab_cell_height"
android:layout_height="56dp"
app:layout_columnWeight="1"
app:layout_column="1">
@@ -38,8 +32,6 @@
<ImageButton
android:id="@+id/backspace"
android:src="@drawable/ic_backspace_24dp"
android:background="?selectableItemBackground"
app:layout_rowWeight="1"
app:layout_columnWeight="1"
style="@style/GridLayoutNumpadElement"
app:layout_column="2"/>
</merge>
app/src/main/res/layout/dialog_time_picker_numpad.xml
+5 -1
View File
@@ -61,6 +61,10 @@
android:id="@+id/number_grid"
android:layout_width="match_parent"
android:layout_height="@dimen/numpad_height"
android:layout_below="@id/header"/>
android:layout_below="@id/header"
android:layout_marginTop="@dimen/bottom_sheet_vertical_space"
android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"
android:layout_marginBottom="@dimen/bottom_sheet_vertical_space"/>
</RelativeLayout>