prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganize settings

Browse Source
This commit is contained in:
Koitharu
2023-06-05 12:53:12 +03:00
parent e794f84c6f
commit bc3a7fc211
23 changed files with 333 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/res/xml/pref_appearance.xml
View File

@@ -3,6 +3,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.koitharu.kotatsu.settings.utils.ThemeChooserPreference
android:key="color_theme"
android:title="@string/color_theme"
app:isPreferenceVisible="@bool/is_color_themes_available" />
<ListPreference
android:defaultValue="-1"
android:entries="@array/themes"
@@ -11,11 +16,6 @@
android:title="@string/theme"
app:useSimpleSummaryProvider="true" />
<org.koitharu.kotatsu.settings.utils.ThemeChooserPreference
android:key="color_theme"
android:title="@string/color_theme"
app:isPreferenceVisible="@bool/is_color_themes_available" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="amoled_theme"
@@ -46,6 +46,15 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/remote_sources">
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="sources_grid"
android:title="@string/show_in_grid_view" />
</PreferenceCategory>
<org.koitharu.kotatsu.settings.utils.ActivityListPreference
android:key="app_locale"
android:title="@string/language"
@@ -55,13 +64,6 @@
android:defaultValue="false"
android:key="exit_confirm"
android:summary="@string/exit_confirmation_summary"
android:title="@string/exit_confirmation"
app:allowDividerAbove="true" />
<SwitchPreferenceCompat
android:key="protect_app"
android:persistent="false"
android:summary="@string/protect_application_summary"
android:title="@string/protect_application" />
android:title="@string/exit_confirmation" />
</PreferenceScreen>

23
app/src/main/res/xml/pref_backup.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Preference
android:key="backup"
android:persistent="false"
android:title="@string/create_backup" />
<Preference
android:key="restore"
android:persistent="false"
android:title="@string/restore_backup" />
<Preference
android:icon="@drawable/ic_info_outline"
android:persistent="false"
android:selectable="false"
android:summary="@string/backup_information"
app:allowDividerAbove="true" />
</PreferenceScreen>

22
app/src/main/res/xml/pref_downloads.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:key="local_storage"
android:persistent="false"
android:title="@string/manga_save_location" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="downloads_wifi"
android:summary="@string/downloads_wifi_only_summary"
android:title="@string/downloads_wifi_only" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="downloads_slowdown"
android:summary="@string/download_slowdown_summary"
android:title="@string/download_slowdown" />
</PreferenceScreen>

63
app/src/main/res/xml/pref_content.xml → app/src/main/res/xml/pref_network.xml
View File

@@ -4,22 +4,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.sources.SourcesListFragment"
android:key="remote_sources"
android:title="@string/remote_sources" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="sources_grid"
android:title="@string/show_in_grid_view" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.SuggestionsSettingsFragment"
android:key="suggestions"
android:title="@string/suggestions"
app:allowDividerAbove="true" />
<ListPreference
android:defaultValue="0"
android:entries="@array/network_policy"
@@ -30,11 +14,24 @@
app:useSimpleSummaryProvider="true"
tools:isPreferenceVisible="true" />
<ListPreference
android:defaultValue="2"
android:entries="@array/network_policy"
android:entryValues="@array/values_network_policy"
android:key="pages_preload"
android:title="@string/preload_pages"
app:useSimpleSummaryProvider="true" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.ProxySettingsFragment"
android:key="proxy"
android:title="@string/proxy"
app:allowDividerAbove="true" />
<ListPreference
android:entries="@array/doh_providers"
android:key="doh"
android:title="@string/dns_over_https"
app:allowDividerAbove="true"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
@@ -43,40 +40,14 @@
android:summary="@string/images_procy_description"
android:title="@string/images_proxy_title" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.ProxySettingsFragment"
android:key="proxy"
android:title="@string/proxy" />
<SwitchPreferenceCompat
android:key="ssl_bypass"
android:title="@string/ignore_ssl_errors" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="mirror_switching"
android:summary="@string/mirror_switching_summary"
android:title="@string/mirror_switching" />
<PreferenceCategory android:title="@string/downloads">
<Preference
android:key="local_storage"
android:persistent="false"
android:title="@string/manga_save_location" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="downloads_wifi"
android:summary="@string/downloads_wifi_only_summary"
android:title="@string/downloads_wifi_only" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="downloads_slowdown"
android:summary="@string/download_slowdown_summary"
android:title="@string/download_slowdown" />
</PreferenceCategory>
<SwitchPreferenceCompat
android:key="ssl_bypass"
android:title="@string/ignore_ssl_errors" />
</PreferenceScreen>

19
app/src/main/res/xml/pref_reader.xml
View File

@@ -19,8 +19,15 @@
android:entries="@array/zoom_modes"
android:key="zoom_mode"
android:title="@string/scale_mode"
app:allowDividerAbove="true"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="webtoon_zoom"
android:summary="@string/webtoon_zoom_summary"
android:title="@string/webtoon_zoom" />
<MultiSelectListPreference
android:defaultValue="@array/values_reader_switchers_default"
android:entries="@array/reader_switchers"
@@ -38,17 +45,15 @@
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="reader_animation"
android:summary="@string/pages_animation_summary"
android:title="@string/pages_animation" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="webtoon_zoom"
android:title="@string/webtoon_zoom" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="reader_bar"
android:title="@string/reader_info_bar" />
android:summary="@string/reader_info_bar_summary"
android:title="@string/reader_info_bar"
app:allowDividerAbove="true" />
<SwitchPreferenceCompat
android:defaultValue="true"
@@ -58,6 +63,7 @@
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="pages_numbers"
android:summary="@string/show_pages_numbers_summary"
android:title="@string/show_pages_numbers" />
<ListPreference
@@ -66,6 +72,7 @@
android:entryValues="@array/values_screenshots_policy"
android:key="screenshots_policy"
android:title="@string/screenshots_policy"
app:allowDividerAbove="true"
app:useSimpleSummaryProvider="true" />
<ListPreference

31
app/src/main/res/xml/pref_root.xml
View File

@@ -9,15 +9,10 @@
android:title="@string/appearance" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.ContentSettingsFragment"
android:fragment="org.koitharu.kotatsu.settings.sources.SourcesListFragment"
android:icon="@drawable/ic_manga_source"
android:key="content"
android:title="@string/content" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.HistorySettingsFragment"
android:icon="@drawable/ic_history"
android:title="@string/history_and_cache" />
android:title="@string/remote_sources" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.ReaderSettingsFragment"
@@ -25,9 +20,19 @@
android:title="@string/reader_settings" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.ServicesSettingsFragment"
android:icon="@drawable/ic_services"
android:title="@string/services" />
android:fragment="org.koitharu.kotatsu.settings.NetworkSettingsFragment"
android:icon="@drawable/ic_web"
android:title="@string/network" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.UserDataSettingsFragment"
android:icon="@drawable/ic_data_privacy"
android:title="@string/data_and_privacy" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.DownloadsSettingsFragment"
android:icon="@drawable/ic_download"
android:title="@string/downloads" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.tracker.TrackerSettingsFragment"
@@ -35,9 +40,9 @@
android:title="@string/check_for_new_chapters" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
android:icon="@drawable/ic_backup_restore"
android:title="@string/backup_restore" />
android:fragment="org.koitharu.kotatsu.settings.ServicesSettingsFragment"
android:icon="@drawable/ic_services"
android:title="@string/services" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.about.AboutSettingsFragment"

6
app/src/main/res/xml/pref_services.xml
View File

@@ -16,6 +16,12 @@
android:key="sync_settings"
android:title="@string/sync_settings" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.SuggestionsSettingsFragment"
android:key="suggestions"
android:title="@string/suggestions"
app:allowDividerAbove="true" />
<PreferenceCategory android:title="@string/tracking">
<Preference

22
app/src/main/res/xml/pref_history.xml → app/src/main/res/xml/pref_user_data.xml
View File

@@ -2,6 +2,12 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreferenceCompat
android:key="protect_app"
android:persistent="false"
android:summary="@string/protect_application_summary"
android:title="@string/protect_application" />
<SwitchPreferenceCompat
android:key="history_exclude_nsfw"
android:summary="@string/exclude_nsfw_from_history_summary"
@@ -13,6 +19,22 @@
android:summary="@string/history_shortcuts_summary"
android:title="@string/history_shortcuts" />
<PreferenceCategory android:title="@string/backup_restore">
<Preference
android:key="backup"
android:persistent="false"
android:summary="@string/backup_information"
android:title="@string/create_backup" />
<Preference
android:key="restore"
android:persistent="false"
android:summary="@string/restore_summary"
android:title="@string/restore_backup" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/data_deletion">
<Preference