Skip to content

Commit f1ebb5f

Browse files
yuvipandaBrion VIBBER
authored and
Brion VIBBER
committed
Provide usable menu actions for Media object pagination too
Change-Id: Iae25f59fb713ddcf615b47959f141a595bbbed1d
1 parent 786e1eb commit f1ebb5f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
230230
Media m = provider.getMediaAtPosition(pager.getCurrentItem());
231231
if(m != null) {
232232
// Enable default set of actions, then re-enable different set of actions only if it is a failed contrib
233+
menu.findItem(R.id.menu_retry_current_image).setEnabled(false).setVisible(false);
234+
menu.findItem(R.id.menu_cancel_current_image).setEnabled(false).setVisible(false);
235+
menu.findItem(R.id.menu_browser_current_image).setEnabled(true).setVisible(true);
236+
menu.findItem(R.id.menu_share_current_image).setEnabled(true).setVisible(true);
237+
menu.findItem(R.id.menu_download_current_image).setEnabled(true).setVisible(true);
233238

234239
if(m instanceof Contribution) {
235240
Contribution c = (Contribution)m;
@@ -250,11 +255,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
250255
menu.findItem(R.id.menu_download_current_image).setEnabled(false).setVisible(false);
251256
break;
252257
case Contribution.STATE_COMPLETED:
253-
menu.findItem(R.id.menu_retry_current_image).setEnabled(false).setVisible(false);
254-
menu.findItem(R.id.menu_cancel_current_image).setEnabled(false).setVisible(false);
255-
menu.findItem(R.id.menu_browser_current_image).setEnabled(true).setVisible(true);
256-
menu.findItem(R.id.menu_share_current_image).setEnabled(true).setVisible(true);
257-
menu.findItem(R.id.menu_download_current_image).setEnabled(true).setVisible(true);
258+
// Default set of menu items works fine. Treat same as regular media object
258259
break;
259260
}
260261

0 commit comments

Comments
 (0)