Close #561, add launch page selector
This commit is contained in:
1 parent
13eb9e2f16
commit
5dc6446d64
9 files changed
+44
-3
No files matched your search
@@ -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;
|
||||
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -414,6 +414,7 @@
|
||||
<string name="settings_eh_theme_black">黑色</string>
|
||||
<string name="settings_eh_apply_nav_bar_theme_color">导航栏应用主题配色</string>
|
||||
<string name="settings_eh_gallery_site">画廊站点</string>
|
||||
<string name="settings_eh_launch_page">启动页</string>
|
||||
<string name="settings_eh_list_mode">列表模式</string>
|
||||
<string name="settings_eh_list_mode_detail">详情</string>
|
||||
<string name="settings_eh_list_mode_thumb">缩略图</string>
|
||||
|
||||
@@ -413,6 +413,7 @@
|
||||
<string name="settings_eh_theme_black">黑色</string>
|
||||
<string name="settings_eh_apply_nav_bar_theme_color">導航欄應用主題配色</string>
|
||||
<string name="settings_eh_gallery_site">畫廊站點</string>
|
||||
<string name="settings_eh_launch_page">啟動頁</string>
|
||||
<string name="settings_eh_list_mode">列表模式</string>
|
||||
<string name="settings_eh_list_mode_detail">詳情</string>
|
||||
<string name="settings_eh_list_mode_thumb">縮略圖</string>
|
||||
|
||||
@@ -413,6 +413,7 @@
|
||||
<string name="settings_eh_theme_black">黑色</string>
|
||||
<string name="settings_eh_apply_nav_bar_theme_color">導航欄應用主題配色</string>
|
||||
<string name="settings_eh_gallery_site">圖庫站台</string>
|
||||
<string name="settings_eh_launch_page">啟動頁</string>
|
||||
<string name="settings_eh_list_mode">列表模式</string>
|
||||
<string name="settings_eh_list_mode_detail">詳細資料</string>
|
||||
<string name="settings_eh_list_mode_thumb">縮圖</string>
|
||||
|
||||
@@ -49,6 +49,18 @@
|
||||
<item>1</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="launch_page_entries" translatable="false">
|
||||
<item>@string/homepage</item>
|
||||
<item>@string/subscription</item>
|
||||
<item>@string/whats_hot</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="launch_page_entry_values" translatable="false">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="detail_size_entries" translatable="false">
|
||||
<item>@string/settings_eh_detail_size_long</item>
|
||||
<item>@string/settings_eh_detail_size_short</item>
|
||||
|
||||
@@ -457,6 +457,7 @@
|
||||
<string name="settings_eh_theme_black">Black</string>
|
||||
<string name="settings_eh_apply_nav_bar_theme_color">Apply theme color to navigation bar</string>
|
||||
<string name="settings_eh_gallery_site">Gallery site</string>
|
||||
<string name="settings_eh_launch_page">Launch page</string>
|
||||
<string name="settings_eh_list_mode">List mode</string>
|
||||
<string name="settings_eh_list_mode_detail">Detail</string>
|
||||
<string name="settings_eh_list_mode_thumb">Thumb</string>
|
||||
|
||||
@@ -62,6 +62,14 @@
|
||||
android:title="@string/settings_eh_apply_nav_bar_theme_color"
|
||||
android:defaultValue="false"/>
|
||||
|
||||
<com.hippo.preference.ListPreference
|
||||
android:key="launch_page"
|
||||
android:title="@string/settings_eh_launch_page"
|
||||
android:summary="%s"
|
||||
app:entries="@array/launch_page_entries"
|
||||
app:entryValues="@array/launch_page_entry_values"
|
||||
android:defaultValue="0"/>
|
||||
|
||||
<com.hippo.preference.ListPreference
|
||||
android:key="list_mode"
|
||||
android:title="@string/settings_eh_list_mode"
|
||||
|
||||
Reference in new issue
Block a user