From 2f69942ef4b6cdc4d0b99b8adb8d43a4e90002c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Korczak?= <michal.k2001@gmail.com>
Date: Tue, 31 Dec 2024 12:45:56 +0100
Subject: [PATCH 1/2] fix: buttons rotation

---
 .../fossify/camera/activities/MainActivity.kt | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
index b24034ef..394ba4f9 100644
--- a/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
@@ -644,15 +644,26 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
     private fun animateViews(degrees: Int) = binding.apply {
         val views = arrayOf(
             toggleCamera,
+            layoutTop.toggleTimer,
             layoutTop.toggleFlash,
             layoutTop.changeResolution,
-            shutter,
             layoutTop.settings,
-            lastPhotoVideoPreview
+            lastPhotoVideoPreview,
+            layoutTimer.timerOff,
+            layoutTimer.timer3s,
+            layoutTimer.timer5s,
+            layoutTimer.timer10S,
+            layoutFlash.flashOff,
+            layoutFlash.flashAuto,
+            layoutFlash.flashOn,
+            layoutFlash.flashAlwaysOn
         )
         for (view in views) {
             rotate(view, degrees)
         }
+        mediaSizeToggleGroup?.children?.forEach { child ->
+            rotate(child, degrees)
+        }
     }
 
     private fun rotate(view: View, degrees: Int) =
@@ -832,8 +843,15 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
             onSelect.invoke(index, selectedResolution.buttonViewId != clickedViewId)
         }
 
+        val currentDegrees = when (mLastHandledOrientation) {
+            ORIENT_LANDSCAPE_LEFT -> 90
+            ORIENT_LANDSCAPE_RIGHT -> -90
+            else -> 0
+        }
+
         resolutions.forEach {
             val button = createButton(it, onItemClick)
+            button.rotation = currentDegrees.toFloat()
             mediaSizeToggleGroup.addView(button)
         }
 

From 70bb52ec4766a00a91a074b7fdf259ddcf085d86 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 28 May 2025 18:16:20 +0530
Subject: [PATCH 2/2] fix: add back shutter rotation

---
 .../main/kotlin/org/fossify/camera/activities/MainActivity.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
index 69410621..4b77e826 100644
--- a/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt
@@ -649,6 +649,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
             layoutTop.toggleTimer,
             layoutTop.toggleFlash,
             layoutTop.changeResolution,
+            shutter,
             layoutTop.settings,
             lastPhotoVideoPreview,
             layoutTimer.timerOff,