Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-01-29 18:09:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use fragment tags instead of position indexes for saving chosen fragment

Browse Source
This commit is contained in:
Petar Kukolj 2018-11-17 20:13:35 +01:00
parent c2f543ffe4
commit 0d1b9c4c55
4 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
View File

@ -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;
@ -473,9 +477,31 @@ public class PreferencesTest {
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_SUBSCRIPTIONS,
assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonBehavior() == UserPreferences.BackButtonBehavior.GO_TO_PAGE,
Timeout.getLargeTimeout()));
assertTrue(solo.waitForCondition(() -> UserPreferences.getBackButtonGoToPage().equals(SubscriptionFragment.TAG),
Timeout.getLargeTimeout()));
}

20
app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -669,25 +669,11 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
super.onBackPressed();
}
break;
case GO_TO_QUEUE:
if(getLastNavFragment().equals(QueueFragment.TAG)) {
case GO_TO_PAGE:
if(getLastNavFragment().equals(UserPreferences.getBackButtonGoToPage())) {
super.onBackPressed();
} else {
loadFragment(QueueFragment.TAG, null);
}
break;
case GO_TO_EPISODES:
if(getLastNavFragment().equals(EpisodesFragment.TAG)) {
super.onBackPressed();
} else {
loadFragment(EpisodesFragment.TAG, null);
}
break;
case GO_TO_SUBSCRIPTIONS:
if(getLastNavFragment().equals(SubscriptionFragment.TAG)) {
super.onBackPressed();
} else {
loadFragment(SubscriptionFragment.TAG, null);
loadFragment(UserPreferences.getBackButtonGoToPage(), null);
}
break;
default: super.onBackPressed();

10
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
View File

@ -232,17 +232,19 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
if(newValue.equals("page")) {
final Context context = ui.getActivity();
final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
final int choice[] = { UserPreferences.getBackButtonGoToPage() };
final String[] navTags = new String[3];
System.arraycopy(MainActivity.NAV_DRAWER_TAGS, 0, navTags, 0, 3);
final String choice[] = { UserPreferences.getBackButtonGoToPage() };
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.back_button_go_to_page_title);
builder.setSingleChoiceItems(navTitles, choice[0], (dialogInterface, i) -> {
builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> {
if(i >= 0) {
choice[0] = i;
choice[0] = navTags[i];
}
});
builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> {
if (choice[0] != UserPreferences.getBackButtonGoToPage()) {
if (!choice[0].equals(UserPreferences.getBackButtonGoToPage())) {
UserPreferences.setBackButtonGoToPage(choice[0]);
}
});

18
core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
View File

@ -813,7 +813,7 @@ public class UserPreferences {
}
public enum BackButtonBehavior {
DEFAULT, OPEN_DRAWER, DOUBLE_TAP, SHOW_PROMPT, GO_TO_QUEUE, GO_TO_EPISODES, GO_TO_SUBSCRIPTIONS
DEFAULT, OPEN_DRAWER, DOUBLE_TAP, SHOW_PROMPT, GO_TO_PAGE
}
public static BackButtonBehavior getBackButtonBehavior() {
@ -822,24 +822,18 @@ public class UserPreferences {
case "drawer": return BackButtonBehavior.OPEN_DRAWER;
case "doubletap": return BackButtonBehavior.DOUBLE_TAP;
case "prompt": return BackButtonBehavior.SHOW_PROMPT;
case "page":
switch (UserPreferences.getBackButtonGoToPage()) {
case 0: return BackButtonBehavior.GO_TO_QUEUE;
case 1: return BackButtonBehavior.GO_TO_EPISODES;
case 2: return BackButtonBehavior.GO_TO_SUBSCRIPTIONS;
default: return BackButtonBehavior.GO_TO_QUEUE;
}
case "page": return BackButtonBehavior.GO_TO_PAGE;
default: return BackButtonBehavior.DEFAULT;
}
}
public static int getBackButtonGoToPage() {
return prefs.getInt(PREF_BACK_BUTTON_GO_TO_PAGE, 0);
public static String getBackButtonGoToPage() {
return prefs.getString(PREF_BACK_BUTTON_GO_TO_PAGE, "QueueFragment");
}
public static void setBackButtonGoToPage(int page) {
public static void setBackButtonGoToPage(String tag) {
prefs.edit()
.putInt(PREF_BACK_BUTTON_GO_TO_PAGE, page)
.putString(PREF_BACK_BUTTON_GO_TO_PAGE, tag)
.apply();
}
}