mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-25 17:42:29 +02:00
Code Issues Releases Wiki Activity

corrected color in dialog preferences buttons and radio buttons after using Material3, see #944

Browse Source
This commit is contained in:
oliexdev
2023-07-29 11:37:38 +02:00
parent ec4ecf7e07
commit 9230d943ba
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android_app/app/src/main/res/layout/fragment_usersettings.xml
View File

@@ -98,12 +98,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:theme="@style/AppTheme.RadioButton"
android:text="@string/label_male" /> android:text="@string/label_male" />
<RadioButton <RadioButton
android:id="@+id/btnRadioWoman" android:id="@+id/btnRadioWoman"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/AppTheme.RadioButton"
android:text="@string/label_female" /> android:text="@string/label_female" />
</RadioGroup> </RadioGroup>
</TableRow> </TableRow>
@@ -184,11 +186,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="cm" android:text="cm"
android:id="@+id/btnRadioCM" android:id="@+id/btnRadioCM"
android:theme="@style/AppTheme.RadioButton"
android:checked="true" /> android:checked="true" />
<RadioButton <RadioButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/AppTheme.RadioButton"
android:text="in" android:text="in"
android:id="@+id/btnRadioINCH" /> android:id="@+id/btnRadioINCH" />
</RadioGroup> </RadioGroup>
@@ -216,18 +220,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="kg" android:text="kg"
android:id="@+id/btnRadioKG" android:id="@+id/btnRadioKG"
android:theme="@style/AppTheme.RadioButton"
android:checked="true" /> android:checked="true" />
<RadioButton <RadioButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="lb" android:text="lb"
android:theme="@style/AppTheme.RadioButton"
android:id="@+id/btnRadioLB" /> android:id="@+id/btnRadioLB" />
<RadioButton <RadioButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="st" android:text="st"
android:theme="@style/AppTheme.RadioButton"
android:id="@+id/btnRadioST" /> android:id="@+id/btnRadioST" />
</RadioGroup> </RadioGroup>
</TableRow> </TableRow>

1
android_app/app/src/main/res/layout/user_preference_widget_layout.xml
View File

@@ -13,6 +13,7 @@
android:id="@+id/user_radio_button" android:id="@+id/user_radio_button"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/AppTheme.RadioButton"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

10
android_app/app/src/main/res/values-night/themes.xml
View File

@@ -27,6 +27,16 @@
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item> <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item> <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item> <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="alertDialogTheme">@style/AppTheme.Dialog</item>
<item name="colorAccent">@color/md_theme_dark_onPrimary</item>
</style>
<style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
<item name="colorPrimary">@color/md_theme_dark_onBackground</item>
</style>
<style name="AppTheme.RadioButton" parent="Widget.Material3.CompoundButton.RadioButton">
<item name="colorPrimary">@color/md_theme_dark_onPrimary</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">

1
android_app/app/src/main/res/values/themes.xml
View File

@@ -27,6 +27,7 @@
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item> <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item> <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item> <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="colorAccent">@color/md_theme_light_primary</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">