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

feat(ui): use material3 overlay for styling dialogs and preference switches (#268)

Browse source
This commit is contained in:
Yash Garg 2023-02-04 03:46:34 +05:30 committed by GitHub
parent a6d5a70917
commit d17cfcde95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/res/layout/preference_material3_switch.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false" />

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

@ -40,6 +40,8 @@
<!-- Extra --> <!-- Extra -->
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
<item name="dialogCornerRadius">28dp</item>
</style> </style>
<string-array name="themes"> <string-array name="themes">

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

@ -7,9 +7,10 @@
app:key="theme" app:key="theme"
app:title="@string/theme" app:title="@string/theme"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<SwitchPreference <SwitchPreferenceCompat
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>

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

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreferenceCompat
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"

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

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreferenceCompat
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"
android:defaultValue="false" /> app:widgetLayout="@layout/preference_material3_switch" />
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="false"
app:key="download_roaming" app:key="download_roaming"
app:title="@string/download_roaming" app:title="@string/download_roaming"
android:defaultValue="false" /> app:widgetLayout="@layout/preference_material3_switch" />
</PreferenceScreen> </PreferenceScreen>

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

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreferenceCompat
app:key="pref_player_display_extended_title" app:key="pref_player_display_extended_title"
app:summary="@string/display_extended_title_summary" app:summary="@string/display_extended_title_summary"
app:title="@string/display_extended_title" /> app:title="@string/display_extended_title"
app:widgetLayout="@layout/preference_material3_switch" />
<Preference <Preference
app:key="pref_player_subtitles" app:key="pref_player_subtitles"
@ -11,11 +12,12 @@
app:title="@string/subtitles" /> app:title="@string/subtitles" />
<PreferenceCategory app:title="@string/mpv_player"> <PreferenceCategory app:title="@string/mpv_player">
<SwitchPreference <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"
<DropDownPreference app:widgetLayout="@layout/preference_material3_switch" />
<ListPreference
app:defaultValue="mediacodec-copy" app:defaultValue="mediacodec-copy"
app:dependency="pref_player_mpv" app:dependency="pref_player_mpv"
app:entries="@array/mpv_hwdec" app:entries="@array/mpv_hwdec"
@ -30,7 +32,7 @@
app:entryValues="@array/mpv_hwdec_codecs" app:entryValues="@array/mpv_hwdec_codecs"
app:key="pref_player_mpv_hwdec_codecs" app:key="pref_player_mpv_hwdec_codecs"
app:title="@string/pref_player_mpv_hwdec_codecs" /> app:title="@string/pref_player_mpv_hwdec_codecs" />
<DropDownPreference <ListPreference
app:defaultValue="gpu" app:defaultValue="gpu"
app:dependency="pref_player_mpv" app:dependency="pref_player_mpv"
app:entries="@array/mpv_vos" app:entries="@array/mpv_vos"
@ -38,7 +40,7 @@
app:key="pref_player_mpv_vo" app:key="pref_player_mpv_vo"
app:title="@string/pref_player_mpv_vo" app:title="@string/pref_player_mpv_vo"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<DropDownPreference <ListPreference
app:defaultValue="audiotrack" app:defaultValue="audiotrack"
app:dependency="pref_player_mpv" app:dependency="pref_player_mpv"
app:entries="@array/mpv_aos" app:entries="@array/mpv_aos"
@ -46,7 +48,7 @@
app:key="pref_player_mpv_ao" app:key="pref_player_mpv_ao"
app:title="@string/pref_player_mpv_ao" app:title="@string/pref_player_mpv_ao"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<DropDownPreference <ListPreference
app:defaultValue="opengl" app:defaultValue="opengl"
app:dependency="pref_player_mpv" app:dependency="pref_player_mpv"
app:entries="@array/mpv_gpu_api" app:entries="@array/mpv_gpu_api"
@ -57,26 +59,30 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/gestures"> <PreferenceCategory app:title="@string/gestures">
<SwitchPreference <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"
<SwitchPreference app:widgetLayout="@layout/preference_material3_switch" />
<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"
<SwitchPreference app:widgetLayout="@layout/preference_material3_switch" />
<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"
<SwitchPreference app:widgetLayout="@layout/preference_material3_switch" />
<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">
@ -92,10 +98,11 @@
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
<SwitchPreference <SwitchPreferenceCompat
app:defaultValue="true" app:defaultValue="true"
app:key="pref_player_intro_skipper" app:key="pref_player_intro_skipper"
app:summary="@string/pref_player_intro_skipper_summary"
app:title="@string/pref_player_intro_skipper" app:title="@string/pref_player_intro_skipper"
app:summary="@string/pref_player_intro_skipper_summary"/> app:widgetLayout="@layout/preference_material3_switch" />
</PreferenceScreen> </PreferenceScreen>