From c38bab682428b895cf2b9f4f43e289390defde63 Mon Sep 17 00:00:00 2001
From: darthpaul <paulakhamiogu@gmail.com>
Date: Thu, 29 Sep 2022 17:00:57 +0100
Subject: [PATCH] make all top icons Buttons with same height

---
 .../camera/activities/MainActivity.kt         | 20 +++++++++++++++----
 app/src/main/res/layout/layout_top.xml        | 15 ++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index d13f74e2..fab961dc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -402,7 +402,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
             FLASH_ON -> R.drawable.ic_flash_on_vector
             else -> R.drawable.ic_flash_auto_vector
         }
-        toggle_flash.setImageResource(flashDrawable)
+        toggle_flash.icon = AppCompatResources.getDrawable(this, flashDrawable)
         toggle_flash.transitionName = "${getString(R.string.toggle_flash)}$state"
     }
 
@@ -555,8 +555,20 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
     }
 
     private fun hasStorageAndCameraPermissions(): Boolean {
-        return if (mIsInPhotoMode) {
+        return if (mIsInPhotoMode) hasPhotoModePermissions() else hasVideoModePermissions()
+    }
+
+    private fun hasPhotoModePermissions(): Boolean {
+        return if (isTiramisuPlus()) {
+            hasPermission(PERMISSION_READ_MEDIA_IMAGES) && hasPermission(PERMISSION_CAMERA)
+        } else {
             hasPermission(PERMISSION_WRITE_STORAGE) && hasPermission(PERMISSION_CAMERA)
+        }
+    }
+
+    private fun hasVideoModePermissions(): Boolean {
+        return if (isTiramisuPlus()) {
+            hasPermission(PERMISSION_READ_MEDIA_VIDEO) && hasPermission(PERMISSION_CAMERA) && hasPermission(PERMISSION_RECORD_AUDIO)
         } else {
             hasPermission(PERMISSION_WRITE_STORAGE) && hasPermission(PERMISSION_CAMERA) && hasPermission(PERMISSION_RECORD_AUDIO)
         }
@@ -619,7 +631,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
             toggle_flash.beVisible()
         } else {
             toggle_flash.beInvisible()
-            toggle_flash.setImageResource(R.drawable.ic_flash_off_vector)
+            toggle_flash.icon = AppCompatResources.getDrawable(this, R.drawable.ic_flash_off_vector)
             mPreview?.setFlashlightState(FLASH_OFF)
         }
     }
@@ -728,7 +740,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
 
     override fun displaySelectedResolution(resolutionOption: ResolutionOption) {
         val imageRes = resolutionOption.imageDrawableResId
-        change_resolution.setImageResource(imageRes)
+        change_resolution.icon = AppCompatResources.getDrawable(this, imageRes)
         change_resolution.transitionName = "${resolutionOption.buttonViewId}"
     }
 
diff --git a/app/src/main/res/layout/layout_top.xml b/app/src/main/res/layout/layout_top.xml
index 33efc826..a68da3b9 100644
--- a/app/src/main/res/layout/layout_top.xml
+++ b/app/src/main/res/layout/layout_top.xml
@@ -7,22 +7,24 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/toggle_flash"
+        style="@style/Widget.App.Button.OutlineButton.IconOnly"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:contentDescription="@string/toggle_flash"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_flash_off_vector"
+        app:icon="@drawable/ic_flash_off_vector"
         app:layout_constraintEnd_toStartOf="@id/change_resolution"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/change_resolution"
+        style="@style/Widget.App.Button.OutlineButton.IconOnly"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -32,16 +34,17 @@
         app:layout_constraintEnd_toStartOf="@id/settings"
         app:layout_constraintStart_toEndOf="@id/toggle_flash"
         app:layout_constraintTop_toTopOf="@id/toggle_flash"
-        tools:src="@drawable/ic_photo_4x3" />
+        tools:icon="@drawable/ic_photo_4x3" />
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/settings"
+        style="@style/Widget.App.Button.OutlineButton.IconOnly"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:contentDescription="@string/settings"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_settings_cog_vector"
+        app:icon="@drawable/ic_settings_cog_vector"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/change_resolution"
         app:layout_constraintTop_toTopOf="@id/toggle_flash" />