Remove cache size setting. Add advanced settings section. Other minor changes.

This commit is contained in:
inorichi
2016-01-02 21:09:46 +01:00
parent 77d2e6643a
commit 453a187938
17 changed files with 178 additions and 166 deletions

View File

@@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="#333333"
android:background="@color/reader_menu_background"
android:paddingRight="10dp"
android:paddingLeft="5dp"
android:paddingTop="5dp"

View File

@@ -34,6 +34,6 @@
android:layout_height="wrap_content"
android:id="@+id/keep_screen_on"
style="@style/grey_text"
android:text="Keep screen on"/>
android:text="@string/pref_keep_screen_on"/>
</LinearLayout>

View File

@@ -28,18 +28,6 @@
<item>3</item>
</string-array>
<string-array name="cache_size">
<item>50 MB</item>
<item>75 MB</item>
<item>100 MB</item>
</string-array>
<string-array name="cache_values">
<item>50</item>
<item>75</item>
<item>100</item>
</string-array>
<string-array name="reader_themes">
<item>@string/white_theme</item>
<item>@string/black_theme</item>

View File

@@ -4,7 +4,7 @@
<string name="pref_category_reader_key">pref_category_reader_key</string>
<string name="pref_category_accounts_key">pref_category_accounts_key</string>
<string name="pref_category_downloads_key">pref_category_downloads_key</string>
<string name="pref_category_cache_key">pref_category_cache_key</string>
<string name="pref_category_advanced_key">pref_category_advanced_key</string>
<string name="pref_category_about_key">pref_category_about_key</string>
<string name="pref_library_columns_dialog_key">pref_library_columns_dialog_key</string>
@@ -24,8 +24,8 @@
<string name="pref_download_directory_key">pref_download_directory_key</string>
<string name="pref_download_slots_key">pref_download_slots_key</string>
<string name="pref_chapter_cache_size_key">pref_chapter_cache_size_key</string>
<string name="pref_clear_chapter_cache_key">pref_clear_chapter_cache_key</string>
<string name="pref_clear_database_key">pref_clear_database_key</string>
<string name="pref_version">pref_version</string>
<string name="pref_build_time">pref_build_time</string>

View File

@@ -38,6 +38,8 @@
<!-- Buttons -->
<string name="button_ok">OK</string>
<string name="button_cancel">Cancel</string>
<string name="button_yes">Yes</string>
<string name="button_no">No</string>
<!-- Operations -->
<string name="deleting">Deleting…</string>
@@ -49,7 +51,7 @@
<string name="pref_category_reader">Reader</string>
<string name="pref_category_accounts">Accounts</string>
<string name="pref_category_downloads">Downloads</string>
<string name="pref_category_cache">Cache</string>
<string name="pref_category_advanced">Advanced</string>
<string name="pref_category_about">About</string>
<!-- General section -->
@@ -58,14 +60,14 @@
<string name="landscape">Landscape</string>
<string name="default_columns">Default</string>
<!-- Reader section -->
<string name="pref_hide_status_bar">Hide status bar</string>
<string name="pref_lock_orientation">Lock orientation</string>
<string name="pref_enable_transitions">Enable transitions</string>
<string name="pref_show_page_number">Show page number</string>
<string name="pref_custom_brightness">Use custom brightness</string>
<string name="pref_reader_theme">Reader theme</string>
<string name="pref_keep_screen_on">Keep screen on</string>
<string name="pref_reader_theme">Background color</string>
<string name="white_theme">White</string>
<string name="black_theme">Black</string>
<string name="pref_viewer_type">Default viewer</string>
@@ -79,12 +81,14 @@
<string name="pref_download_directory">Downloads directory</string>
<string name="pref_download_slots">Simultaneous downloads</string>
<!-- Cache section -->
<string name="pref_chapter_cache_size">Chapters cache size</string>
<!-- Advanced section -->
<string name="pref_clear_chapter_cache">Clear chapter cache</string>
<string name="used_cache">Used: %1$s</string>
<string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
<string name="cache_delete_error">An error occurred clearing cache</string>
<string name="pref_clear_database">Clear database</string>
<string name="pref_clear_database_summary">Delete mangas and chapters that are not in your library</string>
<string name="clear_database_confirmation">Are you sure? Read chapters and progress of non library mangas will be lost</string>
<!-- About section -->
<string name="version">Version</string>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:title="@string/pref_clear_chapter_cache"
android:key="@string/pref_clear_chapter_cache_key" />
<Preference
android:title="@string/pref_clear_database"
android:key="@string/pref_clear_database_key"
android:summary="@string/pref_clear_database_summary"/>
</PreferenceScreen>

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<eu.kanade.mangafeed.ui.setting.preference.IntListPreference
android:title="@string/pref_chapter_cache_size"
android:key="@string/pref_chapter_cache_size_key"
android:entries="@array/cache_size"
android:entryValues="@array/cache_values"
android:summary="%s"
android:defaultValue="75"/>
<Preference
android:title="@string/pref_clear_chapter_cache"
android:key="@string/pref_clear_chapter_cache_key" />
</PreferenceScreen>

View File

@@ -22,9 +22,9 @@
android:title="@string/pref_category_accounts" />
<Preference
android:key="@string/pref_category_cache_key"
android:key="@string/pref_category_advanced_key"
android:persistent="false"
android:title="@string/pref_category_cache" />
android:title="@string/pref_category_advanced" />
<Preference
android:key="@string/pref_category_about_key"