Numpad looking good

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
@@ -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>
+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>