From 5e7f4bda825f38204f8c01ec26c7b9aab94a1c45 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <moshidon.app@gmail.com>
Date: Mon, 27 May 2024 16:36:58 -0300
Subject: [PATCH] fix(image-viewer): put the download and share buttons back on
 a sensible place

---
 .../android/ui/photoviewer/PhotoViewer.java   | 51 ++++++++++---------
 .../ui/photoviewer/PhotoViewerInfoSheet.java  |  4 +-
 .../res/layout/sheet_photo_viewer_info.xml    | 50 +++++++++---------
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
index 27fdc7825..c8431a014 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@@ -207,32 +207,32 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
 
-		if(status!=null) {
+		toolbar.getMenu()
+				.add(R.string.download)
+				.setIcon(R.drawable.ic_fluent_arrow_download_24_regular)
+				.setOnMenuItemClickListener(item -> {
+					saveCurrentFile();
+					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);
+
+		if(status!=null){
 			toolbar.getMenu()
 					.add(R.string.info)
 					.setIcon(R.drawable.ic_fluent_info_24_regular)
-					.setOnMenuItemClickListener(item -> {
+					.setOnMenuItemClickListener(item->{
 						showInfoSheet();
 						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();
-						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);
@@ -781,17 +781,18 @@ public class PhotoViewer implements ZoomPanView.Listener{
 					if(status!=null){
 						AccountSessionManager.get(accountID).getStatusInteractionController().setFavorited(status, !status.favourited, r->{});
 					}
-				}else if(id==R.id.btn_share){
-					if(status!=null){
-						shareCurrentFile();
-					}
+//				}else if(id==R.id.btn_share){
+//					if(status!=null){
+//						shareCurrentFile();
+//					}
 				}else if(id==R.id.btn_bookmark){
 					if(status!=null){
 						AccountSessionManager.get(accountID).getStatusInteractionController().setBookmarked(status, !status.bookmarked);
 					}
-				}else if(id==R.id.btn_download){
-					saveCurrentFile();
 				}
+//				else if(id==R.id.btn_download){
+//					saveCurrentFile();
+//				}
 			}
 		});
 		sheet.setStatus(status);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
index 565d198ca..70904bbeb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
@@ -102,9 +102,9 @@ public class PhotoViewerInfoSheet extends BottomSheet{
 
 		boostBtn.setOnClickListener(clickListener);
 		favoriteBtn.setOnClickListener(clickListener);
-		findViewById(R.id.btn_share).setOnClickListener(clickListener);
+//		findViewById(R.id.btn_share).setOnClickListener(clickListener);
 		bookmarkBtn.setOnClickListener(clickListener);
-		findViewById(R.id.btn_download).setOnClickListener(clickListener);
+//		findViewById(R.id.btn_download).setOnClickListener(clickListener);
 	}
 
 	private void showAltTextHelp(){
diff --git a/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml b/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
index 41b1ab693..621e6decd 100644
--- a/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
+++ b/mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
@@ -34,7 +34,7 @@
 
 				<Button
 					android:id="@+id/btn_boost"
-					android:layout_width="wrap_content"
+					android:layout_width="92dp"
 					android:layout_height="64dp"
 					android:text="@string/button_reblog"
 					android:drawableTop="@drawable/ic_boost"
@@ -47,24 +47,24 @@
 
 				<Button
 					android:id="@+id/btn_favorite"
-					android:layout_width="wrap_content"
+					android:layout_width="92dp"
 					android:layout_height="64dp"
 					android:text="@string/button_favorite"
 					android:drawableTop="@drawable/ic_fluent_star_24_selector"
 					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
 
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
+<!--				<Space-->
+<!--					android:layout_width="0dp"-->
+<!--					android:layout_height="1dp"-->
+<!--					android:layout_weight="1"/>-->
 
-				<Button
-					android:id="@+id/btn_share"
-					android:layout_width="wrap_content"
-					android:layout_height="64dp"
-					android:text="@string/button_share"
-					android:drawableTop="@drawable/ic_fluent_share_24_regular"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+<!--				<Button-->
+<!--					android:id="@+id/btn_share"-->
+<!--					android:layout_width="wrap_content"-->
+<!--					android:layout_height="64dp"-->
+<!--					android:text="@string/button_share"-->
+<!--					android:drawableTop="@drawable/ic_fluent_share_24_regular"-->
+<!--					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>-->
 
 				<Space
 					android:layout_width="0dp"
@@ -73,24 +73,24 @@
 
 				<Button
 					android:id="@+id/btn_bookmark"
-					android:layout_width="wrap_content"
+					android:layout_width="92dp"
 					android:layout_height="64dp"
 					android:text="@string/add_bookmark"
 					android:drawableTop="@drawable/ic_fluent_bookmark_24_selector"
 					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
 
-				<Space
-					android:layout_width="0dp"
-					android:layout_height="1dp"
-					android:layout_weight="1"/>
+<!--				<Space-->
+<!--					android:layout_width="0dp"-->
+<!--					android:layout_height="1dp"-->
+<!--					android:layout_weight="1"/>-->
 
-				<Button
-					android:id="@+id/btn_download"
-					android:layout_width="wrap_content"
-					android:layout_height="64dp"
-					android:text="@string/download"
-					android:drawableTop="@drawable/ic_fluent_arrow_download_24_regular"
-					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
+<!--				<Button-->
+<!--					android:id="@+id/btn_download"-->
+<!--					android:layout_width="wrap_content"-->
+<!--					android:layout_height="64dp"-->
+<!--					android:text="@string/download"-->
+<!--					android:drawableTop="@drawable/ic_fluent_arrow_download_24_regular"-->
+<!--					style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>-->
 
 			</LinearLayout>