From 77994d408ea364708793186da52837a3d5d36487 Mon Sep 17 00:00:00 2001
From: darthpaul <paulakhamiogu@gmail.com>
Date: Sun, 28 Aug 2022 02:19:18 +0100
Subject: [PATCH] UI fixes - hiding general settings option when child items
 are hidden - change icon for 1x1 and full screen - remove background tint
 from icons

---
 .../camera/activities/MainActivity.kt         |  6 -----
 .../camera/activities/SettingsActivity.kt     |  3 +++
 app/src/main/res/drawable/ic_photo_1x1.xml    | 26 ++++++++-----------
 app/src/main/res/drawable/ic_photo_full.xml   | 18 ++++++++++---
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/values/styles.xml            |  2 ++
 6 files changed, 32 insertions(+), 24 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 af8098fb..73282337 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -54,7 +54,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
     lateinit var mTimerHandler: Handler
     private lateinit var mOrientationEventListener: OrientationEventListener
     private lateinit var mFocusCircleView: FocusCircleView
-    private lateinit var mFadeHandler: Handler
     private lateinit var mCameraImpl: MyCameraImpl
     private var mPreview: MyPreview? = null
     private var mPreviewUri: Uri? = null
@@ -154,8 +153,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
             return
         }
 
-        mFadeHandler.removeCallbacksAndMessages(null)
-
         hideTimer()
         mOrientationEventListener.disable()
     }
@@ -319,7 +316,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
         view_holder.addView(mFocusCircleView)
 
         mTimerHandler = Handler(Looper.getMainLooper())
-        mFadeHandler = Handler(Looper.getMainLooper())
         setupPreviewImage(true)
 
         val initialFlashlightState = FLASH_OFF
@@ -769,9 +765,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
         val primaryColor = getProperPrimaryColor()
         val states = arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked))
         val iconColors = intArrayOf(ContextCompat.getColor(this, R.color.md_grey_white), primaryColor)
-        val backgroundColors = intArrayOf(ContextCompat.getColor(this, android.R.color.transparent), primaryColor.adjustAlpha(0.1f))
         button.iconTint = ColorStateList(states, iconColors)
-        button.backgroundTintList = ColorStateList(states, backgroundColors)
     }
 
     fun setRecordingState(isRecording: Boolean) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
index 55fe06c8..bcfc674a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -98,6 +98,9 @@ class SettingsActivity : SimpleActivity() {
         settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
         settings_use_english.isChecked = config.useEnglish
 
+        settings_general_settings_holder.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone())
+        settings_general_settings_label.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone())
+
         settings_use_english_holder.setOnClickListener {
             settings_use_english.toggle()
             config.useEnglish = settings_use_english.isChecked
diff --git a/app/src/main/res/drawable/ic_photo_1x1.xml b/app/src/main/res/drawable/ic_photo_1x1.xml
index 3d9a453f..7acddfcd 100644
--- a/app/src/main/res/drawable/ic_photo_1x1.xml
+++ b/app/src/main/res/drawable/ic_photo_1x1.xml
@@ -1,26 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M9,7m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M9,11m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
     <path
         android:fillColor="@color/camera_option_color"
         android:fillType="evenOdd"
-        android:pathData="M6.436,18.011V21.072C6.436,21.099 6.446,21.125 6.465,21.144C6.484,21.164 6.51,21.174 6.537,21.174H18.694C18.721,21.174 18.746,21.164 18.765,21.144C18.784,21.125 18.795,21.099 18.795,21.072V18.011H20.615V21.072C20.615,21.587 20.413,22.08 20.053,22.443C19.692,22.807 19.203,23.011 18.694,23.011H6.537C6.027,23.011 5.539,22.807 5.178,22.443C4.818,22.08 4.615,21.587 4.615,21.072V18.011H6.436Z" />
+        android:pathData="M2,0C0.895,0 0,0.895 0,2V5H2V2L16,2V5H18V2C18,0.895 17.105,0 16,0H2ZM18,13H16V16H2V13H0V16C0,17.105 0.895,18 2,18H16C17.105,18 18,17.105 18,16V13Z" />
     <path
         android:fillColor="@color/camera_option_color"
-        android:fillType="evenOdd"
-        android:pathData="M18.484,6.02L18.488,2.958C18.488,2.931 18.477,2.905 18.458,2.886C18.439,2.867 18.414,2.856 18.387,2.856L6.23,2.839C6.203,2.839 6.178,2.85 6.159,2.869C6.14,2.888 6.129,2.914 6.129,2.941L6.125,6.002L4.305,6L4.308,2.938C4.309,2.424 4.512,1.931 4.873,1.568C5.234,1.205 5.723,1.002 6.232,1.002L18.389,1.019C18.899,1.02 19.387,1.225 19.747,1.589C20.107,1.953 20.309,2.447 20.308,2.961L20.305,6.022L18.484,6.02Z" />
+        android:pathData="M15,12H13.13V9.033C13.13,8.978 13.13,8.878 13.13,8.733C13.13,8.585 13.132,8.423 13.135,8.245C13.141,8.067 13.149,7.907 13.158,7.765C13.078,7.85 13.002,7.922 12.93,7.982C12.862,8.042 12.795,8.099 12.73,8.15L11.956,8.713L11,7.679L13.34,6H15V12Z" />
     <path
         android:fillColor="@color/camera_option_color"
-        android:pathData="M12.577,11C13.405,11 14.077,10.328 14.077,9.5C14.077,8.672 13.405,8 12.577,8C11.748,8 11.077,8.672 11.077,9.5C11.077,10.328 11.748,11 12.577,11Z" />
-    <path
-        android:fillColor="@color/camera_option_color"
-        android:pathData="M12.577,16C13.405,16 14.077,15.328 14.077,14.5C14.077,13.672 13.405,13 12.577,13C11.748,13 11.077,13.672 11.077,14.5C11.077,15.328 11.748,16 12.577,16Z" />
-    <path
-        android:fillColor="@color/camera_option_color"
-        android:pathData="M8,16H5.663V12.044C5.663,11.971 5.663,11.838 5.663,11.644C5.663,11.447 5.665,11.23 5.669,10.993C5.677,10.756 5.686,10.543 5.698,10.353C5.597,10.466 5.502,10.563 5.413,10.643C5.327,10.723 5.244,10.798 5.162,10.867L4.195,11.617L3,10.238L5.925,8H8V16Z" />
-    <path
-        android:fillColor="@color/camera_option_color"
-        android:pathData="M21,16H18.663V12.044C18.663,11.971 18.663,11.838 18.663,11.644C18.663,11.447 18.665,11.23 18.669,10.993C18.677,10.756 18.687,10.543 18.698,10.353C18.597,10.466 18.502,10.563 18.413,10.643C18.327,10.723 18.244,10.798 18.162,10.867L17.195,11.617L16,10.238L18.925,8H21V16Z" />
+        android:pathData="M6,12H4.131V9.033C4.131,8.978 4.131,8.878 4.131,8.733C4.131,8.585 4.132,8.423 4.135,8.245C4.141,8.067 4.149,7.907 4.159,7.765C4.078,7.85 4.002,7.922 3.93,7.982C3.862,8.042 3.795,8.099 3.73,8.15L2.956,8.713L2,7.679L4.34,6H6V12Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_photo_full.xml b/app/src/main/res/drawable/ic_photo_full.xml
index 48697239..0656868c 100644
--- a/app/src/main/res/drawable/ic_photo_full.xml
+++ b/app/src/main/res/drawable/ic_photo_full.xml
@@ -1,9 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="512"
+    android:viewportHeight="512">
     <path
         android:fillColor="@color/camera_option_color"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z" />
+        android:pathData="M0,0v512h512V0H0zM477.87,477.87H34.13V34.13h443.73V477.87z" />
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M126.53,102.4l72.58,0l0,-34.13l-130.84,0l0,130.84l34.13,0l0,-72.57l96.02,96.02l24.13,-24.13z" />
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M222.56,313.58l-24.14,-24.14l-96.02,96.02l0,-72.58l-34.13,0l0,130.84l130.84,0l0,-34.13l-72.57,0z" />
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M409.6,312.89l0,72.58l-96.02,-96.02l-24.13,24.13l96.02,96.02l-72.57,0l0,34.13l130.84,0l0,-130.84z" />
+    <path
+        android:fillColor="@color/camera_option_color"
+        android:pathData="M312.89,68.27l0,34.13l72.58,0l-96.02,96.02l24.13,24.13l96.02,-96.02l0,72.57l34.13,0l0,-130.84z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5010b38c..f16dffb2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black"
+    android:animateLayoutChanges="true"
     android:fitsSystemWindows="true">
 
     <androidx.camera.view.PreviewView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 11da72ab..6d847215 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,8 @@
         <item name="iconGravity">textStart</item>
         <item name="cornerRadius">0dp</item>
         <item name="iconSize">@dimen/toggle_icon_size</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+        <item name="android:backgroundTint">@android:color/transparent</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:minWidth">@dimen/icon_size</item>