isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix spinner theme on pre-lollipop

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-04-15 17:41:16 -04:00
parent 93a893d660
commit 2fe2d8834a
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/edit_habit.xml
View File

@@ -63,7 +63,7 @@
<Spinner <Spinner
android:id="@+id/sFrequency" android:id="@+id/sFrequency"
style="@style/dialogFormSpinner" style="?dialogFormSpinnerTheme"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:entries="@array/frequencyQuickSelect" android:entries="@array/frequencyQuickSelect"
@@ -111,7 +111,7 @@
<TextView <TextView
android:id="@+id/inputReminderTime" android:id="@+id/inputReminderTime"
style="@style/dialogFormSpinner"/> style="?dialogFormSpinnerTheme"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -125,7 +125,7 @@
<TextView <TextView
android:id="@+id/inputReminderDays" android:id="@+id/inputReminderDays"
style="@style/dialogFormSpinner"/> style="?dialogFormSpinnerTheme"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
app/src/main/res/values-v21/styles.xml
View File

@@ -52,6 +52,7 @@
<item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item> <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
<item name="iconChangeColor">@drawable/ic_action_color_dark</item> <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_light</item> <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
<item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
<item name="aboutScreenColor">@color/blue_700</item> <item name="aboutScreenColor">@color/blue_700</item>
</style> </style>
@@ -87,6 +88,7 @@
<item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item> <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
<item name="iconChangeColor">@drawable/ic_action_color_dark</item> <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item> <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
<item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
<item name="palette">@array/darkPalette</item> <item name="palette">@array/darkPalette</item>

1
app/src/main/res/values/attrs.xml
View File

@@ -42,6 +42,7 @@
<attr name="iconUnarchive" format="reference"/> <attr name="iconUnarchive" format="reference"/>
<attr name="dialogIconChangeColor" format="reference"/> <attr name="dialogIconChangeColor" format="reference"/>
<attr name="dialogFormSpinnerTheme" format="reference"/>
<!-- Pre-Lollipop --> <!-- Pre-Lollipop -->
<attr name="cardBackground" format="reference"/> <attr name="cardBackground" format="reference"/>

5
app/src/main/res/values/styles.xml
View File

@@ -20,9 +20,6 @@
<resources> <resources>
<style name="AppBaseTheme" parent="android:Theme.Holo.Light"> <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<item name="android:spinnerItemStyle">@style/dialogFormText</item>
<item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
<item name="selectedBackground">@drawable/selected_box_light</item> <item name="selectedBackground">@drawable/selected_box_light</item>
<item name="headerBackground">@drawable/habits_list_header_light_background</item> <item name="headerBackground">@drawable/habits_list_header_light_background</item>
<item name="cardBackground">@drawable/card_light_background</item> <item name="cardBackground">@drawable/card_light_background</item>
@@ -48,6 +45,7 @@
<item name="iconUnarchive">@drawable/ic_action_unarchive_light</item> <item name="iconUnarchive">@drawable/ic_action_unarchive_light</item>
<item name="iconChangeColor">@drawable/ic_action_color_light</item> <item name="iconChangeColor">@drawable/ic_action_color_light</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_light</item> <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
<item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerLight</item>
<item name="aboutScreenColor">@color/blue_700</item> <item name="aboutScreenColor">@color/blue_700</item>
</style> </style>
@@ -77,6 +75,7 @@
<item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item> <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
<item name="iconChangeColor">@drawable/ic_action_color_dark</item> <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item> <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
<item name="dialogFormSpinnerTheme">@style/dialogFormSpinnerDark</item>
<item name="palette">@array/darkPalette</item> <item name="palette">@array/darkPalette</item>

11
app/src/main/res/values/styles_dialog.xml
View File

@@ -77,7 +77,16 @@
<item name="android:textColor">?mediumContrastTextColor</item> <item name="android:textColor">?mediumContrastTextColor</item>
</style> </style>
<style name="dialogFormSpinner" parent="android:Widget.DeviceDefault.Light.Spinner"> <style name="dialogFormSpinnerDark" parent="android:Widget.DeviceDefault.Spinner">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">12dp</item>
<item name="android:textSize">@dimen/regularTextSize</item>
<item name="android:minWidth">400dp</item>
<item name="android:textColor">?highContrastTextColor</item>
</style>
<style name="dialogFormSpinnerLight" parent="android:Widget.DeviceDefault.Light.Spinner">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">12dp</item> <item name="android:paddingLeft">12dp</item>