Merge pull request #2904 from qkolj/back-button

Add configurable behavior of the back button

2 files changed, 105 insertions, 0 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index d6e7bce13..9a60b04b8 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -243,4 +243,70 @@ public class MainActivityTest {
         assertEquals(1, hidden.size());
         assertTrue(hidden.contains(DownloadsFragment.TAG));
     }
+
+    @Test
+    public void testBackButtonBehaviorGoToPage() {
+        openNavDrawer();
+        solo.clickOnText(solo.getString(R.string.settings_label));
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.clickOnText(solo.getString(R.string.pref_back_button_behavior_title));
+        solo.clickOnText(solo.getString(R.string.back_button_go_to_page));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.subscriptions_label));
+        solo.clickOnText(solo.getString(R.string.confirm_label));
+        solo.goBackToActivity(MainActivity.class.getSimpleName());
+        solo.goBack();
+        assertEquals(solo.getString(R.string.subscriptions_label), getActionbarTitle());
+    }
+
+    @Test
+    public void testBackButtonBehaviorOpenDrawer() {
+        openNavDrawer();
+        solo.clickOnText(solo.getString(R.string.settings_label));
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.clickOnText(solo.getString(R.string.pref_back_button_behavior_title));
+        solo.clickOnText(solo.getString(R.string.back_button_open_drawer));
+        solo.goBackToActivity(MainActivity.class.getSimpleName());
+        solo.goBack();
+        assertTrue(((MainActivity)solo.getCurrentActivity()).isDrawerOpen());
+    }
+
+    @Test
+    public void testBackButtonBehaviorDoubleTap() {
+        openNavDrawer();
+        solo.clickOnText(solo.getString(R.string.settings_label));
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.clickOnText(solo.getString(R.string.pref_back_button_behavior_title));
+        solo.clickOnText(solo.getString(R.string.back_button_double_tap));
+        solo.goBackToActivity(MainActivity.class.getSimpleName());
+        solo.goBack();
+        solo.goBack();
+        assertTrue(solo.getCurrentActivity().isFinishing());
+    }
+
+    @Test
+    public void testBackButtonBehaviorPrompt() {
+        openNavDrawer();
+        solo.clickOnText(solo.getString(R.string.settings_label));
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.clickOnText(solo.getString(R.string.pref_back_button_behavior_title));
+        solo.clickOnText(solo.getString(R.string.back_button_show_prompt));
+        solo.goBackToActivity(MainActivity.class.getSimpleName());
+        solo.goBack();
+        solo.clickOnText(solo.getString(R.string.yes));
+        solo.waitForDialogToClose();
+        assertTrue(solo.getCurrentActivity().isFinishing());
+    }
+
+    @Test
+    public void testBackButtonBehaviorDefault() {
+        openNavDrawer();
+        solo.clickOnText(solo.getString(R.string.settings_label));
+        solo.clickOnText(solo.getString(R.string.user_interface_label));
+        solo.clickOnText(solo.getString(R.string.pref_back_button_behavior_title));
+        solo.clickOnText(solo.getString(R.string.back_button_default));
+        solo.goBackToActivity(MainActivity.class.getSimpleName());
+        solo.goBack();
+        assertTrue(solo.getCurrentActivity().isFinishing());
+    }
 }
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
index bf54ca910..f217ecffa 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -16,6 +16,10 @@ import de.danoeh.antennapod.core.storage.APCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.APNullCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.APQueueCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithm;
+import de.danoeh.antennapod.fragment.EpisodesFragment;
+import de.danoeh.antennapod.fragment.QueueFragment;
+import de.danoeh.antennapod.fragment.SubscriptionFragment;
+
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
@@ -466,6 +470,41 @@ public class PreferencesTest {
         }
     }
 
+    @Test
+    public void testBackButtonBehaviorGoToPageSelector() {
+        clickPreference(withText(R.string.user_interface_label));
+        clickPreference(withText(R.string.pref_back_button_behavior_title));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.back_button_go_to_page));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.queue_label));
+        solo.clickOnText(solo.getString(R.string.confirm_label));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonBehavior() == UserPreferences.BackButtonBehavior.GO_TO_PAGE,
+                Timeout.getLargeTimeout()));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonGoToPage().equals(QueueFragment.TAG),
+                Timeout.getLargeTimeout()));
+        clickPreference(withText(R.string.pref_back_button_behavior_title));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.back_button_go_to_page));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.episodes_label));
+        solo.clickOnText(solo.getString(R.string.confirm_label));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonBehavior() == UserPreferences.BackButtonBehavior.GO_TO_PAGE,
+                Timeout.getLargeTimeout()));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonGoToPage().equals(EpisodesFragment.TAG),
+                Timeout.getLargeTimeout()));
+        clickPreference(withText(R.string.pref_back_button_behavior_title));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.back_button_go_to_page));
+        solo.waitForDialogToOpen();
+        solo.clickOnText(solo.getString(R.string.subscriptions_label));
+        solo.clickOnText(solo.getString(R.string.confirm_label));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonBehavior() == UserPreferences.BackButtonBehavior.GO_TO_PAGE,
+                Timeout.getLargeTimeout()));
+        assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonGoToPage().equals(SubscriptionFragment.TAG),
+                Timeout.getLargeTimeout()));
+    }
+
     private void clickPreference(Matcher<View> matcher) {
         onView(withId(R.id.list))
                 .perform(RecyclerViewActions.actionOnItem(hasDescendant(matcher), click()));