diff --git a/app/build.gradle b/app/build.gradle index 5739b7d56..984408cd2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,7 +87,8 @@ dependencies { configurations.all { resolutionStrategy { - force 'com.github.seven332:image:bab9b11' + force 'com.github.seven332:glgallery:0f276c0' force 'com.github.seven332:glview-image:4c744db' + force 'com.github.seven332:image:bab9b11' } } diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index f41b95bcf..91e345734 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -520,6 +520,17 @@ public class Settings { putBoolean(KEY_SHOW_BATTERY, value); } + private static final String KEY_SHOW_PAGE_INTERVAL = "gallery_show_page_interval"; + private static final boolean DEFAULT_SHOW_PAGE_INTERVAL = true; + + public static boolean getShowPageInterval() { + return getBoolean(KEY_SHOW_PAGE_INTERVAL, DEFAULT_SHOW_PAGE_INTERVAL); + } + + public static void putShowPageInterval(boolean value) { + putBoolean(KEY_SHOW_PAGE_INTERVAL, value); + } + private static final String KEY_VOLUME_PAGE = "volume_page"; private static final boolean DEFAULT_VOLUME_PAGE = false; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index 609597a24..2910c148f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -280,8 +280,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan .setStartPage(startPage) .setBackgroundColor(resources.getColor(R.color.gallery_background)) .setEdgeColor(primaryColor & 0xffffff | 0x33000000) - .setPagerInterval(resources.getDimensionPixelOffset(R.dimen.gallery_pager_interval)) - .setScrollInterval(resources.getDimensionPixelOffset(R.dimen.gallery_scroll_interval)) + .setPagerInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_pager_interval) : 0) + .setScrollInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_scroll_interval) : 0) .setPageMinHeight(resources.getDimensionPixelOffset(R.dimen.gallery_page_min_height)) .setPageInfoInterval(resources.getDimensionPixelOffset(R.dimen.gallery_page_info_interval)) .setProgressColor(primaryColor) @@ -702,6 +702,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan private final SwitchCompat mShowClock; private final SwitchCompat mShowProgress; private final SwitchCompat mShowBattery; + private final SwitchCompat mShowPageInterval; private final SwitchCompat mVolumePage; private final SwitchCompat mReadingFullscreen; private final SwitchCompat mCustomScreenLightness; @@ -718,6 +719,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mShowClock = (SwitchCompat) mView.findViewById(R.id.show_clock); mShowProgress = (SwitchCompat) mView.findViewById(R.id.show_progress); mShowBattery = (SwitchCompat) mView.findViewById(R.id.show_battery); + mShowPageInterval = (SwitchCompat) mView.findViewById(R.id.show_page_interval); mVolumePage = (SwitchCompat) mView.findViewById(R.id.volume_page); mReadingFullscreen = (SwitchCompat) mView.findViewById(R.id.reading_fullscreen); mCustomScreenLightness = (SwitchCompat) mView.findViewById(R.id.custom_screen_lightness); @@ -731,6 +733,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mShowClock.setChecked(Settings.getShowClock()); mShowProgress.setChecked(Settings.getShowProgress()); mShowBattery.setChecked(Settings.getShowBattery()); + mShowPageInterval.setChecked(Settings.getShowPageInterval()); mVolumePage.setChecked(Settings.getVolumePage()); mReadingFullscreen.setChecked(Settings.getReadingFullscreen()); mCustomScreenLightness.setChecked(Settings.getCustomScreenLightness()); @@ -759,6 +762,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan boolean showClock = mShowClock.isChecked(); boolean showProgress = mShowProgress.isChecked(); boolean showBattery = mShowBattery.isChecked(); + boolean showPageInterval = mShowPageInterval.isChecked(); boolean volumePage = mVolumePage.isChecked(); boolean readingFullscreen = mReadingFullscreen.isChecked(); boolean customScreenLightness = mCustomScreenLightness.isChecked(); @@ -774,6 +778,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan Settings.putShowClock(showClock); Settings.putShowProgress(showProgress); Settings.putShowBattery(showBattery); + Settings.putShowPageInterval(showPageInterval); Settings.putVolumePage(volumePage); Settings.putReadingFullscreen(readingFullscreen); Settings.putCustomScreenLightness(customScreenLightness); @@ -812,6 +817,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan if (mBattery != null) { mBattery.setVisibility(showBattery ? View.VISIBLE : View.GONE); } + mGalleryView.setPagerInterval(showPageInterval ? getResources().getDimensionPixelOffset(R.dimen.gallery_pager_interval) : 0); + mGalleryView.setScrollInterval(showPageInterval ? getResources().getDimensionPixelOffset(R.dimen.gallery_scroll_interval) : 0); setScreenLightness(customScreenLightness, screenLightness); // Update slider diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml index 2c7fd2bc3..fb2e80b7b 100644 --- a/app/src/main/res/layout/dialog_gallery_menu.xml +++ b/app/src/main/res/layout/dialog_gallery_menu.xml @@ -150,6 +150,13 @@ android:text="@string/settings_read_show_battery" android:textColor="@color/primary_text_dark"/> + + 显示时钟 显示进度 显示电量 + 显示页面间隔 使用音量键翻页 全屏 自定义屏幕亮度 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 686d1cc55..5120e47d6 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -421,6 +421,7 @@ 顯示時鐘 顯示進度 顯示電量 + 顯示頁面間隔 使用音量鍵翻頁 全屏 自定義屏幕亮度 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c82687aeb..13e2bf6ec 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -421,6 +421,7 @@ 顯示時鐘 顯示進度 顯示電量 + 顯示頁面間隔 使用音量鍵翻頁 全螢幕 自訂螢幕亮度 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b28a9911..8498acbe8 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -464,6 +464,7 @@ Show clock Show progress Show battery + Show page interval Use volume key to turn pages Fullscreen Custom screen lightness diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml index ce519fadc..f9100471e 100644 --- a/app/src/main/res/xml/read_settings.xml +++ b/app/src/main/res/xml/read_settings.xml @@ -71,6 +71,11 @@ android:title="@string/settings_read_show_battery" android:defaultValue="true"/> + +