diff --git a/.cproject b/.cproject index 061aa71fa..46ab49d27 100644 --- a/.cproject +++ b/.cproject @@ -20,7 +20,7 @@ - + diff --git a/res/drawable-hdpi/ic_action_info.png b/res/drawable-hdpi/ic_action_info.png deleted file mode 100644 index 2b907ef83..000000000 Binary files a/res/drawable-hdpi/ic_action_info.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_info_dark.png b/res/drawable-hdpi/ic_action_info_dark.png deleted file mode 100644 index d4de649b5..000000000 Binary files a/res/drawable-hdpi/ic_action_info_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_setting_about.png b/res/drawable-hdpi/ic_setting_about.png new file mode 100644 index 000000000..171072147 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_about.png differ diff --git a/res/drawable-hdpi/ic_setting_about_dark.png b/res/drawable-hdpi/ic_setting_about_dark.png new file mode 100644 index 000000000..f0fa89c53 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_about_dark.png differ diff --git a/res/drawable-hdpi/ic_setting_display.png b/res/drawable-hdpi/ic_setting_display.png index f751d6475..736568d70 100644 Binary files a/res/drawable-hdpi/ic_setting_display.png and b/res/drawable-hdpi/ic_setting_display.png differ diff --git a/res/drawable-hdpi/ic_setting_display_dark.png b/res/drawable-hdpi/ic_setting_display_dark.png index 017597250..f297737b0 100644 Binary files a/res/drawable-hdpi/ic_setting_display_dark.png and b/res/drawable-hdpi/ic_setting_display_dark.png differ diff --git a/res/drawable-hdpi/ic_setting_read.png b/res/drawable-hdpi/ic_setting_read.png new file mode 100644 index 000000000..4df0d47b3 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_read.png differ diff --git a/res/drawable-hdpi/ic_setting_read_dark.png b/res/drawable-hdpi/ic_setting_read_dark.png new file mode 100644 index 000000000..8d62a93d3 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_read_dark.png differ diff --git a/res/drawable-mdpi/ic_action_info.png b/res/drawable-mdpi/ic_action_info.png deleted file mode 100644 index bbd27e8cd..000000000 Binary files a/res/drawable-mdpi/ic_action_info.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_info_dark.png b/res/drawable-mdpi/ic_action_info_dark.png deleted file mode 100644 index 6280af382..000000000 Binary files a/res/drawable-mdpi/ic_action_info_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_setting_about.png b/res/drawable-mdpi/ic_setting_about.png new file mode 100644 index 000000000..6485f26f4 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_about.png differ diff --git a/res/drawable-mdpi/ic_setting_about_dark.png b/res/drawable-mdpi/ic_setting_about_dark.png new file mode 100644 index 000000000..757de605d Binary files /dev/null and b/res/drawable-mdpi/ic_setting_about_dark.png differ diff --git a/res/drawable-mdpi/ic_setting_display.png b/res/drawable-mdpi/ic_setting_display.png index ef9ea7c88..ccadd4792 100644 Binary files a/res/drawable-mdpi/ic_setting_display.png and b/res/drawable-mdpi/ic_setting_display.png differ diff --git a/res/drawable-mdpi/ic_setting_display_dark.png b/res/drawable-mdpi/ic_setting_display_dark.png index 02048202e..dba23b714 100644 Binary files a/res/drawable-mdpi/ic_setting_display_dark.png and b/res/drawable-mdpi/ic_setting_display_dark.png differ diff --git a/res/drawable-mdpi/ic_setting_read.png b/res/drawable-mdpi/ic_setting_read.png new file mode 100644 index 000000000..6c5b8dea2 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_read.png differ diff --git a/res/drawable-mdpi/ic_setting_read_dark.png b/res/drawable-mdpi/ic_setting_read_dark.png new file mode 100644 index 000000000..cebacb004 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_read_dark.png differ diff --git a/res/drawable-xhdpi/ic_action_info.png b/res/drawable-xhdpi/ic_action_info.png deleted file mode 100644 index 45179f185..000000000 Binary files a/res/drawable-xhdpi/ic_action_info.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_info_dark.png b/res/drawable-xhdpi/ic_action_info_dark.png deleted file mode 100644 index baf2c7b18..000000000 Binary files a/res/drawable-xhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_setting_about.png b/res/drawable-xhdpi/ic_setting_about.png new file mode 100644 index 000000000..0c242f9f2 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_about.png differ diff --git a/res/drawable-xhdpi/ic_setting_about_dark.png b/res/drawable-xhdpi/ic_setting_about_dark.png new file mode 100644 index 000000000..de2909e52 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_about_dark.png differ diff --git a/res/drawable-xhdpi/ic_setting_display.png b/res/drawable-xhdpi/ic_setting_display.png index d73918f26..a54bdf529 100644 Binary files a/res/drawable-xhdpi/ic_setting_display.png and b/res/drawable-xhdpi/ic_setting_display.png differ diff --git a/res/drawable-xhdpi/ic_setting_display_dark.png b/res/drawable-xhdpi/ic_setting_display_dark.png index d1ad068c2..c2861b4cf 100644 Binary files a/res/drawable-xhdpi/ic_setting_display_dark.png and b/res/drawable-xhdpi/ic_setting_display_dark.png differ diff --git a/res/drawable-xhdpi/ic_setting_read.png b/res/drawable-xhdpi/ic_setting_read.png new file mode 100644 index 000000000..60af7e169 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_read.png differ diff --git a/res/drawable-xhdpi/ic_setting_read_dark.png b/res/drawable-xhdpi/ic_setting_read_dark.png new file mode 100644 index 000000000..fcb8d23f8 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_read_dark.png differ diff --git a/res/drawable-xxhdpi/ic_action_info.png b/res/drawable-xxhdpi/ic_action_info.png deleted file mode 100644 index 8b98a91d0..000000000 Binary files a/res/drawable-xxhdpi/ic_action_info.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_action_info_dark.png b/res/drawable-xxhdpi/ic_action_info_dark.png deleted file mode 100644 index 9c1311128..000000000 Binary files a/res/drawable-xxhdpi/ic_action_info_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_setting_about.png b/res/drawable-xxhdpi/ic_setting_about.png new file mode 100644 index 000000000..0fb68fbb7 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_about.png differ diff --git a/res/drawable-xxhdpi/ic_setting_about_dark.png b/res/drawable-xxhdpi/ic_setting_about_dark.png new file mode 100644 index 000000000..c7dbd7bbd Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_about_dark.png differ diff --git a/res/drawable-xxhdpi/ic_setting_display.png b/res/drawable-xxhdpi/ic_setting_display.png index 363a0f6a5..0b8145a58 100644 Binary files a/res/drawable-xxhdpi/ic_setting_display.png and b/res/drawable-xxhdpi/ic_setting_display.png differ diff --git a/res/drawable-xxhdpi/ic_setting_display_dark.png b/res/drawable-xxhdpi/ic_setting_display_dark.png index 5269c7eda..a91484a1a 100644 Binary files a/res/drawable-xxhdpi/ic_setting_display_dark.png and b/res/drawable-xxhdpi/ic_setting_display_dark.png differ diff --git a/res/drawable-xxhdpi/ic_setting_read.png b/res/drawable-xxhdpi/ic_setting_read.png new file mode 100644 index 000000000..a2dc85f01 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_read.png differ diff --git a/res/drawable-xxhdpi/ic_setting_read_dark.png b/res/drawable-xxhdpi/ic_setting_read_dark.png new file mode 100644 index 000000000..896036b0d Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_read_dark.png differ diff --git a/res/layout/favorite_list.xml b/res/layout/favorite_list.xml index 89fbfd523..5fdf0ed78 100644 --- a/res/layout/favorite_list.xml +++ b/res/layout/favorite_list.xml @@ -22,7 +22,8 @@ + android:layout_height="fill_parent" + android:saveEnabled="false" /> - - - - - - - - - - diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 773998adf..1b8499249 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -172,11 +172,11 @@ 开页位置 列表 列表模式 - + 列表缩略图列数 预览 预览图列数 - + 热门 显示热门更新时间 EH @@ -191,6 +191,7 @@ 预览图模式 正常预览图 大预览图 + 数据 下载 下载路径 @@ -199,6 +200,11 @@ 大多数图库应用将不会显示下载目录中的图片 收藏 默认收藏夹 + + 阅读 + 显示时间 + 显示电量 + 关于 作者 日志 diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index dcccead6d..ffaea44e5 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -45,27 +45,6 @@ - - - - - - - - diff --git a/res/xml/read_settings.xml b/res/xml/read_settings.xml new file mode 100644 index 000000000..f6fcb02f1 --- /dev/null +++ b/res/xml/read_settings.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index e87f0949a..30c6e7f43 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -15,29 +15,35 @@ --> - +
- +
- +
- + +
+
- + android:icon="@drawable/ic_setting_about_dark" /> + \ No newline at end of file diff --git a/src/com/hippo/ehviewer/ui/GalleryActivity.java b/src/com/hippo/ehviewer/ui/GalleryActivity.java index 6556c947f..6edfdf978 100644 --- a/src/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/src/com/hippo/ehviewer/ui/GalleryActivity.java @@ -220,6 +220,12 @@ public class GalleryActivity extends AbsActivity initAnimator(); + // Hide or show + if (!Config.getGShowTime()) + findViewById(R.id.clock).setVisibility(View.GONE); + if (!Config.getGShowBattery()) + findViewById(R.id.battery).setVisibility(View.GONE); + // Set listener mGalleryView.setGalleryViewListener(this); mPageSeeker.setOnSeekBarChangeListener(this); @@ -305,6 +311,10 @@ public class GalleryActivity extends AbsActivity } public void updateSeekBubble(int progress, int max, int thumbOffset) { + if (max == 0) + // Avoid divide by zero + return; + thumbOffset = thumbOffset + Ui.dp2pix(12); int x = (mainView.getWidth() - 2 * thumbOffset) * progress / max + thumbOffset; mSeekerBubble.setX(x); diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java index 48b907a33..668a986e6 100644 --- a/src/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java @@ -136,6 +136,7 @@ public class SettingsActivity extends AbsPreferenceActivity { DisplayFragment.class.getName(), EhFragment.class.getName(), DataFragment.class.getName(), + ReadFragment.class.getName(), AboutFragment.class.getName() }; @@ -143,7 +144,8 @@ public class SettingsActivity extends AbsPreferenceActivity { R.drawable.ic_setting_display, R.drawable.ic_action_panda, R.drawable.ic_setting_data, - R.drawable.ic_action_info + R.drawable.ic_setting_read, + R.drawable.ic_setting_about }; @Override @@ -584,6 +586,29 @@ public class SettingsActivity extends AbsPreferenceActivity { } } + public static class ReadFragment extends TranslucentPreferenceFragment + implements Preference.OnPreferenceChangeListener, + Preference.OnPreferenceClickListener { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.read_settings); + } + + @Override + public boolean onPreferenceClick(Preference preference) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + // TODO Auto-generated method stub + return false; + } + } + public static class AboutFragment extends TranslucentPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { diff --git a/src/com/hippo/ehviewer/util/Config.java b/src/com/hippo/ehviewer/util/Config.java index 311cc50bd..a12aafb14 100644 --- a/src/com/hippo/ehviewer/util/Config.java +++ b/src/com/hippo/ehviewer/util/Config.java @@ -38,10 +38,6 @@ public class Config { private static final String KEY_SCREEN_ORIENTATION = "screen_orientation"; private static final String DEFAULT_SCREEN_ORIENTATION = "0"; - private static final String KEY_PAGE_SCALING = "page_scaling"; - private static final String DEFAULT_PAGE_SCALING = "3"; - private static final String KEY_START_POSITION = "start_position"; - private static final String DEFAULT_START_POSITION = "1"; private static final String KEY_CACHE_SIZE = "cache_size"; private static final String DEFAULT_CACHE_SIZE = "25"; @@ -174,30 +170,6 @@ public class Config { } } - public static int getPageScalingMode() { - int pageScalingMode = 3; - try { - pageScalingMode = Integer.parseInt(mConfigPre.getString( - KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING)); - } catch (Exception e) { - mConfigPre.edit().putString(KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING) - .apply(); - } - return pageScalingMode; - } - - public static int getStartPosition() { - int startPosition = 1; - try { - startPosition = Integer.parseInt(mConfigPre.getString( - KEY_START_POSITION, DEFAULT_START_POSITION)); - } catch (Exception e) { - mConfigPre.edit().putString(KEY_START_POSITION, DEFAULT_START_POSITION) - .apply(); - } - return startPosition; - } - public static int getScreenOriMode() { int screenOriMode = 0; try { @@ -400,8 +372,6 @@ public class Config { mConfigPre.edit().putBoolean(KEY_GALLERY_FIRST, galleryFirst).apply(); } - - /****** Mode an API Mode ******/ private static final String KEY_MODE = "mode"; @@ -517,4 +487,47 @@ public class Config { public static int getPreviewPerRow() { return Integer.parseInt(mConfigPre.getString(KEY_PREVIEW_PER_ROW, DEFAULT_PREVIEW_PER_ROW)); } + + /****** Read ******/ + + private static final String KEY_PAGE_SCALING = "page_scaling"; + private static final String DEFAULT_PAGE_SCALING = "3"; + private static final String KEY_START_POSITION = "start_position"; + private static final String DEFAULT_START_POSITION = "1"; + private static final String KEY_GALLERY_SHOW_TIME = "gallery_show_clock"; + private static final boolean DEFAULT_GALLERY_SHOW_TIME = true; + private static final String KEY_GALLERY_SHOW_BATTERY = "gallery_show_battery"; + private static final boolean DEFAULT_GALLERY_SHOW_BATTERY = true; + + public static int getPageScalingMode() { + int pageScalingMode = 3; + try { + pageScalingMode = Integer.parseInt(mConfigPre.getString( + KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING)); + } catch (Exception e) { + mConfigPre.edit().putString(KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING) + .apply(); + } + return pageScalingMode; + } + + public static int getStartPosition() { + int startPosition = 1; + try { + startPosition = Integer.parseInt(mConfigPre.getString( + KEY_START_POSITION, DEFAULT_START_POSITION)); + } catch (Exception e) { + mConfigPre.edit().putString(KEY_START_POSITION, DEFAULT_START_POSITION) + .apply(); + } + return startPosition; + } + + public static boolean getGShowTime() { + return mConfigPre.getBoolean(KEY_GALLERY_SHOW_TIME, DEFAULT_GALLERY_SHOW_TIME); + } + + public static boolean getGShowBattery() { + return mConfigPre.getBoolean(KEY_GALLERY_SHOW_BATTERY, DEFAULT_GALLERY_SHOW_BATTERY); + } }