Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374336 )
Change subject: Add separate preference for offline onboarding
......................................................................
Add separate preference for offline onboarding
It's not correct for this to be dependent on the preference for the
card; there are other circumstances in which the onboarding should be
shown, such as direct navigation to the offline compilations activity.
Change-Id: I452391e243fcfa09acc3182a6dcd7948b57c597b
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
4 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/36/374336/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index d612688..e1d9fbf 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -189,6 +189,7 @@
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == ACTIVITY_REQUEST_OFFLINE_TUTORIAL && resultCode ==
RESULT_OK) {
Prefs.setOfflineTutorialCardEnabled(false);
+ Prefs.setOfflineTutorialEnabled(false);
refresh();
feedCallback.onViewCompilations();
}
@@ -435,7 +436,7 @@
}
public void onViewCompilations() {
- if (Prefs.isOfflineTutorialCardEnabled()) {
+ if (Prefs.isOfflineTutorialEnabled()) {
startActivityForResult(OfflineTutorialActivity.newIntent(getContext()),
ACTIVITY_REQUEST_OFFLINE_TUTORIAL);
} else {
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 7f775c8..0757031 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -557,5 +557,13 @@
setBoolean(R.string.preference_key_offline_onboarding_card_enabled,
enabled);
}
+ public static boolean isOfflineTutorialEnabled() {
+ return getBoolean(R.string.preference_key_offline_onboarding_enabled,
true);
+ }
+
+ public static void setOfflineTutorialEnabled(boolean enabled) {
+ setBoolean(R.string.preference_key_offline_onboarding_enabled,
enabled);
+ }
+
private Prefs() { }
}
diff --git a/app/src/main/res/values/preference_keys.xml
b/app/src/main/res/values/preference_keys.xml
index f83fcc7..875e8c2 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -60,4 +60,5 @@
<string name="preference_key_permission_asked">permissionAsked</string>
<string name="preference_key_compilation_cache">compilationCache</string>
<string
name="preference_key_offline_onboarding_card_enabled">offlineOnboardingCardEnabled</string>
+ <string
name="preference_key_offline_onboarding_enabled">offlineOnboardingEnabled</string>
</resources>
diff --git a/app/src/main/res/xml/developer_preferences.xml
b/app/src/main/res/xml/developer_preferences.xml
index 3c50572..f6f44a5 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -157,6 +157,10 @@
android:title="@string/preference_key_offline_onboarding_card_enabled" />
<SwitchPreferenceCompat
+ android:key="@string/preference_key_offline_onboarding_enabled"
+ android:title="@string/preference_key_offline_onboarding_enabled"
/>
+
+ <SwitchPreferenceCompat
android:key="@string/preference_key_toc_tutorial_enabled"
android:title="@string/preference_key_toc_tutorial_enabled" />
--
To view, visit https://gerrit.wikimedia.org/r/374336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I452391e243fcfa09acc3182a6dcd7948b57c597b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
