From 7cba7db64d3fbc82fe6f83291a0da7703537462c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Korczak?= Date: Wed, 28 May 2025 14:53:10 +0200 Subject: [PATCH] fix: buttons rotation (#41) * fix: buttons rotation * fix: add back shutter rotation --------- Co-authored-by: Naveen Singh <36371707+naveensingh@users.noreply.github.com> Co-authored-by: Naveen Singh --- .../fossify/camera/activities/MainActivity.kt | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 55a16523..4b77e826 100644 --- a/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt @@ -646,15 +646,27 @@ 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) = @@ -834,8 +846,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) }