nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(m3): use a global preference style to prevent adding widgetLayout (#270)

Browse source
This commit is contained in:
Yash Garg 2023-02-05 05:49:31 +05:30 committed by GitHub
parent 7b5745acf1
commit 725cc8af79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,4 +9,13 @@
<item name="android:fontFamily">monospace</item> <item name="android:fontFamily">monospace</item>
</style> </style>
<!-- Preferences theme overlay to use new switch style, taken from Material Components Catalog example. -->
<style name="ThemeOverlay.Findroid.Preference" parent="PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.Catalog</item>
</style>
<style name="Preference.SwitchPreferenceCompat.Catalog" parent="Preference.SwitchPreferenceCompat.Material">
<item name="android:widgetLayout">@layout/preference_material3_switch</item>
</style>
</resources> </resources>

5
core/src/main/res/values/themes.xml
View file

@ -28,7 +28,9 @@
<item name="android:windowLightStatusBar">?attr/isLightTheme</item> <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
<!-- Shapes --> <!-- Shapes -->
<item name="shapeAppearanceCornerExtraSmall">@style/ShapeAppearance.Findroid.Corner.ExtraSmall</item> <item name="shapeAppearanceCornerExtraSmall">
@style/ShapeAppearance.Findroid.Corner.ExtraSmall
</item>
<item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Findroid.Corner.Small</item> <item name="shapeAppearanceCornerSmall">@style/ShapeAppearance.Findroid.Corner.Small</item>
<!-- Toolbar --> <!-- Toolbar -->
@ -42,6 +44,7 @@
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item> <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
<item name="dialogCornerRadius">28dp</item> <item name="dialogCornerRadius">28dp</item>
<item name="preferenceTheme">@style/ThemeOverlay.Findroid.Preference</item>
</style> </style>
<string-array name="themes"> <string-array name="themes">

3
core/src/main/res/xml/fragment_settings_appearance.xml
View file

@ -11,6 +11,5 @@
app:defaultValue="true" app:defaultValue="true"
app:key="dynamic_colors" app:key="dynamic_colors"
app:summary="@string/dynamic_colors_summary" app:summary="@string/dynamic_colors_summary"
app:title="@string/dynamic_colors" app:title="@string/dynamic_colors" />
app:widgetLayout="@layout/preference_material3_switch" />
</PreferenceScreen> </PreferenceScreen>

3
core/src/main/res/xml/fragment_settings_cache.xml
View file

@ -4,8 +4,7 @@
app:defaultValue="true" app:defaultValue="true"
app:key="pref_image_cache" app:key="pref_image_cache"
app:summary="@string/settings_use_cache_summary" app:summary="@string/settings_use_cache_summary"
app:title="@string/settings_use_cache_title" app:title="@string/settings_use_cache_title" />
app:widgetLayout="@layout/preference_material3_switch" />
<EditTextPreference <EditTextPreference
app:defaultValue="20" app:defaultValue="20"
app:dependency="pref_image_cache" app:dependency="pref_image_cache"

6
core/src/main/res/xml/fragment_settings_downloads.xml
View file

@ -4,11 +4,9 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
app:key="download_mobile_data" app:key="download_mobile_data"
app:title="@string/download_mobile_data" app:title="@string/download_mobile_data" />
app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
app:key="download_roaming" app:key="download_roaming"
app:title="@string/download_roaming" app:title="@string/download_roaming" />
app:widgetLayout="@layout/preference_material3_switch" />
</PreferenceScreen> </PreferenceScreen>

18
core/src/main/res/xml/fragment_settings_player.xml
View file

@ -15,8 +15,7 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="pref_player_mpv" app:key="pref_player_mpv"
app:summary="@string/mpv_player_summary" app:summary="@string/mpv_player_summary"
app:title="@string/mpv_player" app:title="@string/mpv_player" />
app:widgetLayout="@layout/preference_material3_switch" />
<ListPreference <ListPreference
app:defaultValue="mediacodec-copy" app:defaultValue="mediacodec-copy"
app:dependency="pref_player_mpv" app:dependency="pref_player_mpv"
@ -62,34 +61,29 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:key="pref_player_gestures" app:key="pref_player_gestures"
app:title="@string/player_gestures" app:title="@string/player_gestures" />
app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:dependency="pref_player_gestures" app:dependency="pref_player_gestures"
app:key="pref_player_gestures_vb" app:key="pref_player_gestures_vb"
app:summary="@string/player_gestures_vb_summary" app:summary="@string/player_gestures_vb_summary"
app:title="@string/player_gestures_vb" app:title="@string/player_gestures_vb" />
app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:dependency="pref_player_gestures" app:dependency="pref_player_gestures"
app:key="pref_player_gestures_zoom" app:key="pref_player_gestures_zoom"
app:summary="@string/player_gestures_zoom_summary" app:summary="@string/player_gestures_zoom_summary"
app:title="@string/player_gestures_zoom" app:title="@string/player_gestures_zoom" />
app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:dependency="pref_player_gestures" app:dependency="pref_player_gestures"
app:key="pref_player_gestures_seek" app:key="pref_player_gestures_seek"
app:summary="@string/player_gestures_seek_summary" app:summary="@string/player_gestures_seek_summary"
app:title="@string/player_gestures_seek" app:title="@string/player_gestures_seek" />
app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:dependency="pref_player_gestures_vb" app:dependency="pref_player_gestures_vb"
app:key="pref_player_brightness_remember" app:key="pref_player_brightness_remember"
app:title="@string/player_brightness_remember" app:title="@string/player_brightness_remember" />
app:widgetLayout="@layout/preference_material3_switch" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/seeking"> <PreferenceCategory app:title="@string/seeking">