Bug 1412518 - Photon themed TimePicker; r?sdaswani draft
authorPetru Lingurar <petru.lingurar@softvision.ro>
Wed, 25 Jul 2018 17:03:15 +0300
changeset 822586 c8940fc882ff55cd2eb4d0dd241d4da6c487dab9
parent 822234 dd386b5b9fa7f5cd6dc4bbbfa0503b3eb2969af5
child 822587 9f8c05a5c6ee6945ab0e0f92c26aa115e1dfbc50
push id117411
push userplingurar@mozilla.com
push dateWed, 25 Jul 2018 14:20:33 +0000
reviewerssdaswani
bugs1412518
milestone63.0a1
Bug 1412518 - Photon themed TimePicker; r?sdaswani On Api >=21 the Material TimePicker will have applied a Photon style. Below Api 21 TimePicker will still be using spinners. MozReview-Commit-ID: 2jZLPGCx4rI
mobile/android/app/src/main/res/color/time_picker_header_text_selector.xml
mobile/android/app/src/main/res/color/time_picker_inner_radial_selector.xml
mobile/android/app/src/main/res/color/time_picker_radial_selector.xml
mobile/android/app/src/main/res/values/themes.xml
mobile/android/app/src/photon/res/values/colors.xml
mobile/android/app/src/photon/res/values/styles.xml
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/main/res/color/time_picker_header_text_selector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="true"
+        android:color="@color/dtp_header_text_active"
+        />
+
+    <item android:state_activated="false"
+        android:color="@color/dtp_header_text_inactive"
+        />
+</selector>
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/main/res/color/time_picker_inner_radial_selector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="true"
+        android:color="@color/dtp_selection"
+        />
+    <item
+        android:state_activated="false"
+        android:color="?android:attr/textColorSecondary"
+        />
+</selector>
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/main/res/color/time_picker_radial_selector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="true"
+        android:color="@color/dtp_selection"
+        />
+    <item
+        android:state_activated="false"
+        android:color="?android:attr/textColorPrimary"
+        />
+</selector>
\ No newline at end of file
--- a/mobile/android/app/src/main/res/values/themes.xml
+++ b/mobile/android/app/src/main/res/values/themes.xml
@@ -87,16 +87,17 @@
         <item name="bookmarksListViewStyle">@style/Widget.BookmarksListView</item>
         <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item>
         <item name="homeListViewStyle">@style/Widget.HomeListView</item>
         <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
         <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item>
         <item name="topSitesGridItemViewStyle">@style/Widget.TopSitesGridItemView</item>
         <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item>
         <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item>
+        <item name="android:timePickerStyle" tools:ignore="NewApi">@style/PhotonTimePicker</item>
     </style>
 
     <!-- Make an activity appear like an overlay. -->
     <style name="OverlayActivity.Base" parent="Gecko">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:backgroundDimEnabled">true</item>
--- a/mobile/android/app/src/photon/res/values/colors.xml
+++ b/mobile/android/app/src/photon/res/values/colors.xml
@@ -265,11 +265,15 @@
     <color name="bookmark_folder_bg_color">#FCFCFC</color>
 
     <!-- PWA -->
     <color name="pwa_cancel_btn_press">#ededf0</color>
     <color name="pwa_cancel_btn">@android:color/transparent</color>
     <color name="pwa_confirm_btn_pressed">#1B73CC</color>
     <color name="pwa_confirm_btn_normal">#E60A84FF</color>
 
-
+    <!-- Date/Time Pickers -->
+    <color name="dtp_header_background">#2B2B2B</color>
+    <color name="dtp_header_text_active">#0A84FF</color>
+    <color name="dtp_header_text_inactive">#B2B2B2</color>
+    <color name="dtp_selection">#FFFFFF</color>
 
 </resources>
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -972,9 +972,20 @@
     <style name="PwaConfirm.Cancel">
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
     <style name="PwaConfirm.Url">
         <item name="android:layout_alignLeft">@+id/pwa_confirm_title</item>
     </style>
 
+    <style name="PhotonTimePicker" parent="@android:style/Widget.Material.Light.TimePicker">
+        <item name="android:headerBackground">@color/dtp_header_background</item>
+        <item name="android:headerTimeTextAppearance">@style/PhotonPickerHeaderText</item>
+        <item name="android:numbersInnerTextColor">@color/time_picker_inner_radial_selector</item>
+        <item name="android:numbersTextColor">@color/time_picker_radial_selector</item>
+    </style>
+
+    <style name="PhotonPickerHeaderText">
+        <item name="android:textColor">@color/time_picker_header_text_selector</item>
+    </style>
+
 </resources>