Skip to content

Commit

Permalink
Reorganize appearance settings (#7207)
Browse files Browse the repository at this point in the history
  • Loading branch information
andre-m-dev committed May 31, 2024
1 parent 0a768e6 commit f8c864f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 23 deletions.
3 changes: 2 additions & 1 deletion ui/i18n/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<string name="download_pref_details">Details</string>
<string name="import_export_pref">Import/Export</string>
<string name="import_export_search_keywords">backup, restore</string>
<string name="appearance">Appearance</string>
<string name="theming">Theming</string>
<string name="external_elements">External elements</string>
<string name="interruptions">Interruptions</string>
<string name="playback_control">Playback control</string>
Expand Down Expand Up @@ -534,6 +534,7 @@
<string name="pref_show_subscription_title">Show titles</string>
<string name="pref_new_episodes_action_title">New episodes action</string>
<string name="pref_new_episodes_action_sum">Action to take for new episodes</string>
<string name="episode_information">Episode information</string>

<!-- About screen -->
<string name="about_pref">About</string>
Expand Down
5 changes: 0 additions & 5 deletions ui/preferences/src/main/res/xml/preferences_playback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
android:key="prefPlaybackSpeedLauncher"
android:summary="@string/pref_playback_speed_sum"
android:title="@string/playback_speed"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="prefPlaybackTimeRespectsSpeed"
android:summary="@string/pref_playback_time_respects_speed_sum"
android:title="@string/pref_playback_time_respects_speed_title"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="prefStreamOverDownload"
Expand Down
41 changes: 24 additions & 17 deletions ui/preferences/src/main/res/xml/preferences_user_interface.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch">

<PreferenceCategory android:title="@string/appearance">
<PreferenceCategory android:title="@string/theming">
<de.danoeh.antennapod.ui.preferences.preference.ThemePreference
android:key="prefTheme" />
<SwitchPreferenceCompat
Expand All @@ -16,22 +16,6 @@
android:key="prefTintedColors"
android:summary="@string/pref_tinted_theme_message"
android:defaultValue="false" />
<Preference
android:key="prefHiddenDrawerItems"
android:summary="@string/pref_nav_drawer_items_sum"
android:title="@string/pref_nav_drawer_items_title"/>
<SwitchPreferenceCompat
android:title="@string/pref_episode_cover_title"
android:key="prefEpisodeCover"
android:summary="@string/pref_episode_cover_summary"
android:defaultValue="true"
android:enabled="true"/>
<SwitchPreferenceCompat
android:title="@string/pref_show_remain_time_title"
android:key="showTimeLeft"
android:summary="@string/pref_show_remain_time_summary"
android:defaultValue="false"
android:enabled="true"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/subscriptions_label">
<Preference
Expand All @@ -50,6 +34,25 @@
android:key="prefSubscriptionsFilter"
android:summary="@string/pref_filter_feed_sum" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/episode_information">
<SwitchPreferenceCompat
android:title="@string/pref_episode_cover_title"
android:key="prefEpisodeCover"
android:summary="@string/pref_episode_cover_summary"
android:defaultValue="true"
android:enabled="true"/>
<SwitchPreferenceCompat
android:title="@string/pref_show_remain_time_title"
android:key="showTimeLeft"
android:summary="@string/pref_show_remain_time_summary"
android:defaultValue="false"
android:enabled="true"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="prefPlaybackTimeRespectsSpeed"
android:summary="@string/pref_playback_time_respects_speed_sum"
android:title="@string/pref_playback_time_respects_speed_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/external_elements">
<SwitchPreferenceCompat
android:defaultValue="false"
Expand Down Expand Up @@ -77,6 +80,10 @@
android:title="@string/pref_default_page"
android:summary="@string/pref_default_page_sum"
android:defaultValue="HomeFragment"/>
<Preference
android:key="prefHiddenDrawerItems"
android:summary="@string/pref_nav_drawer_items_sum"
android:title="@string/pref_nav_drawer_items_title"/>
<SwitchPreferenceCompat
android:key="prefBackButtonOpensDrawer"
android:title="@string/pref_back_button_opens_drawer"
Expand Down

0 comments on commit f8c864f

Please sign in to comment.