From d33e3c27fc0313369824d55a0bbd1d01621f58aa Mon Sep 17 00:00:00 2001 From: seven332 Date: Mon, 11 Apr 2016 13:59:35 +0800 Subject: [PATCH] Rename image_size to image_resolution --- app/src/main/java/com/hippo/ehviewer/Settings.java | 14 +++++++------- .../ehviewer/ui/fragment/DownloadFragment.java | 8 ++++---- app/src/main/res/values-zh-rCN/strings.xml | 6 +++--- app/src/main/res/values-zh-rHK/strings.xml | 6 +++--- app/src/main/res/values-zh-rTW/strings.xml | 6 +++--- app/src/main/res/values/arrays.xml | 6 +++--- app/src/main/res/values/strings.xml | 6 +++--- app/src/main/res/xml/download_settings.xml | 8 ++++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index 684552f0d..7bda03a96 100644 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -56,7 +56,7 @@ public class Settings { private static EhConfig loadEhConfig() { EhConfig ehConfig= new EhConfig(); - ehConfig.imageSize = getImageSize(); + ehConfig.imageSize = getImageResolution(); ehConfig.excludedLanguages = getExcludedLanguages(); ehConfig.defaultCategories = getDefaultCategories(); ehConfig.excludedNamespaces = getExcludedTagNamespaces(); @@ -628,17 +628,17 @@ public class Settings { putIntToStr(KEY_PRELOAD_IMAGE, value); } - public static final String KEY_IMAGE_SIZE = "image_size"; - public static final String DEFAULT_IMAGE_SIZE = EhConfig.IMAGE_SIZE_AUTO; + public static final String KEY_IMAGE_RESOLUTION = "image_size"; + public static final String DEFAULT_IMAGE_RESOLUTION = EhConfig.IMAGE_SIZE_AUTO; - public static String getImageSize() { - return getString(KEY_IMAGE_SIZE, DEFAULT_IMAGE_SIZE); + public static String getImageResolution() { + return getString(KEY_IMAGE_RESOLUTION, DEFAULT_IMAGE_RESOLUTION); } - public static void putImageSize(String value) { + public static void putImageResolution(String value) { sEhConfig.imageSize = value; sEhConfig.setDirty(); - putString(KEY_IMAGE_SIZE, value); + putString(KEY_IMAGE_RESOLUTION, value); } private static final String KEY_DOWNLOAD_ORIGIN_IMAGE = "download_origin_image"; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java index 3ab12b319..31aeb36b4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java @@ -54,13 +54,13 @@ public class DownloadFragment extends PreferenceFragment implements addPreferencesFromResource(R.xml.download_settings); Preference mediaScan = findPreference(Settings.KEY_MEDIA_SCAN); - Preference imageSize = findPreference(Settings.KEY_IMAGE_SIZE); + Preference imageResolution = findPreference(Settings.KEY_IMAGE_RESOLUTION); mDownloadLocation = findPreference(KEY_DOWNLOAD_LOCATION); onUpdateDownloadLocation(); mediaScan.setOnPreferenceChangeListener(this); - imageSize.setOnPreferenceChangeListener(this); + imageResolution.setOnPreferenceChangeListener(this); if (mDownloadLocation != null) { mDownloadLocation.setOnPreferenceClickListener(this); @@ -203,9 +203,9 @@ public class DownloadFragment extends PreferenceFragment implements } } return true; - } else if (Settings.KEY_IMAGE_SIZE.equals(key)) { + } else if (Settings.KEY_IMAGE_RESOLUTION.equals(key)) { if (newValue instanceof String) { - Settings.putImageSize((String) newValue); + Settings.putImageResolution((String) newValue); } return true; } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3bc0ddf10..27795b15a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -422,9 +422,9 @@ 最多同时下载 %s 张图片 预载图片 向后预载 %s 张图片 - 图片大小 - %s，大于 1280x 的分辨率可能不好使 - 自动 + 图片分辨率 + %s，大于 1280x 的分辨率可能不好使 + 自动 下载原图 这很危险！勾选此项会导致下载配额迅速流失 允许媒体扫描 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index caac50754..7cd875be6 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -422,9 +422,9 @@ 最多同時下載 %s 張圖片 預載圖片 向後預載 %s 張圖片 - 圖片大小 - %s，大於 1280x 的分辨率可能不好使 - 自動 + 圖片分辨率 + %s，大於 1280x 的分辨率可能不好使 + 自動 下載原圖 這很危險！勾選此項會導致下載配額迅速流失 允許媒體掃描 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 51ae4e7de..f8571ebd4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -422,9 +422,9 @@ 最多同時下載 %s 張圖片 預載圖片 向後預載 %s 張圖片 - 圖片大小 - %s，大於 1280x 的解析度可能不好使 - 自動 + 圖片解析度 + %s，大於 1280x 的解析度可能不好使 + 自動 下載原圖 這很危險！勾選此項會導致下載配額迅速流失 允許媒體掃描 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7b6d72288..d3a33ab91 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -88,8 +88,8 @@ 17 - - @string/settings_download_image_size_auto + + @string/settings_download_image_resolution_auto 780x 980x 1280x @@ -97,7 +97,7 @@ 2400x - + a 780 980 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 759aaacb2..49b1c1e34 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -467,9 +467,9 @@ Up to %s images Preload image Preload next %s image - Image size - %s, resolutions above 1280x may not work - Auto + Image resolution + %s, resolutions above 1280x may not work + Auto Download original image It is dangerous! You may get 509 error Restore download items diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml index 0fbbad25f..f7b643944 100644 --- a/app/src/main/res/xml/download_settings.xml +++ b/app/src/main/res/xml/download_settings.xml @@ -48,10 +48,10 @@