jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395153 )
Change subject: Update the URL and the switch color on the final app onboarding
screen
......................................................................
Update the URL and the switch color on the final app onboarding screen
- Add an URL and a text item with #offline
- Update the `on` switch color to Accent50
Bug: T181149
Change-Id: I251f32b6fff9f35fdbbfdf01f1dfb2dadee0ac42
---
M app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
6 files changed, 13 insertions(+), 3 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
index 7fc85a8..1dd2bbc 100644
--- a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
+++ b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
@@ -65,7 +65,9 @@
FeedbackUtil.showPrivacyPolicy(getContext());
} else if (url.equals("#about")) {
FeedbackUtil.showAboutWikipedia(getContext());
- } else {
+ } else if (url.equals("#offline")) {
+ FeedbackUtil.showOfflineReadingAndData(getContext());
+ } else {
handleExternalLink(getActivity(), Uri.parse(url));
}
}
diff --git a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
index 3c46544..e4e7fd0 100644
--- a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
+++ b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
@@ -87,6 +87,10 @@
visitInExternalBrowser(context,
Uri.parse(context.getString(R.string.privacy_policy_url)));
}
+ public static void showOfflineReadingAndData(Context context) {
+ visitInExternalBrowser(context,
Uri.parse(context.getString(R.string.offline_reading_and_data_url)));
+ }
+
public static void showAboutWikipedia(Context context) {
visitInExternalBrowser(context,
Uri.parse(context.getString(R.string.about_wikipedia_url)));
}
diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
index 3cdef26..f9d79ec 100644
--- a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
+++ b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
@@ -8,5 +8,5 @@
app:centeredImage="@drawable/illustration_onboarding_analytics"
app:imageSize="160dp"
app:primaryText="@string/onboarding_analytics_title"
- app:secondaryText="@string/onboarding_analytics_text"
+ app:secondaryText="@string/onboarding_analytics_offline_text"
app:switchText="@string/onboarding_analytics_switch_title" />
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index fb1bce6..67526af 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -148,6 +148,7 @@
<string name="terms_of_use_description">Summary of the preference item to
show the terms of use.\n{{Identical|Terms of use}}</string>
<string name="about_wikipedia_url">URL leading to the About Wikipedia page.
If you can find the appropriate language specific URL of the mobile site please
do so. If not feel free to keep the English one. Example for German (lang code
\"de\"): https://de.wikipedia.org/wiki/Wikipedia:Über_Wikipedia\nPlease test
the URL to make sure it works.</string>
<string name="privacy_policy_url">URL leading to the Wikimedia Foundation
privacy policy. If you can find the appropriate language specific URL of the
mobile site please do so. If not feel free to keep the English one. Example for
German (lang code \"de\"):
https://meta.m.wikimedia.org/w/index.php?title=Privacy_policy/de\nPlease test
the URL to make sure it works.</string>
+ <string name="offline_reading_and_data_url">URL leading to the Offline
reading and data section of Wikimedia Android app FAQ. If you can find the
appropriate language specific URL of the mobile site please do so. </string>
<string name="terms_of_use_url">URL leading to the Wikimedia Foundation
terms of use. If you can find the appropriate language specific URL of the
mobile site please do so. If not feel free to keep the English one. Example for
German (lang code \"de\"):
https://m.wikimediafoundation.org/wiki/Terms_of_Use/de\nPlease test the URL to
make sure it works</string>
<string name="cc_by_sa_3_url">URL for details about the Creative Commons CC
BY-SA 3.0 license. When possible, please use the appropriate language-specific
URL, and the mobile version of the site.</string>
<string name="cc_0_url">URL for details about the Creative Commons CC0
license. When possible, please use the appropriate language-specific URL, and
the mobile version of the site.</string>
@@ -532,6 +533,7 @@
<string name="onboarding_reading_list_sync_text">Short explanatory text
about the benefits of synchronizing reading lists. (Please preserve the anchor
tag in its exact form)</string>
<string name="onboarding_analytics_title">Title for a tutorial screen about
anonymous usage reports sent by the app.</string>
<string name="onboarding_analytics_text">Short explanatory text about the
benefits of allowing the app to send anonymous usage reports. (Please preserve
the anchor tag in its exact form)</string>
+ <string name="onboarding_analytics_offline_text">Short explanatory text
about the benefits of allowing the app to send anonymous usage reports. (Please
preserve the anchor tag in its exact form)</string>
<string name="onboarding_analytics_switch_title">Label for an on-off switch
that enables sending anonymous usage reports.</string>
<string name="onboarding_create_account_sync">Short explanation of the
benefits of creating an account, which is the ability to synchronize your
reading lists.</string>
<string name="onboarding_create_account_contributions">Short explanation of
the benefits of creating an account, which is the ability to keep a record of
your edits.</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index d1a8cbb..a533863 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,6 +161,7 @@
<string name="terms_of_use_description">Terms of use</string>
<string
name="about_wikipedia_url">https://en.m.wikipedia.org/wiki/Wikipedia:About</string>
<string
name="privacy_policy_url">https://m.wikimediafoundation.org/wiki/Privacy_policy</string>
+ <string
name="offline_reading_and_data_url">https://www.mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Offline_reading_and_data</string>
<string
name="terms_of_use_url">https://m.wikimediafoundation.org/wiki/Terms_of_Use</string>
<string
name="cc_by_sa_3_url">https://creativecommons.org/licenses/by-sa/3.0/</string>
<string
name="cc_0_url">https://creativecommons.org/publicdomain/zero/1.0/</string>
@@ -588,6 +589,7 @@
<string name="onboarding_reading_list_sync_text"><![CDATA[Create reading
lists from articles you want to read later, even when you\'re offline. <a
href="#login">Log in or create</a> your Wikipedia account to keep your reading
lists backed up.]]></string>
<string name="onboarding_analytics_title">Send anonymous data</string>
<string name="onboarding_analytics_text"><![CDATA[Help make the app better
by letting us know how you use it. Data collected is anonymous. <a
href="#privacy">Learn more</a>]]></string>
+ <string name="onboarding_analytics_offline_text"><![CDATA[Help make the
app better by letting us know how you use it. Data collected is anonymous. <a
href="#offline">Learn more</a>]]></string>
<string name="onboarding_analytics_switch_title">Send usage data</string>
<string name="onboarding_create_account_sync">Sync your reading
lists</string>
<string name="onboarding_create_account_contributions">Keep track of your
contributions</string>
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index f48fd1b..6a6faab 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -222,7 +222,7 @@
</style>
<style name="OnboardingSwitch">
- <item name="colorControlActivated">@color/green50</item>
+ <item name="colorControlActivated">@color/accent50</item>
<item name="colorSwitchThumbNormal">@color/base50</item>
<item name="android:colorForeground">@color/base30</item>
</style>
--
To view, visit https://gerrit.wikimedia.org/r/395153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I251f32b6fff9f35fdbbfdf01f1dfb2dadee0ac42
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
