[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make "View list" snackbar action go to the specific list.

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342011 )

Change subject: Make "View list" snackbar action go to the specific list.
......................................................................

Make "View list" snackbar action go to the specific list.

...instead of the "my lists" screen.
Also add the "View list" action to the snackbar in PageActivity.

Bug: T160064
Bug: T156085
Change-Id: Ibe70c25579037b0879e1d0171b8e267c5b08f871
---
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
3 files changed, 17 insertions(+), 7 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java 
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index d3a6de7..223431a 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -50,6 +50,8 @@
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.page.linkpreview.LinkPreviewDialog;
 import org.wikipedia.readinglist.AddToReadingListDialog;
+import org.wikipedia.readinglist.ReadingList;
+import org.wikipedia.readinglist.ReadingListActivity;
 import org.wikipedia.readinglist.ReadingListsFragment;
 import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchInvokeSource;
@@ -377,12 +379,12 @@
     }
 
     @Override
-    public void showReadingListAddedMessage(@NonNull String message) {
+    public void showReadingListAddedMessage(@NonNull final ReadingList 
readingList, @NonNull String message) {
         FeedbackUtil.makeSnackbar(getActivity(), message, 
FeedbackUtil.LENGTH_DEFAULT)
                 .setAction(R.string.reading_list_added_view_button, new 
View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        goToTab(NavTab.READING_LISTS);
+                        
startActivity(ReadingListActivity.newIntent(getContext(), readingList));
                     }
                 }).show();
     }
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index cdce475..d6cecc8 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -56,6 +56,8 @@
 import org.wikipedia.page.tabs.TabsProvider;
 import org.wikipedia.page.tabs.TabsProvider.TabPosition;
 import org.wikipedia.readinglist.AddToReadingListDialog;
+import org.wikipedia.readinglist.ReadingList;
+import org.wikipedia.readinglist.ReadingListActivity;
 import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchInvokeSource;
 import org.wikipedia.settings.SettingsActivity;
@@ -421,8 +423,14 @@
     }
 
     @Override
-    public void showReadingListAddedMessage(@NonNull String message) {
-        FeedbackUtil.makeSnackbar(this, message, 
FeedbackUtil.LENGTH_DEFAULT).show();
+    public void showReadingListAddedMessage(@NonNull final ReadingList 
readingList, @NonNull String message) {
+        FeedbackUtil.makeSnackbar(this, message, FeedbackUtil.LENGTH_DEFAULT)
+                .setAction(R.string.reading_list_added_view_button, new 
View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        
startActivity(ReadingListActivity.newIntent(PageActivity.this, readingList));
+                    }
+                }).show();
     }
 
     // Note: back button first handled in {@link #onOptionsItemSelected()};
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 23a8ba4..969b985 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -58,7 +58,7 @@
     }
 
     public interface Callback {
-        void showReadingListAddedMessage(@NonNull String message);
+        void showReadingListAddedMessage(@NonNull ReadingList readingList, 
@NonNull String message);
     }
 
     private PageTitle pageTitle;
@@ -212,11 +212,11 @@
                     Callback callback = callback();
                     if (contains) {
                         if (callback != null) {
-                            
callback.showReadingListAddedMessage(getString(R.string.reading_list_already_exists));
+                            callback.showReadingListAddedMessage(readingList, 
getString(R.string.reading_list_already_exists));
                         }
                     } else {
                         if (callback != null) {
-                            
callback.showReadingListAddedMessage(TextUtils.isEmpty(readingList.getTitle())
+                            callback.showReadingListAddedMessage(readingList, 
TextUtils.isEmpty(readingList.getTitle())
                                     ? 
getString(R.string.reading_list_added_to_unnamed)
                                     : 
String.format(getString(R.string.reading_list_added_to_named),
                                     readingList.getTitle()));

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe70c25579037b0879e1d0171b8e267c5b08f871
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>

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