owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(photo-viewer-menu-icons): readd share button on non-status media viewers

Browse Source
This commit is contained in:
LucasGGamerM
2024-05-05 16:18:11 -03:00
parent a59c20d239
commit 6f89dd7331
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
View File

@@ -206,17 +206,35 @@ public class PhotoViewer implements ZoomPanView.Listener{
toolbarWrap=uiOverlay.findViewById(R.id.toolbar_wrap); toolbarWrap=uiOverlay.findViewById(R.id.toolbar_wrap);
toolbar=uiOverlay.findViewById(R.id.toolbar); toolbar=uiOverlay.findViewById(R.id.toolbar);
toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0)); toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
if(status!=null)
toolbar.getMenu().add(R.string.info).setIcon(R.drawable.ic_fluent_info_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); if(status!=null) {
else toolbar.getMenu()
toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_fluent_arrow_download_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); .add(R.string.info)
toolbar.setOnMenuItemClickListener(item->{ .setIcon(R.drawable.ic_fluent_info_24_regular)
if(status!=null) .setOnMenuItemClickListener(item -> {
showInfoSheet(); showInfoSheet();
else return true;
})
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
} else {
toolbar.getMenu()
.add(R.string.download)
.setIcon(R.drawable.ic_fluent_arrow_download_24_regular)
.setOnMenuItemClickListener(item -> {
saveCurrentFile(); saveCurrentFile();
return true; return true;
}); })
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
toolbar.getMenu()
.add(R.string.button_share)
.setIcon(R.drawable.ic_fluent_share_24_regular)
.setOnMenuItemClickListener(item -> {
shareCurrentFile();
return true;
})
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
uiOverlay.setAlpha(0f); uiOverlay.setAlpha(0f);
videoControls=uiOverlay.findViewById(R.id.video_player_controls); videoControls=uiOverlay.findViewById(R.id.video_player_controls);
videoSeekBar=uiOverlay.findViewById(R.id.seekbar); videoSeekBar=uiOverlay.findViewById(R.id.seekbar);