caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1926 from osodebailar/bugfix/1920-white-theme-crash-fix

Browse source 
fix white theme crash
This commit is contained in:
Milos Kozak 2022-07-20 13:48:56 +02:00 committed by GitHub
commit 1fcf9553d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/res/values-night/styles.xml
View file

@ -246,6 +246,14 @@
<!---Icons in Loop area --> <!---Icons in Loop area -->
<item name="profileColor">@color/white</item> <item name="profileColor">@color/white</item>
<item name="crossTargetColor">@color/white</item> <item name="crossTargetColor">@color/white</item>
<!---Spinner style from pump common-->
<item name="android:spinnerItemStyle">@style/CommonSpinnerItemStyle</item>
</style>
<style name="CommonSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">15sp</item>
</style> </style>
<style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar"> <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">

8
core/src/main/res/values/styles.xml
View file

@ -247,8 +247,16 @@
<!---Icons in Loop area --> <!---Icons in Loop area -->
<item name="profileColor">@color/black</item> <item name="profileColor">@color/black</item>
<item name="crossTargetColor">@color/white</item> <item name="crossTargetColor">@color/white</item>
<!---Spinner style from pump common-->
<item name="android:spinnerItemStyle">@style/CommonSpinnerItemStyle</item>
</style> </style>
<style name="CommonSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">15sp</item>
</style>
<style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar"> <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
<item name="android:titleTextStyle">@style/Theme.Aaps.ActionBar.TitleTextStyle</item> <item name="android:titleTextStyle">@style/Theme.Aaps.ActionBar.TitleTextStyle</item>
</style> </style>

2
pump-common/src/main/res/layout/pump_history_activity.xml
View file

@ -29,7 +29,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<Spinner <Spinner
android:theme="@style/YourSpinnerItemStyle" android:theme="@style/CommonSpinnerItemStyle"
android:id="@+id/pump_history_type" android:id="@+id/pump_history_type"
android:layout_width="100dp" android:layout_width="100dp"

18
pump-common/src/main/res/values/styles.xml
View file

@ -1,18 +0,0 @@
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:spinnerItemStyle">@style/YourSpinnerItemStyle</item>
</style>
<style name="YourSpinnerItemStyle" parent="Widget.AppCompat.TextView.SpinnerItem">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">15sp</item>
</style>
<style name="mySpinnerItemStyle" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:textSize">15sp</item>
<item name="android:textColor">@color/white</item>
</style>
</resources>