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

Merge branch 'devel' into feature/mal

Browse Source 
# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/ScrobblingModule.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/domain/model/ScrobblerService.kt
#	app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
#	app/src/main/res/xml/pref_history.xml
This commit is contained in:
Zakhar Timoshenko
2023-01-30 00:53:13 +03:00
parent 2c71110fa5 6ca6ec28ac
commit ee2538ba7f
158 changed files with 3006 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/xml/locales.xml
View File

@@ -14,16 +14,16 @@
<locale android:name="in" />
<locale android:name="it" />
<locale android:name="ja" />
<locale android:name="nb-rNO" />
<locale android:name="nb-NO" />
<locale android:name="pl" />
<locale android:name="pt" />
<locale android:name="pt-rBR" />
<locale android:name="pt-BR" />
<locale android:name="ru" />
<locale android:name="si" />
<locale android:name="sr" />
<locale android:name="sv" />
<locale android:name="tr" />
<locale android:name="uk" />
<locale android:name="zh-rCN" />
<locale android:name="zh-rTW" />
<locale android:name="zh-CN" />
<locale android:name="zh-TW" />
</locale-config>

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/app_name">
@@ -9,10 +10,22 @@
android:persistent="false"
android:summary="@string/check_for_updates" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="logging"
android:summary="@string/enable_logging_summary"
android:title="@string/enable_logging" />
<Preference
android:dependency="logging"
android:key="logs_share"
android:title="@string/share_logs" />
<Preference
android:key="about_app_translation"
android:summary="@string/about_app_translation_summary"
android:title="@string/about_app_translation" />
android:title="@string/about_app_translation"
app:allowDividerAbove="true" />
<org.koitharu.kotatsu.settings.utils.AboutLinksPreference />

19
app/src/main/res/xml/pref_anilist.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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"
app:initialExpandedChildrenCount="5">
<Preference
android:key="al_user"
android:persistent="false"
android:title="@string/loading_"
app:iconSpaceReserved="true" />
<Preference
android:key="al_logout"
android:persistent="false"
android:title="@string/logout"
app:allowDividerAbove="true" />
</PreferenceScreen>

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

@@ -24,6 +24,10 @@
android:summary="@string/black_dark_theme_summary"
android:title="@string/black_dark_theme" />
<org.koitharu.kotatsu.settings.utils.ActivityListPreference
android:key="app_locale"
android:title="@string/language" />
<ListPreference
android:key="date_format"
android:title="@string/date_format" />
@@ -56,4 +60,4 @@
android:summary="@string/protect_application_summary"
android:title="@string/protect_application" />
</PreferenceScreen>
</PreferenceScreen>

15
app/src/main/res/xml/pref_content.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"
xmlns:tools="http://schemas.android.com/tools">
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.settings.sources.SourcesSettingsFragment"
@@ -19,6 +20,16 @@
android:title="@string/dns_over_https"
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="0"
android:entries="@array/network_policy"
android:entryValues="@array/values_network_policy"
android:key="prefetch_content"
android:title="@string/prefetch_content"
app:isPreferenceVisible="false"
app:useSimpleSummaryProvider="true"
tools:isPreferenceVisible="true" />
<Preference
android:key="local_storage"
android:persistent="false"
@@ -50,4 +61,4 @@
android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
android:title="@string/backup_restore" />
</PreferenceScreen>
</PreferenceScreen>

7
app/src/main/res/xml/pref_history.xml
View File

@@ -23,6 +23,7 @@
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.scrobbling.shikimori.ui.ShikimoriSettingsFragment"
android:icon="@drawable/ic_shikimori"
android:key="shikimori"
android:icon="@drawable/ic_shikimori"
android:title="@string/shikimori" />
@@ -33,6 +34,12 @@
android:icon="@drawable/ic_mal"
android:title="@string/mal" />
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.scrobbling.anilist.ui.AniListSettingsFragment"
android:icon="@drawable/ic_anilist"
android:key="anilist"
android:title="@string/anilist" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/data_deletion">

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

@@ -61,20 +61,19 @@
android:title="@string/show_pages_numbers" />
<ListPreference
android:defaultValue="allow"
android:entries="@array/screenshots_policy"
android:entryValues="@array/values_screenshots_policy"
android:key="screenshots_policy"
android:title="@string/screenshots_policy"
app:defaultValue="allow"
app:useSimpleSummaryProvider="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:defaultValue="2"
app:useSimpleSummaryProvider="true" />
</PreferenceScreen>