jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/336862 )
Change subject: Remove back nav button when reading list detail action mode is
enabled
......................................................................
Remove back nav button when reading list detail action mode is enabled
Prevents the user from navigating away while the action mode remains
enabled, which can leave the list detail in a surprising filtered state
on return to the detail view.
Bug: T156001
Change-Id: I703c3b8b2fa9140496e5a75bb7b8bd2adaa2dfc2
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
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 f568a9d..5fec00f 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -17,6 +17,7 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import org.wikipedia.BackPressedHandler;
import org.wikipedia.R;
@@ -57,6 +58,7 @@
private ReadingListsFunnel funnel = new ReadingListsFunnel();
@BindView(R.id.list_detail_view) ReadingListDetailView listDetailView;
+ private ImageView detailViewBackButton;
private ReadingListAdapter adapter = new ReadingListAdapter();
private ReadingListPagerAdapter pagerAdapter = new
ReadingListPagerAdapter();
@@ -91,6 +93,7 @@
View view = inflater.inflate(R.layout.fragment_reading_lists,
container, false);
unbinder = ButterKnife.bind(this, view);
+ detailViewBackButton = (ImageView)
listDetailView.findViewById(R.id.reading_list_detail_back_button);
listDetailView.setActionListener(actionListener);
listDetailView.setOnItemActionListener(itemActionListener);
@@ -282,6 +285,9 @@
@Override
public void onClick(View v) {
+ if (actionMode != null) {
+ actionMode.finish();
+ }
listDetailView.setReadingList(readingList);
listDetailView.setSort(readingListPageSortMode);
pager.setCurrentItem(PAGE_LIST_DETAIL);
@@ -415,6 +421,7 @@
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
actionMode = mode;
+ detailViewBackButton.setVisibility(View.INVISIBLE);
return super.onCreateActionMode(mode, menu);
}
@@ -431,6 +438,7 @@
public void onDestroyActionMode(ActionMode mode) {
super.onDestroyActionMode(mode);
actionMode = null;
+ detailViewBackButton.setVisibility(View.VISIBLE);
if (pager.getCurrentItem() == PAGE_READING_LISTS) {
updateLists();
} else if (pager.getCurrentItem() == PAGE_LIST_DETAIL) {
--
To view, visit https://gerrit.wikimedia.org/r/336862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I703c3b8b2fa9140496e5a75bb7b8bd2adaa2dfc2
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
