From 5dc6446d643cec5e38621d70e4f5ce35e4f92b36 Mon Sep 17 00:00:00 2001 From: seven332 Date: Thu, 21 Mar 2019 16:44:42 +0800 Subject: [PATCH] Close #561, add launch page selector --- .../main/java/com/hippo/ehviewer/Settings.java | 17 +++++++++++++++++ .../com/hippo/ehviewer/ui/MainActivity.java | 4 ++-- .../com/hippo/ehviewer/ui/scene/SolidScene.java | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/arrays.xml | 12 ++++++++++++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/eh_settings.xml | 8 ++++++++ 9 files changed, 44 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index a869babc5..f0a06cc08 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -28,6 +28,7 @@ import com.hippo.ehviewer.client.EhConfig; import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.data.FavListUrlBuilder; import com.hippo.ehviewer.ui.CommonOperations; +import com.hippo.ehviewer.ui.scene.GalleryListScene; import com.hippo.glgallery.GalleryView; import com.hippo.unifile.UniFile; import com.hippo.util.ExceptionUtils; @@ -278,6 +279,22 @@ public class Settings { putIntToStr(KEY_GALLERY_SITE, value); } + private static final String KEY_LAUNCH_PAGE = "launch_page"; + private static final int DEFAULT_LAUNCH_PAGE = 0; + + public static String getLaunchPageGalleryListSceneAction() { + int value = getIntFromStr(KEY_LAUNCH_PAGE, DEFAULT_LAUNCH_PAGE); + switch (value) { + default: + case 0: + return GalleryListScene.ACTION_HOMEPAGE; + case 1: + return GalleryListScene.ACTION_SUBSCRIPTION; + case 2: + return GalleryListScene.ACTION_WHATS_HOT; + } + } + public static final String KEY_LIST_MODE = "list_mode"; private static final int DEFAULT_LIST_MODE = 0; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index c671b6e33..541984c35 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -175,7 +175,7 @@ public final class MainActivity extends StageActivity return new Announcer(SelectSiteScene.class); } else { Bundle args = new Bundle(); - args.putString(GalleryListScene.KEY_ACTION, GalleryListScene.ACTION_HOMEPAGE); + args.putString(GalleryListScene.KEY_ACTION, Settings.getLaunchPageGalleryListSceneAction()); return new Announcer(GalleryListScene.class).setArgs(args); } } @@ -309,7 +309,7 @@ public final class MainActivity extends StageActivity finish(); } else { Bundle args = new Bundle(); - args.putString(GalleryListScene.KEY_ACTION, GalleryListScene.ACTION_HOMEPAGE); + args.putString(GalleryListScene.KEY_ACTION, Settings.getLaunchPageGalleryListSceneAction()); startScene(processAnnouncer(new Announcer(GalleryListScene.class).setArgs(args))); } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java index f6545b036..a60c3e0a4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java @@ -81,7 +81,7 @@ public class SolidScene extends BaseScene { startScene(new Announcer(clazz).setArgs(targetArgs)); } else { Bundle newArgs = new Bundle(); - newArgs.putString(GalleryListScene.KEY_ACTION, GalleryListScene.ACTION_HOMEPAGE); + newArgs.putString(GalleryListScene.KEY_ACTION, Settings.getLaunchPageGalleryListSceneAction()); startScene(new Announcer(GalleryListScene.class).setArgs(newArgs)); } break; diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 14408ce16..b99dcebe6 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -414,6 +414,7 @@ 黑色 导航栏应用主题配色 画廊站点 + 启动页 列表模式 详情 缩略图 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 66968ec91..fa3b99dc7 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -413,6 +413,7 @@ 黑色 導航欄應用主題配色 畫廊站點 + 啟動頁 列表模式 詳情 縮略圖 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a4610f049..054f46c66 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -413,6 +413,7 @@ 黑色 導航欄應用主題配色 圖庫站台 + 啟動頁 列表模式 詳細資料 縮圖 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d431c2c75..c37adb1a9 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -49,6 +49,18 @@ 1 + + @string/homepage + @string/subscription + @string/whats_hot + + + + 0 + 1 + 2 + + @string/settings_eh_detail_size_long @string/settings_eh_detail_size_short diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b1c410707..554edbcaa 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -457,6 +457,7 @@ Black Apply theme color to navigation bar Gallery site + Launch page List mode Detail Thumb diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml index f5c23b304..44f3947df 100644 --- a/app/src/main/res/xml/eh_settings.xml +++ b/app/src/main/res/xml/eh_settings.xml @@ -62,6 +62,14 @@ android:title="@string/settings_eh_apply_nav_bar_theme_color" android:defaultValue="false"/> + +