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

Numpad looking good

Browse Source
This commit is contained in:
Phillip Hsu
2016-08-22 03:45:58 -07:00
parent 9b7ab3e644
commit c0d100d165
22 changed files with 351 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/fab_icon_color.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--A variation of icon_color that correctly gives the enabled color for FABs -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/icon_color_inactive_light"/>
<item android:color="@android:color/white"/>
</selector>
app/src/main/res/color/icon_color.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/icon_color_inactive_light"/>
<item android:color="@color/icon_color_active_light"/>
</selector>
app/src/main/res/color/icon_color_dark.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/icon_color_inactive_dark"/>
<item android:color="@color/icon_color_active_dark"/>
</selector>
app/src/main/res/color/numeric_keypad_button_text.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:color="@color/text_color_disabled_light"/>
<item android:color="@color/text_color_primary_light"/>
</selector>
app/src/main/res/color/numeric_keypad_button_text_dark.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:color="@color/text_color_disabled_dark"/>
<item android:color="@color/text_color_primary_dark"/>
</selector>
app/src/main/res/color/numeric_keypad_fab_color.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/fab_disabled_light"/>
<item android:color="?colorAccent"/>
</selector>
app/src/main/res/color/numeric_keypad_fab_color_dark.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/fab_disabled_dark"/>
<item android:color="?colorAccent"/>
</selector>
app/src/main/res/drawable/ic_backspace_24dp.xml
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="#000000"
android:pathData="M22,3H7c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm-3,12.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z"/>
</vector>
app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -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
+54
View File
@@ -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
+3 -2
View File
@@ -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
+33
View File
@@ -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
+2 -6
View File
@@ -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"/>
app/src/main/res/values/aosp_datetimepicker_colors.xml
+13
View File
@@ -51,4 +51,17 @@
<color name="text_color_primary_light">#de000000</color> <!--87% black-->
<color name="text_color_secondary_dark">#b3ffffff</color> <!--70% white-->
<color name="text_color_secondary_light">#8a000000</color> <!--54% black-->
<color name="text_color_disabled_dark">#80ffffff</color> <!--50% white TODO: same as unselected_color-->
<color name="text_color_disabled_light">#61000000</color> <!--38% black-->
<!-- Derived from Raised Button section of the guidelines. Make sure to set FAB elevation to 0dp! -->
<color name="fab_disabled_dark">#1fffffff</color> <!--12% white-->
<color name="fab_disabled_light">#1f000000</color> <!--12% black-->
<color name="icon_color_active_dark">#ffffffff</color> <!--100% white-->
<color name="icon_color_active_light">#8a000000</color> <!--54% black-->
<!-- TODO: This value is from the Icons page. The Colors page lists 50% white for "Icons and other elements". -->
<color name="icon_color_inactive_dark">#4dffffff</color> <!--30% white-->
<!-- TODO: This value is from the Icons page. The Colors page lists 38% black for "Icons and other elements". -->
<color name="icon_color_inactive_light">#42000000</color> <!--26% black-->
</resources>
app/src/main/res/values/styles.xml
+7 -1
View File
@@ -45,14 +45,20 @@
<style name="GridLayoutNumpadButton" parent="GridLayoutNumpadElement">
<item name="android:textSize">@dimen/text_size_display_1</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="GridLayoutNumpadButton.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
</style>
<style name="NumberGridButton" parent="GridLayoutNumpadButton">
<!-- TODO: Do we need this anymore? -->
<!-- This should give us 87% black. By default, TextView has a grayish text color.
The reason GridLayoutNumpadButton style used in the NumpadTimerPickerDialog is 87% black
already is because the numpad's buttons are actually of type Button. For whatever reason,
I decided to make the buttons for the NumbersGrid of type TextView... -->
<item name="android:textColor">?android:attr/textColorPrimary</item>
<!--<item name="android:textColor">?android:attr/textColorPrimary</item>-->
</style>
<style name="NumberGridButton.Hour">
<item name="android:layout_height">@dimen/number_grid_hour_cell_height</item>