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

Merge remote-tracking branch 'origin/devel' into devel

Browse Source 
# Conflicts:
#	app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/PeriodicalBackupSettingsFragment.kt
#	app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/PeriodicalBackupWorker.kt
This commit is contained in:
Mac135135
2024-11-07 23:47:47 +03:00
parent 0162eaed97 1f0180d601
commit 30e43d3bfe
400 changed files with 5687 additions and 2878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/xml/pref_about.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/about">
<Preference
android:key="app_version"

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

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/appearance">
<org.koitharu.kotatsu.settings.utils.ThemeChooserPreference
android:key="color_theme"

20
app/src/main/res/xml/pref_backup_periodic.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.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"
android:title="@string/periodic_backups">
<SwitchPreferenceCompat
android:defaultValue="false"
@@ -9,6 +10,11 @@
android:layout="@layout/preference_toggle_header"
android:title="@string/periodic_backups_enable" />
<Preference
android:dependency="backup_periodic"
android:key="backup_periodic_output"
android:title="@string/backups_output_directory" />
<ListPreference
android:defaultValue="7"
android:dependency="backup_periodic"
@@ -18,10 +24,14 @@
android:title="@string/backup_frequency"
app:useSimpleSummaryProvider="true" />
<Preference
android:dependency="backup_periodic"
android:key="backup_periodic_output"
android:title="@string/backups_output_directory" />
<org.koitharu.kotatsu.settings.utils.SliderPreference
android:key="backup_periodic_count"
android:stepSize="1"
android:title="@string/max_backups_count"
android:valueFrom="1"
android:valueTo="32"
app:defaultValue="10"
app:useSimpleSummaryProvider="true" />
<Preference
android:dependency="backup_periodic"

26
app/src/main/res/xml/pref_downloads.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/downloads"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Preference
@@ -19,11 +20,18 @@
android:title="@string/preferred_download_format"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="downloads_wifi"
android:summary="@string/downloads_wifi_only_summary"
android:title="@string/downloads_wifi_only" />
<ListPreference
android:entries="@array/metered_network_options"
android:key="downloads_metered_network"
android:title="@string/download_over_cellular"
app:useSimpleSummaryProvider="true" />
<Preference
android:icon="@drawable/ic_info_outline"
android:key="tracker_notifications_info"
android:persistent="false"
android:selectable="false"
android:summary="@string/downloads_settings_info" />
<Preference
android:key="ignore_dose"
@@ -33,14 +41,6 @@
app:allowDividerAbove="true"
app:isPreferenceVisible="false" />
<Preference
android:icon="@drawable/ic_info_outline"
android:key="tracker_notifications_info"
android:persistent="false"
android:selectable="false"
android:summary="@string/downloads_settings_info"
app:allowDividerAbove="true" />
<PreferenceCategory android:title="@string/pages_saving">
<Preference

1
app/src/main/res/xml/pref_network.xml
View File

@@ -2,6 +2,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/network"
xmlns:tools="http://schemas.android.com/tools">
<ListPreference

5
app/src/main/res/xml/pref_notifications.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/notifications">
<SwitchPreferenceCompat
android:defaultValue="true"
@@ -35,4 +36,4 @@
app:allowDividerAbove="true"
app:isPreferenceVisible="false" />
</PreferenceScreen>
</PreferenceScreen>

3
app/src/main/res/xml/pref_proxy.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/proxy">
<ListPreference
android:defaultValue="DIRECT"

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

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/reader_settings">
<ListPreference
android:entries="@array/reader_modes"
@@ -101,11 +102,24 @@
android:title="@string/fullscreen_mode"
app:allowDividerAbove="true" />
<ListPreference
android:entries="@array/screen_orientations"
android:key="reader_orientation"
android:title="@string/screen_orientation"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="reader_screen_on"
android:summary="@string/keep_screen_on_summary"
android:title="@string/keep_screen_on" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="reader_bar"
android:summary="@string/reader_info_bar_summary"
android:title="@string/reader_info_bar" />
android:title="@string/reader_info_bar"
app:allowDividerAbove="true" />
<SwitchPreferenceCompat
android:defaultValue="true"
@@ -122,14 +136,7 @@
android:defaultValue="false"
android:key="pages_numbers"
android:summary="@string/show_pages_numbers_summary"
android:title="@string/show_pages_numbers" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="reader_screen_on"
android:summary="@string/keep_screen_on_summary"
android:title="@string/keep_screen_on"
app:allowDividerAbove="true" />
android:title="@string/show_pages_numbers" />x
<ListPreference
android:defaultValue="2"

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

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/services">
<Preference
android:enabled="@bool/is_sync_enabled"

9
app/src/main/res/xml/pref_source.xml
View File

@@ -18,4 +18,13 @@
android:summary="@string/download_slowdown_summary"
android:title="@string/download_slowdown" />
<Preference
android:icon="@drawable/ic_open_external"
android:key="open_browser"
android:order="500"
android:persistent="false"
android:title="@string/open_in_browser"
app:allowDividerAbove="true"
app:isPreferenceVisible="false" />
</PreferenceScreen>

3
app/src/main/res/xml/pref_sources.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.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"
android:title="@string/remote_sources">
<ListPreference
android:key="sources_sort_order"

3
app/src/main/res/xml/pref_suggestions.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/suggestions">
<SwitchPreferenceCompat
android:defaultValue="false"

3
app/src/main/res/xml/pref_tracker.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/check_for_new_chapters">
<SwitchPreferenceCompat
android:defaultValue="true"

3
app/src/main/res/xml/pref_user_data.xml
View File

@@ -1,7 +1,8 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/data_and_privacy">
<SwitchPreferenceCompat
android:key="protect_app"