Brion VIBBER has submitted this change and it was merged.
Change subject: Provide usable menu actions for Media object pagination too
......................................................................
Provide usable menu actions for Media object pagination too
Change-Id: Iae25f59fb713ddcf615b47959f141a595bbbed1d
---
M
commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git
a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
index 72817ac..f47155c 100644
---
a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
+++
b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
@@ -230,6 +230,11 @@
Media m = provider.getMediaAtPosition(pager.getCurrentItem());
if(m != null) {
// Enable default set of actions, then re-enable different
set of actions only if it is a failed contrib
+
menu.findItem(R.id.menu_retry_current_image).setEnabled(false).setVisible(false);
+
menu.findItem(R.id.menu_cancel_current_image).setEnabled(false).setVisible(false);
+
menu.findItem(R.id.menu_browser_current_image).setEnabled(true).setVisible(true);
+
menu.findItem(R.id.menu_share_current_image).setEnabled(true).setVisible(true);
+
menu.findItem(R.id.menu_download_current_image).setEnabled(true).setVisible(true);
if(m instanceof Contribution) {
Contribution c = (Contribution)m;
@@ -250,11 +255,7 @@
menu.findItem(R.id.menu_download_current_image).setEnabled(false).setVisible(false);
break;
case Contribution.STATE_COMPLETED:
-
menu.findItem(R.id.menu_retry_current_image).setEnabled(false).setVisible(false);
-
menu.findItem(R.id.menu_cancel_current_image).setEnabled(false).setVisible(false);
-
menu.findItem(R.id.menu_browser_current_image).setEnabled(true).setVisible(true);
-
menu.findItem(R.id.menu_share_current_image).setEnabled(true).setVisible(true);
-
menu.findItem(R.id.menu_download_current_image).setEnabled(true).setVisible(true);
+ // Default set of menu items works fine. Treat
same as regular media object
break;
}
--
To view, visit https://gerrit.wikimedia.org/r/90086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae25f59fb713ddcf615b47959f141a595bbbed1d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/commons
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
