Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373697 )
Change subject: Offline Library onboarding follow-up. ...................................................................... Offline Library onboarding follow-up. Change-Id: Ifa177a994d9ace313c75109e1695d80df30f3c6d --- M app/src/main/java/org/wikipedia/feed/FeedFragment.java M app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java M app/src/main/java/org/wikipedia/settings/Prefs.java 3 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/97/373697/1 diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java b/app/src/main/java/org/wikipedia/feed/FeedFragment.java index 9c8e612..d612688 100644 --- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java +++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java @@ -435,14 +435,18 @@ } public void onViewCompilations() { - startActivity(LocalCompilationsActivity.newIntent(getContext())); + if (Prefs.isOfflineTutorialCardEnabled()) { + startActivityForResult(OfflineTutorialActivity.newIntent(getContext()), + ACTIVITY_REQUEST_OFFLINE_TUTORIAL); + } else { + startActivity(LocalCompilationsActivity.newIntent(getContext())); + } } @Override public void onOnboardingPositiveAction(@NonNull Card card, @NonNull OnboardingCard.OnboardingAction action) { if (action == OnboardingCard.OnboardingAction.OFFLINE_LIBRARY) { - startActivityForResult(OfflineTutorialActivity.newIntent(getContext()), - ACTIVITY_REQUEST_OFFLINE_TUTORIAL); + onViewCompilations(); } } } @@ -515,7 +519,7 @@ @Override public void compilationsClick() { - startActivity(LocalCompilationsActivity.newIntent(getContext())); + feedCallback.onViewCompilations(); } } } diff --git a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java index d531b87..a7c0446 100644 --- a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java +++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java @@ -31,4 +31,12 @@ setResult(RESULT_OK); finish(); } + + @Override + public void onBackPressed() { + if (getFragment().onBackPressed()) { + return; + } + finish(); + } } diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java b/app/src/main/java/org/wikipedia/settings/Prefs.java index 6c9c671..7f775c8 100644 --- a/app/src/main/java/org/wikipedia/settings/Prefs.java +++ b/app/src/main/java/org/wikipedia/settings/Prefs.java @@ -549,6 +549,10 @@ setString(R.string.preference_key_compilation_cache, GsonMarshaller.marshal(compilations)); } + public static boolean isOfflineTutorialCardEnabled() { + return getBoolean(R.string.preference_key_offline_onboarding_card_enabled, true); + } + public static void setOfflineTutorialCardEnabled(boolean enabled) { setBoolean(R.string.preference_key_offline_onboarding_card_enabled, enabled); } -- To view, visit https://gerrit.wikimedia.org/r/373697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa177a994d9ace313c75109e1695d80df30f3c6d Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits