From ec849bef77602c5c21c63697b592daa298091b4f Mon Sep 17 00:00:00 2001
From: Olga Miller <olga.rgb@gmail.com>
Date: Sun, 27 Aug 2023 11:41:50 +0200
Subject: [PATCH] Added "Reset" option (to reset image position, etc.) under
 "Transform Image" menu item, moved "Rotate" option there

---
 .../main/java/om/sstvencoder/CropView.java    | 13 ++++++++++++
 .../java/om/sstvencoder/MainActivity.java     |  5 ++++-
 app/src/main/res/menu/menu_main.xml           | 20 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  4 +++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/om/sstvencoder/CropView.java b/app/src/main/java/om/sstvencoder/CropView.java
index 014ab7b..4ef29b5 100644
--- a/app/src/main/java/om/sstvencoder/CropView.java
+++ b/app/src/main/java/om/sstvencoder/CropView.java
@@ -175,6 +175,19 @@ public class CropView extends AppCompatImageView {
         invalidate();
     }
 
+    public void resetImage() {
+        if (!mImageOK)
+            return;
+        if (mOrientation == 90 || mOrientation == 270) {
+            int tmp = mImageWidth;
+            mImageWidth = mImageHeight;
+            mImageHeight = tmp;
+        }
+        mOrientation = 0;
+        resetInputRect();
+        invalidate();
+    }
+
     public void setNoBitmap() {
         mImageOK = false;
         mOrientation = 0;
diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java
index d3f840e..bf0fb94 100644
--- a/app/src/main/java/om/sstvencoder/MainActivity.java
+++ b/app/src/main/java/om/sstvencoder/MainActivity.java
@@ -332,13 +332,16 @@ public class MainActivity extends AppCompatActivity {
         else if (id == R.id.action_rotate) {
             mCropView.rotateImage(90);
         }
+        else if (id == R.id.action_reset) {
+            mCropView.resetImage();
+        }
         else if (id == R.id.action_privacy_policy) {
             showTextPage(getString(R.string.action_privacy_policy), getString(R.string.action_privacy_policy_text));
         }
         else if (id == R.id.action_about) {
             showTextPage(getString(R.string.action_about), getString(R.string.action_about_text, BuildConfig.VERSION_NAME));
         }
-        else if (id != R.id.action_modes) {
+        else if (id != R.id.action_modes && id != R.id.action_transform) {
             String className = item.getIntent().getStringExtra(CLASS_NAME);
             setMode(className);
         }
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 6749acb..0b18325 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -30,10 +30,22 @@
         android:title="@string/action_save_wave"
         app:showAsAction="ifRoom"/>
     <item
-        android:id="@+id/action_rotate"
-        android:icon="@android:drawable/ic_menu_rotate"
-        android:title="@string/action_rotate"
-        app:showAsAction="ifRoom"/>
+        android:id="@+id/action_transform"
+        android:title="@string/action_transform"
+        app:showAsAction="ifRoom">
+        <menu>
+            <item
+                android:id="@+id/action_rotate"
+                android:icon="@android:drawable/ic_menu_rotate"
+                android:title="@string/action_rotate"
+                app:showAsAction="ifRoom"/>
+            <item
+                android:id="@+id/action_reset"
+                android:icon="@android:drawable/ic_menu_revert"
+                android:title="@string/action_reset"
+                app:showAsAction="ifRoom"/>
+        </menu>
+    </item>
     <item
         android:id="@+id/action_modes"
         android:title="@string/action_modes"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c79a4e6..f5bbf7e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,9 @@
     <string name="action_save_wave">Save as WAVE File</string>
     <string name="action_stop">Stop</string>
     <string name="action_play">Play</string>
-    <string name="action_rotate">Rotate Image</string>
+    <string name="action_transform">Transform Image</string>
+    <string name="action_rotate">Rotate</string>
+    <string name="action_reset">Reset</string>
     <string name="action_done">Done</string>
     <string name="action_modes">Modes</string>
     <string name="action_martin1">Martin 1</string>