yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename image_size to image_resolution

Browse Source
This commit is contained in:
seven332 committed 2016-04-11 13:59:35 +08:00
1 parent 189a95e49c
commit d33e3c27fc
8 files changed
+30 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/Settings.java
+7 -7
View File
@@ -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";
app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java
+4 -4
View File
@@ -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;
}
app/src/main/res/values-zh-rCN/strings.xml
+3 -3
View File
@@ -422,9 +422,9 @@
<string name="settings_download_multi_thread_download_summary">最多同时下载 %s 张图片</string>
<string name="settings_download_preload_image">预载图片</string>
<string name="settings_download_preload_image_summary">向后预载 %s 张图片</string>
<string name="settings_download_image_size">图片大小</string>
<string name="settings_download_image_size_summary">%s，大于 1280x 的分辨率可能不好使</string>
<string name="settings_download_image_size_auto">自动</string>
<string name="settings_download_image_resolution">图片分辨率</string>
<string name="settings_download_image_resolution_summary">%s，大于 1280x 的分辨率可能不好使</string>
<string name="settings_download_image_resolution_auto">自动</string>
<string name="settings_download_download_origin_image">下载原图</string>
<string name="settings_download_download_origin_image_summary">这很危险！勾选此项会导致下载配额迅速流失</string>
<string name="settings_download_media_scan">允许媒体扫描</string>
app/src/main/res/values-zh-rHK/strings.xml
+3 -3
View File
@@ -422,9 +422,9 @@
<string name="settings_download_multi_thread_download_summary">最多同時下載 %s 張圖片</string>
<string name="settings_download_preload_image">預載圖片</string>
<string name="settings_download_preload_image_summary">向後預載 %s 張圖片</string>
<string name="settings_download_image_size">圖片大小</string>
<string name="settings_download_image_size_summary">%s，大於 1280x 的分辨率可能不好使</string>
<string name="settings_download_image_size_auto">自動</string>
<string name="settings_download_image_resolution">圖片分辨率</string>
<string name="settings_download_image_resolution_summary">%s，大於 1280x 的分辨率可能不好使</string>
<string name="settings_download_image_resolution_auto">自動</string>
<string name="settings_download_download_origin_image">下載原圖</string>
<string name="settings_download_download_origin_image_summary">這很危險！勾選此項會導致下載配額迅速流失</string>
<string name="settings_download_media_scan">允許媒體掃描</string>
app/src/main/res/values-zh-rTW/strings.xml
+3 -3
View File
@@ -422,9 +422,9 @@
<string name="settings_download_multi_thread_download_summary">最多同時下載 %s 張圖片</string>
<string name="settings_download_preload_image">預載圖片</string>
<string name="settings_download_preload_image_summary">向後預載 %s 張圖片</string>
<string name="settings_download_image_size">圖片大小</string>
<string name="settings_download_image_size_summary">%s，大於 1280x 的解析度可能不好使</string>
<string name="settings_download_image_size_auto">自動</string>
<string name="settings_download_image_resolution">圖片解析度</string>
<string name="settings_download_image_resolution_summary">%s，大於 1280x 的解析度可能不好使</string>
<string name="settings_download_image_resolution_auto">自動</string>
<string name="settings_download_download_origin_image">下載原圖</string>
<string name="settings_download_download_origin_image_summary">這很危險！勾選此項會導致下載配額迅速流失</string>
<string name="settings_download_media_scan">允許媒體掃描</string>
app/src/main/res/values/arrays.xml
+3 -3
View File
@@ -88,8 +88,8 @@
<item>17</item>
</string-array>
<string-array name="image_size_entries" translatable="false">
<item>@string/settings_download_image_size_auto</item>
<string-array name="image_resolution_entries" translatable="false">
<item>@string/settings_download_image_resolution_auto</item>
<item>780x</item>
<item>980x</item>
<item>1280x</item>
@@ -97,7 +97,7 @@
<item>2400x</item>
</string-array>
<string-array name="image_size_entry_values" translatable="false">
<string-array name="image_resolution_entry_values" translatable="false">
<item>a</item>
<item>780</item>
<item>980</item>
app/src/main/res/values/strings.xml
+3 -3
View File
@@ -467,9 +467,9 @@
<string name="settings_download_multi_thread_download_summary">Up to %s images</string>
<string name="settings_download_preload_image">Preload image</string>
<string name="settings_download_preload_image_summary">Preload next %s image</string>
<string name="settings_download_image_size">Image size</string>
<string name="settings_download_image_size_summary">%s, resolutions above 1280x may not work</string>
<string name="settings_download_image_size_auto">Auto</string>
<string name="settings_download_image_resolution">Image resolution</string>
<string name="settings_download_image_resolution_summary">%s, resolutions above 1280x may not work</string>
<string name="settings_download_image_resolution_auto">Auto</string>
<string name="settings_download_download_origin_image">Download original image</string>
<string name="settings_download_download_origin_image_summary">It is dangerous! You may get 509 error</string>
<string name="settings_download_restore_download_items">Restore download items</string>
app/src/main/res/xml/download_settings.xml
+4 -4
View File
@@ -48,10 +48,10 @@
<com.hippo.preference.ListPreference
android:key="image_size"
android:title="@string/settings_download_image_size"
android:summary="@string/settings_download_image_size_summary"
app:entries="@array/image_size_entries"
app:entryValues="@array/image_size_entry_values"
android:title="@string/settings_download_image_resolution"
android:summary="@string/settings_download_image_resolution_summary"
app:entries="@array/image_resolution_entries"
app:entryValues="@array/image_resolution_entry_values"
android:defaultValue="a"/>
<com.hippo.preference.SwitchPreference