From a6e451b584f74b1908b7315493662aae13e0eed8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 16 Jan 2025 07:22:24 +0100
Subject: [PATCH] Image edit: small improvements

---
 .../faircode/email/FragmentDialogEditImage.java   |  3 +--
 .../main/res/drawable/twotone_aspect_ratio_24.xml | 15 ---------------
 app/src/main/res/layout/dialog_edit_image.xml     |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/res/drawable/twotone_aspect_ratio_24.xml

diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java b/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java
index 37b183d501..fecb52fcd7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogEditImage.java
@@ -119,13 +119,12 @@ public class FragmentDialogEditImage extends FragmentDialogBase {
 
                 int order = 1;
                 for (int size : resizeValues) {
-                    if (size > s)
-                        break;
                     order++;
                     ssb = new SpannableStringBuilderEx(getString(R.string.title_add_resize_pixels, size));
                     if (size == resize)
                         ssb.setSpan(new StyleSpan(Typeface.BOLD), 0, ssb.length(), 0);
                     popupMenu.getMenu().add(Menu.NONE, order, order, ssb)
+                            .setEnabled(size < s)
                             .setIntent(new Intent().putExtra("size", size));
                 }
 
diff --git a/app/src/main/res/drawable/twotone_aspect_ratio_24.xml b/app/src/main/res/drawable/twotone_aspect_ratio_24.xml
deleted file mode 100644
index 376ccaac58..0000000000
--- a/app/src/main/res/drawable/twotone_aspect_ratio_24.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,19.01h18V4.99H3v14.02zM14,15h3v-3h2v5h-5v-2zM5,7h5v2H7v3H5V7z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02zM7,9h3L10,7L5,7v5h2zM19,12h-2v3h-3v2h5z"/>
-</vector>
diff --git a/app/src/main/res/layout/dialog_edit_image.xml b/app/src/main/res/layout/dialog_edit_image.xml
index fc3d22c077..42f0abd377 100644
--- a/app/src/main/res/layout/dialog_edit_image.xml
+++ b/app/src/main/res/layout/dialog_edit_image.xml
@@ -75,7 +75,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/ibFlipVertically"
         app:layout_constraintTop_toBottomOf="@id/civ"
-        app:srcCompat="@drawable/twotone_aspect_ratio_24"
+        app:srcCompat="@drawable/twotone_open_in_full_24"
         app:tint="?attr/colorAccent" />
 
     <ImageButton