Merge branch 'feature/percent' into devel

This commit is contained in:
Koitharu
2022-07-02 14:51:50 +03:00
38 changed files with 557 additions and 110 deletions

View File

@@ -2,23 +2,39 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:key="search_history_clear"
android:persistent="false"
android:summary="@string/loading_"
android:title="@string/clear_search_history" />
<Preference
android:key="updates_feed_clear"
android:persistent="false"
android:summary="@string/loading_"
android:title="@string/clear_updates_feed" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="reading_indicators"
android:summary="@string/show_reading_indicators_summary"
android:title="@string/show_reading_indicators" />
<SwitchPreferenceCompat
android:key="history_exclude_nsfw"
android:summary="@string/exclude_nsfw_from_history_summary"
android:title="@string/exclude_nsfw_from_history" />
<PreferenceCategory android:title="@string/cache">
<PreferenceCategory android:title="@string/tracking">
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.scrobbling.shikimori.ui.ShikimoriSettingsFragment"
android:key="shikimori"
android:title="@string/shikimori" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/data_deletion">
<Preference
android:key="search_history_clear"
android:persistent="false"
android:summary="@string/loading_"
android:title="@string/clear_search_history" />
<Preference
android:key="updates_feed_clear"
android:persistent="false"
android:summary="@string/loading_"
android:title="@string/clear_updates_feed" />
<Preference
android:key="thumbs_cache_clear"
@@ -32,6 +48,12 @@
android:summary="@string/computing_"
android:title="@string/clear_pages_cache" />
<Preference
android:key="cookies_clear"
android:persistent="false"
android:summary="@string/clear_cookies_summary"
android:title="@string/clear_cookies" />
</PreferenceCategory>
<Preference
@@ -39,13 +61,4 @@
android:persistent="false"
android:title="@string/clear_cookies" />
<PreferenceCategory android:title="@string/tracking">
<PreferenceScreen
android:fragment="org.koitharu.kotatsu.scrobbling.shikimori.ui.ShikimoriSettingsFragment"
android:key="shikimori"
android:title="@string/shikimori" />
</PreferenceCategory>
</PreferenceScreen>