diff options
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 29 | ||||
| -rw-r--r-- | core/src/main/res/values/arrays.xml | 32 |
2 files changed, 15 insertions, 46 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 47a447021..f0227ae7b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -61,8 +61,7 @@ public class UserPreferences { public static final String PREF_LOCKSCREEN_BACKGROUND = "prefLockscreenBackground"; private static final String PREF_SHOW_DOWNLOAD_REPORT = "prefShowDownloadReport"; private static final String PREF_SHOW_AUTO_DOWNLOAD_REPORT = "prefShowAutoDownloadReport"; - public static final String PREF_BACK_BUTTON_BEHAVIOR = "prefBackButtonBehavior"; - private static final String PREF_BACK_BUTTON_GO_TO_PAGE = "prefBackButtonGoToPage"; + public static final String PREF_DEFAULT_PAGE = "prefDefaultPage"; public static final String PREF_FILTER_FEED = "prefSubscriptionsFilter"; public static final String PREF_SUBSCRIPTION_TITLE = "prefSubscriptionTitle"; @@ -137,6 +136,7 @@ public class UserPreferences { public static final int FEED_ORDER_COUNTER = 0; public static final int FEED_ORDER_ALPHABETICAL = 1; public static final int FEED_ORDER_MOST_PLAYED = 3; + public static final String DEFAULT_PAGE_REMEMBER = "remember"; private static Context context; private static SharedPreferences prefs; @@ -901,29 +901,12 @@ public class UserPreferences { return getUpdateTimeOfDay().length == 2; } - public enum BackButtonBehavior { - DEFAULT, OPEN_DRAWER, DOUBLE_TAP, SHOW_PROMPT, GO_TO_PAGE + public static String getDefaultPage() { + return prefs.getString(PREF_DEFAULT_PAGE, "HomeFragment"); } - public static BackButtonBehavior getBackButtonBehavior() { - switch (prefs.getString(PREF_BACK_BUTTON_BEHAVIOR, "default")) { - case "drawer": return BackButtonBehavior.OPEN_DRAWER; - case "doubletap": return BackButtonBehavior.DOUBLE_TAP; - case "prompt": return BackButtonBehavior.SHOW_PROMPT; - case "page": return BackButtonBehavior.GO_TO_PAGE; - case "default": // Deliberate fall-through - default: return BackButtonBehavior.DEFAULT; - } - } - - public static String getBackButtonGoToPage() { - return prefs.getString(PREF_BACK_BUTTON_GO_TO_PAGE, "QueueFragment"); - } - - public static void setBackButtonGoToPage(String tag) { - prefs.edit() - .putString(PREF_BACK_BUTTON_GO_TO_PAGE, tag) - .apply(); + public static void setDefaultPage(String defaultPage) { + prefs.edit().putString(PREF_DEFAULT_PAGE, defaultPage).apply(); } public static boolean timeRespectsSpeed() { diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 0ff5df376..0ae8cf96e 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -263,35 +263,21 @@ <item>@string/skip_episode_label</item> </string-array> - <string-array name="back_button_behavior_options"> - <item>@string/back_button_default</item> - <item>@string/back_button_go_to_page</item> - <item>@string/back_button_open_drawer</item> - <item>@string/back_button_double_tap</item> - <item>@string/back_button_show_prompt</item> - </string-array> - - <string-array name="back_button_behavior_values"> - <item>default</item> - <item>page</item> - <item>drawer</item> - <item>doubletap</item> - <item>prompt</item> + <string-array name="default_page_values"> + <item>HomeFragment</item> + <item>QueueFragment</item> + <item>InboxFragment</item> + <item>EpisodesFragment</item> + <item>SubscriptionFragment</item> + <item>remember</item> </string-array> - <string-array name="back_button_go_to_pages"> + <string-array name="default_page_titles"> <item>@string/home_label</item> <item>@string/queue_label</item> <item>@string/inbox_label</item> <item>@string/episodes_label</item> <item>@string/subscriptions_label</item> - </string-array> - - <string-array name="back_button_go_to_pages_tags"> - <item>HomeFragment</item> - <item>QueueFragment</item> - <item>InboxFragment</item> - <item>EpisodesFragment</item> - <item>SubscriptionFragment</item> + <item>@string/remember_last_page</item> </string-array> </resources> |