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

fix(image-viewer): put the download and share buttons back on a sensible place

Browse Source
This commit is contained in:
LucasGGamerM
2024-05-27 16:36:58 -03:00
parent 38996d8921
commit 5e7f4bda82
3 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,16 +207,6 @@ public class PhotoViewer implements ZoomPanView.Listener{
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)
.setOnMenuItemClickListener(item -> {
showInfoSheet();
return true;
})
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
} else {
toolbar.getMenu() toolbar.getMenu()
.add(R.string.download) .add(R.string.download)
.setIcon(R.drawable.ic_fluent_arrow_download_24_regular) .setIcon(R.drawable.ic_fluent_arrow_download_24_regular)
@@ -233,6 +223,16 @@ public class PhotoViewer implements ZoomPanView.Listener{
return true; return true;
}) })
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); .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->{
showInfoSheet();
return true;
})
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
} }
uiOverlay.setAlpha(0f); uiOverlay.setAlpha(0f);
@@ -781,17 +781,18 @@ public class PhotoViewer implements ZoomPanView.Listener{
if(status!=null){ if(status!=null){
AccountSessionManager.get(accountID).getStatusInteractionController().setFavorited(status, !status.favourited, r->{}); AccountSessionManager.get(accountID).getStatusInteractionController().setFavorited(status, !status.favourited, r->{});
} }
}else if(id==R.id.btn_share){ // }else if(id==R.id.btn_share){
if(status!=null){ // if(status!=null){
shareCurrentFile(); // shareCurrentFile();
} // }
}else if(id==R.id.btn_bookmark){ }else if(id==R.id.btn_bookmark){
if(status!=null){ if(status!=null){
AccountSessionManager.get(accountID).getStatusInteractionController().setBookmarked(status, !status.bookmarked); 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); sheet.setStatus(status);

4
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
View File

@@ -102,9 +102,9 @@ public class PhotoViewerInfoSheet extends BottomSheet{
boostBtn.setOnClickListener(clickListener); boostBtn.setOnClickListener(clickListener);
favoriteBtn.setOnClickListener(clickListener); favoriteBtn.setOnClickListener(clickListener);
findViewById(R.id.btn_share).setOnClickListener(clickListener); // findViewById(R.id.btn_share).setOnClickListener(clickListener);
bookmarkBtn.setOnClickListener(clickListener); bookmarkBtn.setOnClickListener(clickListener);
findViewById(R.id.btn_download).setOnClickListener(clickListener); // findViewById(R.id.btn_download).setOnClickListener(clickListener);
} }
private void showAltTextHelp(){ private void showAltTextHelp(){

50
mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
View File

@@ -34,7 +34,7 @@
<Button <Button
android:id="@+id/btn_boost" android:id="@+id/btn_boost"
android:layout_width="wrap_content" android:layout_width="92dp"
android:layout_height="64dp" android:layout_height="64dp"
android:text="@string/button_reblog" android:text="@string/button_reblog"
android:drawableTop="@drawable/ic_boost" android:drawableTop="@drawable/ic_boost"
@@ -47,24 +47,24 @@
<Button <Button
android:id="@+id/btn_favorite" android:id="@+id/btn_favorite"
android:layout_width="wrap_content" android:layout_width="92dp"
android:layout_height="64dp" android:layout_height="64dp"
android:text="@string/button_favorite" android:text="@string/button_favorite"
android:drawableTop="@drawable/ic_fluent_star_24_selector" android:drawableTop="@drawable/ic_fluent_star_24_selector"
style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/> style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
<Space <!-- <Space-->
android:layout_width="0dp" <!-- android:layout_width="0dp"-->
android:layout_height="1dp" <!-- android:layout_height="1dp"-->
android:layout_weight="1"/> <!-- android:layout_weight="1"/>-->
<Button <!-- <Button-->
android:id="@+id/btn_share" <!-- android:id="@+id/btn_share"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="64dp" <!-- android:layout_height="64dp"-->
android:text="@string/button_share" <!-- android:text="@string/button_share"-->
android:drawableTop="@drawable/ic_fluent_share_24_regular" <!-- android:drawableTop="@drawable/ic_fluent_share_24_regular"-->
style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/> <!-- style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>-->
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -73,24 +73,24 @@
<Button <Button
android:id="@+id/btn_bookmark" android:id="@+id/btn_bookmark"
android:layout_width="wrap_content" android:layout_width="92dp"
android:layout_height="64dp" android:layout_height="64dp"
android:text="@string/add_bookmark" android:text="@string/add_bookmark"
android:drawableTop="@drawable/ic_fluent_bookmark_24_selector" android:drawableTop="@drawable/ic_fluent_bookmark_24_selector"
style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/> style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>
<Space <!-- <Space-->
android:layout_width="0dp" <!-- android:layout_width="0dp"-->
android:layout_height="1dp" <!-- android:layout_height="1dp"-->
android:layout_weight="1"/> <!-- android:layout_weight="1"/>-->
<Button <!-- <Button-->
android:id="@+id/btn_download" <!-- android:id="@+id/btn_download"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="64dp" <!-- android:layout_height="64dp"-->
android:text="@string/download" <!-- android:text="@string/download"-->
android:drawableTop="@drawable/ic_fluent_arrow_download_24_regular" <!-- android:drawableTop="@drawable/ic_fluent_arrow_download_24_regular"-->
style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/> <!-- style="@style/Widget.Mastodon.M3.Button.IconWithLabel"/>-->
</LinearLayout> </LinearLayout>