[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Revise onboarding and user education cards in sideloading Of...

jenkins-bot (Code Review) Fri, 17 Nov 2017 09:38:55 -0800

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391144 )


Change subject: Revise onboarding and user education cards in sideloading 
Offline Library  - Remove OnboardingClient() from FeedCoordinator  - Add 
sideloading version text  - Set default value of offline tutorial as false
......................................................................


Revise onboarding and user education cards in sideloading Offline Library
 - Remove OnboardingClient() from FeedCoordinator
 - Add sideloading version text
 - Set default value of offline tutorial as false

Bug: T179203
Change-Id: I6b0367c8fc6aa9fc8c2c9ced9ee0a40306fa168e
---
M app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/layout/view_card_offline_compilation.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 13 insertions(+), 14 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.java 
b/app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.java
index b0a48d4..a37bf5c 100644
--- a/app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.java
+++ b/app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.java
@@ -3,12 +3,9 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import org.wikipedia.R;
 import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.feed.announcement.Announcement;
 import org.wikipedia.feed.dataclient.FeedClient;
 import org.wikipedia.feed.model.Card;
-import org.wikipedia.util.UriUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,15 +15,15 @@
                                   @NonNull FeedClient.Callback cb) {
         List<Card> cards = new ArrayList<>();
 
-        OnboardingCard card = new OfflineOnboardingCard(new Announcement(
-                "offlineOnboardingCard1",
-                context.getString(R.string.offline_library_onboarding_text),
-                
"https://upload.wikimedia.org/wikipedia/commons/5/5b/Illustration-OfflineLibraryPromo2_3x.png";,
-                new 
Announcement.Action(context.getString(R.string.offline_library_onboarding_action),
-                        UriUtil.LOCAL_URL_OFFLINE_LIBRARY)));
-        if (card.shouldShow()) {
-            cards.add(card);
-        }
+//        OnboardingCard card = new OfflineOnboardingCard(new Announcement(
+//                "offlineOnboardingCard1",
+//                context.getString(R.string.offline_library_onboarding_text),
+//                
"https://upload.wikimedia.org/wikipedia/commons/5/5b/Illustration-OfflineLibraryPromo2_3x.png";,
+//                new 
Announcement.Action(context.getString(R.string.offline_library_onboarding_action),
+//                        UriUtil.LOCAL_URL_OFFLINE_LIBRARY)));
+//        if (card.shouldShow()) {
+//            cards.add(card);
+//        }
 
         cb.success(cards);
     }
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 79fe9ed..786df10 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -558,7 +558,7 @@
     }
 
     public static boolean isOfflineTutorialEnabled() {
-        return getBoolean(R.string.preference_key_offline_onboarding_enabled, 
true);
+        return getBoolean(R.string.preference_key_offline_onboarding_enabled, 
false);
     }
 
     public static void setOfflineTutorialEnabled(boolean enabled) {
diff --git a/app/src/main/res/layout/view_card_offline_compilation.xml 
b/app/src/main/res/layout/view_card_offline_compilation.xml
index 0f55e7c..50eeb82 100644
--- a/app/src/main/res/layout/view_card_offline_compilation.xml
+++ b/app/src/main/res/layout/view_card_offline_compilation.xml
@@ -21,7 +21,7 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:lineSpacingMultiplier="1.2"
-        android:text="@string/offline_card_text"
+        android:text="@string/offline_card_sideloading_text"
         android:textColor="@android:color/white" />
 
     <View
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index aea4c8b..a5f4d44 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -445,6 +445,7 @@
   <string name="offline_read_permission_rationale">Message explaining why we 
need permission to access the device storage when reading articles in offline 
mode.</string>
   <string name="offline_read_permission_error">Error shown when the app could 
not read from the internal or external storage of the device due to permission 
not being granted.</string>
   <string name="offline_card_text">Message shown in the Feed card that informs 
the user that they are now browsing Wikipedia in offline mode.</string>
+  <string name="offline_card_sideloading_text">Message shown in the Feed card 
that informs the user that they are now browsing Wikipedia from article packs 
in offline mode.</string>
   <string name="offline_my_compilations">Button label for the user to navigate 
to the offline library screen.</string>
   <string name="offline_compilations_title">Title shown on the toolbar of the 
activity for managing article packs.</string>
   <string name="offline_compilations_search_by_name">Menu item for searching 
article packs by name.</string>
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index d7b5b89..3b82ace 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -498,6 +498,7 @@
     <string name="offline_read_permission_rationale">Permission to access 
storage on your device is required for offline browsing.</string>
     <string name="offline_read_permission_error">Permission not granted to 
read from device storage.</string>
     <string name="offline_card_text">You are now browsing Wikipedia offline 
with articles in your Offline Library.</string>
+    <string name="offline_card_sideloading_text">You are now browsing 
Wikipedia offline from article packs in your Offline Library.</string>
     <string name="offline_my_compilations">Manage my offline library</string>
     <string name="offline_compilations_title">Offline Library</string>
     <string name="offline_compilations_search_by_name">Search article packs by 
name</string>

-- 
To view, visit https://gerrit.wikimedia.org/r/391144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0367c8fc6aa9fc8c2c9ced9ee0a40306fa168e
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Revise onboarding and user education cards in sideloading Of...

Reply via email to