[MediaWiki-commits] [Gerrit] Show an onboarding snackbar for deleting a page from a readi... - change (apps...wikipedia)

2016-06-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Show an onboarding snackbar for deleting a page from a reading 
list.
..


Show an onboarding snackbar for deleting a page from a reading list.

Bug: T136740
Change-Id: I86a04620842227387c7d77109459d8d6cef3850c
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/developer_preferences.xml
6 files changed, 30 insertions(+), 0 deletions(-)

Approvals:
  Mholloway: Looks good to me, but someone else must approve
  Niedzielski: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 29401b1..f442f24 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -232,6 +232,11 @@
 listDetailView.setReadingList(readingList);
 listDetailView.setSort(readingListPageSortMode);
 pager.setCurrentItem(PAGE_LIST_DETAIL);
+
+if (!readingList.getPages().isEmpty()
+&& Prefs.isReadingListPageDeleteTutorialEnabled()) {
+showDeletePageOnboarding();
+}
 }
 }
 
@@ -306,6 +311,16 @@
 snackbar.show();
 }
 
+private void showDeletePageOnboarding() {
+FeedbackUtil.makeSnackbar(getView(), 
getString(R.string.reading_lists_onboarding_page_delete), 
Snackbar.LENGTH_INDEFINITE)
+.setAction(R.string.reading_lists_onboarding_got_it, new 
View.OnClickListener() {
+@Override
+public void onClick(View v) {
+Prefs.setReadingListPageDeleteTutorialEnabled(false);
+}
+}).show();
+}
+
 private void setSortMode(int sortModeAsc, int sortModeDesc) {
 if (pager.getCurrentItem() == PAGE_READING_LISTS) {
 if (readingListSortMode != sortModeAsc) {
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9b38a31..382a330 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -371,6 +371,14 @@
 setBoolean(R.string.preference_key_reading_list_tutorial_enabled, 
enabled);
 }
 
+public static boolean isReadingListPageDeleteTutorialEnabled() {
+return 
getBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
true);
+}
+
+public static void setReadingListPageDeleteTutorialEnabled(boolean 
enabled) {
+
setBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
enabled);
+}
+
 public static boolean isFeatureSearchAutoCompleteEnabled() {
 return getBoolean(R.string.preference_key_feature_search_autocomplete, 
true);
 }
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index ed17fc9..32251a8 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -397,6 +397,7 @@
   Second example of a reading 
list title, in this case favorite animals.
   Third example of a reading 
list title, in this case space (as in outer space, cosmos).
   Label for the button that 
dismisses an introductory dialog that tells the user about the new Reading 
Lists feature.
+  Message for a tooltip 
that gives the user a hint that they can remove an page from a reading list by 
swiping it left or right.
   Checkbox title for Wikimedia account 
preference synchronization.
 {{Identical|Preferences}}
 
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 2b46862..92f5b08 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -45,4 +45,5 @@
 enableFeed
 readingListSortMode
 readingListPageSortMode
+readingListPageDeleteTutorialEnabled
 
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index c66898f..ab61be0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,6 +308,7 @@
 Favorite animals
 Space!
 Got it
+Tip: Swipe any page 
left or right to remove it from this reading list.
 
 
 
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index 44a0c18..3aa1072 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -79,6 +79,10 @@

[MediaWiki-commits] [Gerrit] Show an onboarding snackbar for deleting a page from a readi... - change (apps...wikipedia)

2016-06-02 Thread Dbrant (Code Review) 
Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292411

Change subject: Show an onboarding snackbar for deleting a page from a reading 
list.
..

Show an onboarding snackbar for deleting a page from a reading list.

Bug: T136740
Change-Id: I86a04620842227387c7d77109459d8d6cef3850c
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/developer_preferences.xml
6 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/11/292411/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 3dd370a..675dc76 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -205,6 +205,11 @@
 listDetailView.setReadingList(readingList);
 listDetailView.setSort(readingListPageSortMode);
 pager.setCurrentItem(PAGE_LIST_DETAIL);
+
+if (!readingList.getPages().isEmpty()
+&& Prefs.isReadingListPageDeleteTutorialEnabled()) {
+showDeletePageOnboarding();
+}
 }
 }
 
@@ -279,6 +284,16 @@
 snackbar.show();
 }
 
+private void showDeletePageOnboarding() {
+FeedbackUtil.makeSnackbar(getView(), 
getString(R.string.reading_lists_onboarding_page_delete), 
Snackbar.LENGTH_INDEFINITE)
+.setAction(R.string.reading_lists_onboarding_got_it, new 
View.OnClickListener() {
+@Override
+public void onClick(View v) {
+}
+}).show();
+Prefs.setReadingListPageDeleteTutorialEnabled(false);
+}
+
 private void sortByName() {
 if (pager.getCurrentItem() == PAGE_READING_LISTS) {
 if (readingListSortMode != ReadingList.SORT_BY_NAME_ASC) {
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9b38a31..382a330 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -371,6 +371,14 @@
 setBoolean(R.string.preference_key_reading_list_tutorial_enabled, 
enabled);
 }
 
+public static boolean isReadingListPageDeleteTutorialEnabled() {
+return 
getBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
true);
+}
+
+public static void setReadingListPageDeleteTutorialEnabled(boolean 
enabled) {
+
setBoolean(R.string.preference_key_reading_list_page_delete_tutorial_enabled, 
enabled);
+}
+
 public static boolean isFeatureSearchAutoCompleteEnabled() {
 return getBoolean(R.string.preference_key_feature_search_autocomplete, 
true);
 }
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index 7d1e4ad..058eaf5 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -395,6 +395,7 @@
   Second example of a reading 
list title, in this case favorite animals.
   Third example of a reading 
list title, in this case space (as in outer space, cosmos).
   Label for the button that 
dismisses an introductory dialog that tells the user about the new Reading 
Lists feature.
+  Message for a tooltip 
that gives the user a hint that they can remove an page from a reading list by 
swiping it left or right.
   Checkbox title for Wikimedia account 
preference synchronization.
 {{Identical|Preferences}}
 
diff --git a/app/src/main/res/values/preference_keys.xml 
b/app/src/main/res/values/preference_keys.xml
index 2b46862..92f5b08 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -45,4 +45,5 @@
 enableFeed
 readingListSortMode
 readingListPageSortMode
+readingListPageDeleteTutorialEnabled
 
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 86a68ba..f18eb35 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,6 +306,7 @@
 Favorite animals
 Space!
 Got it
+Tip: Swipe any page 
left or right to remove it from this reading list.
 
 
 
diff --git a/app/src/main/res/xml/developer_preferences.xml 
b/app/src/main/res/xml/developer_preferences.xml
index 44a0c18..3aa1072 100644
--- a/app/src/main/res/xml/developer_preferences.xml
+++ b/app/src/main/res/xml/developer_preferences.xml
@@ -79,6 +79,10 @@