[MediaWiki-commits] [Gerrit] Add tool tip onboarding state - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Add tool tip onboarding state
..
Add tool tip onboarding state
Bug: T89985
Change-Id: I00ee82e858eb519c9d71579837e2e9332cbf4c71
---
M wikipedia/res/values/preference_keys.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
A wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
A
wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
9 files changed, 96 insertions(+), 12 deletions(-)
Approvals:
BearND: Looks good to me, approved
Mholloway: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/values/preference_keys.xml
b/wikipedia/res/values/preference_keys.xml
index 59bb7ee..10bb64a 100644
--- a/wikipedia/res/values/preference_keys.xml
+++ b/wikipedia/res/values/preference_keys.xml
@@ -17,6 +17,8 @@
string name=preference_key_color_themecolorTheme/string
string name=preference_key_app_channelchannel/string
string name=preference_key_language_mrulanguageMru/string
+string
name=preference_key_select_text_tutorial_enabledselectTextTutorialEnabled/string
+string
name=preference_key_share_tutorial_enabledshareTutorialEnabled/string
string name=preference_key_know_toc_drawerknowToC/string
string name=preference_key_show_imagesshowImages/string
string name=preference_key_exp_page_loadexpPageLoad/string
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 5e8a898..95c8f02 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -34,6 +34,8 @@
import org.wikipedia.login.UserInfoStorage;
import org.wikipedia.migration.PerformMigrationsTask;
import org.wikipedia.networking.MccMncStateHandler;
+import org.wikipedia.onboarding.OnboardingStateMachine;
+import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
import org.wikipedia.page.PageCache;
import org.wikipedia.page.linkpreview.LinkPreviewVersion;
import org.wikipedia.pageimages.PageImage;
@@ -555,6 +557,10 @@
primarySite = null;
}
+public OnboardingStateMachine getOnboardingStateMachine() {
+return PrefsOnboardingStateMachine.getInstance();
+}
+
private HashMapString, String buildCustomHeaders(String acceptLanguage) {
//
https://lists.wikimedia.org/pipermail/wikimedia-l/2014-April/071131.html
HashMapString, String headers = new HashMap();
diff --git
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
new file mode 100644
index 000..4568a38
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
@@ -0,0 +1,10 @@
+package org.wikipedia.onboarding;
+
+public interface OnboardingStateMachine {
+boolean isTocTutorialEnabled();
+void setTocTutorial();
+boolean isSelectTextTutorialEnabled();
+void setSelectTextTutorial();
+boolean isShareTutorialEnabled();
+void setShareTutorial();
+}
\ No newline at end of file
diff --git
a/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
b/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
new file mode 100644
index 000..a6cabc4
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
@@ -0,0 +1,47 @@
+package org.wikipedia.onboarding;
+
+import org.wikipedia.settings.Prefs;
+
+public final class PrefsOnboardingStateMachine implements
OnboardingStateMachine {
+private static final PrefsOnboardingStateMachine INSTANCE = new
PrefsOnboardingStateMachine();
+
+private final boolean initialTocTutorialEnabled =
Prefs.isTocTutorialEnabled();
+
+public static PrefsOnboardingStateMachine getInstance() {
+return INSTANCE;
+}
+
+@Override
+public boolean isTocTutorialEnabled() {
+return Prefs.isTocTutorialEnabled();
+}
+
+@Override
+public void setTocTutorial() {
+Prefs.setTocTutorialEnabled(false);
+}
+
+@Override
+public boolean isSelectTextTutorialEnabled() {
+return !initialTocTutorialEnabled
Prefs.isSelectTextTutorialEnabled();
+}
+
+@Override
+public void setSelectTextTutorial() {
+Prefs.setSelectTextTutorialEnabled(false);
+}
+
+@Override
+public boolean isShareTutorialEnabled() {
+return
[MediaWiki-commits] [Gerrit] Add tool tip onboarding state - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/12
Change subject: Add tool tip onboarding state
..
Add tool tip onboarding state
Bug: T89985
Change-Id: I00ee82e858eb519c9d71579837e2e9332cbf4c71
---
M wikipedia/res/values/preference_keys.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
A wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
A
wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
9 files changed, 96 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/12/12/1
diff --git a/wikipedia/res/values/preference_keys.xml
b/wikipedia/res/values/preference_keys.xml
index 59bb7ee..10bb64a 100644
--- a/wikipedia/res/values/preference_keys.xml
+++ b/wikipedia/res/values/preference_keys.xml
@@ -17,6 +17,8 @@
string name=preference_key_color_themecolorTheme/string
string name=preference_key_app_channelchannel/string
string name=preference_key_language_mrulanguageMru/string
+string
name=preference_key_select_text_tutorial_enabledselectTextTutorialEnabled/string
+string
name=preference_key_share_tutorial_enabledshareTutorialEnabled/string
string name=preference_key_know_toc_drawerknowToC/string
string name=preference_key_show_imagesshowImages/string
string name=preference_key_exp_page_loadexpPageLoad/string
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 5e8a898..95c8f02 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -34,6 +34,8 @@
import org.wikipedia.login.UserInfoStorage;
import org.wikipedia.migration.PerformMigrationsTask;
import org.wikipedia.networking.MccMncStateHandler;
+import org.wikipedia.onboarding.OnboardingStateMachine;
+import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
import org.wikipedia.page.PageCache;
import org.wikipedia.page.linkpreview.LinkPreviewVersion;
import org.wikipedia.pageimages.PageImage;
@@ -555,6 +557,10 @@
primarySite = null;
}
+public OnboardingStateMachine getOnboardingStateMachine() {
+return PrefsOnboardingStateMachine.getInstance();
+}
+
private HashMapString, String buildCustomHeaders(String acceptLanguage) {
//
https://lists.wikimedia.org/pipermail/wikimedia-l/2014-April/071131.html
HashMapString, String headers = new HashMap();
diff --git
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
new file mode 100644
index 000..4568a38
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingStateMachine.java
@@ -0,0 +1,10 @@
+package org.wikipedia.onboarding;
+
+public interface OnboardingStateMachine {
+boolean isTocTutorialEnabled();
+void setTocTutorial();
+boolean isSelectTextTutorialEnabled();
+void setSelectTextTutorial();
+boolean isShareTutorialEnabled();
+void setShareTutorial();
+}
\ No newline at end of file
diff --git
a/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
b/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
new file mode 100644
index 000..a6cabc4
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/onboarding/PrefsOnboardingStateMachine.java
@@ -0,0 +1,47 @@
+package org.wikipedia.onboarding;
+
+import org.wikipedia.settings.Prefs;
+
+public final class PrefsOnboardingStateMachine implements
OnboardingStateMachine {
+private static final PrefsOnboardingStateMachine INSTANCE = new
PrefsOnboardingStateMachine();
+
+private final boolean initialTocTutorialEnabled =
Prefs.isTocTutorialEnabled();
+
+public static PrefsOnboardingStateMachine getInstance() {
+return INSTANCE;
+}
+
+@Override
+public boolean isTocTutorialEnabled() {
+return Prefs.isTocTutorialEnabled();
+}
+
+@Override
+public void setTocTutorial() {
+Prefs.setTocTutorialEnabled(false);
+}
+
+@Override
+public boolean isSelectTextTutorialEnabled() {
+return !initialTocTutorialEnabled
Prefs.isSelectTextTutorialEnabled();
+}
+
+@Override
+public void setSelectTextTutorial() {
+Prefs.setSelectTextTutorialEnabled(false);
+}
+
+@Override
+public boolean isShareTutorialEnabled() {
+return
