From 773378430b091f636688d7ccada403b299da0b94 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:09:38 -0500
Subject: [PATCH 01/16] Enable predictive back

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 94558d31c..cb45d3e2d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.App"
+        android:enableOnBackInvokedCallback="true"
         tools:ignore="UnusedAttribute">
 
         <!-- The main activity of the app (supports all modes) -->

From ed3172bd8ce37d14dd5a443e53ff43eb0e4f6ba0 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:10:35 -0500
Subject: [PATCH 02/16] Apply dynamic colors to activities

---
 app/src/main/java/app/grapheneos/camera/App.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/app/grapheneos/camera/App.kt b/app/src/main/java/app/grapheneos/camera/App.kt
index 6a3df84b9..77d2d2999 100644
--- a/app/src/main/java/app/grapheneos/camera/App.kt
+++ b/app/src/main/java/app/grapheneos/camera/App.kt
@@ -11,6 +11,7 @@ import android.view.WindowManager
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
 import app.grapheneos.camera.ui.activities.MainActivity
+import com.google.android.material.color.DynamicColors
 
 class App : Application() {
     private var activity: MainActivity? = null
@@ -91,6 +92,7 @@ class App : Application() {
     override fun onCreate() {
         super.onCreate()
         registerActivityLifecycleCallbacks(activityLifeCycleHelper)
+        DynamicColors.applyToActivitiesIfAvailable(this)
     }
 
     @RequiresPermission(allOf = [Manifest.permission.ACCESS_COARSE_LOCATION])

From 98c01ec23d0c6b59927c48e90703dd2e2c0712c8 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:12:24 -0500
Subject: [PATCH 03/16] Use MaterialAlertDialogBuilder where applicable

---
 .../java/app/grapheneos/camera/CamConfig.kt   | 21 +++++++------
 .../camera/capturer/ImageCapturer.kt          |  6 ++--
 .../camera/ui/activities/InAppGallery.kt      |  9 +++---
 .../camera/ui/activities/MainActivity.kt      | 31 ++++++++-----------
 .../camera/ui/activities/MoreSettings.kt      |  4 +--
 .../res/drawable/qr_result_background.xml     |  2 +-
 .../main/res/layout/scan_result_dialog.xml    |  3 +-
 app/src/main/res/values-night/colors.xml      |  4 ---
 app/src/main/res/values-night/themes.xml      |  7 -----
 app/src/main/res/values/colors.xml            |  2 --
 app/src/main/res/values/themes.xml            |  5 ---
 11 files changed, 36 insertions(+), 58 deletions(-)
 delete mode 100644 app/src/main/res/values-night/colors.xml
 delete mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 784112e37..71c6e573c 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -1,7 +1,6 @@
 package app.grapheneos.camera
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
@@ -16,6 +15,7 @@ import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.widget.Button
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.Camera
 import androidx.camera.core.CameraInfo
@@ -48,6 +48,7 @@ import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
 import app.grapheneos.camera.ui.activities.VideoOnlyActivity
 import app.grapheneos.camera.util.edit
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.BarcodeFormat
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
@@ -1517,7 +1518,7 @@ class CamConfig(private val mActivity: MainActivity) {
         val dialog = builder.create()
 
         dialog.setOnShowListener {
-            val button: Button = (dialog as AlertDialog).getButton(AlertDialog.BUTTON_NEUTRAL)
+            val button: Button = dialog.getButton(AlertDialog.BUTTON_NEUTRAL)
             button.setOnClickListener {
 
             }
@@ -1530,14 +1531,14 @@ class CamConfig(private val mActivity: MainActivity) {
         // Reverting back to DEFAULT_MEDIA_STORE_CAPTURE_PATH
         storageLocation = SettingValues.Default.STORAGE_LOCATION
 
-        val builder = AlertDialog.Builder(mActivity)
-        builder.setTitle(R.string.folder_not_found)
-        builder.setMessage(R.string.reverting_to_default_folder)
-        builder.setPositiveButton(R.string.ok, null)
-        builder.setNeutralButton(R.string.more_settings) { _, _ ->
-            MoreSettings.start(mActivity)
-        }
-        val alertDialog: AlertDialog = builder.create()
+        val builder = MaterialAlertDialogBuilder(mActivity)
+            .setTitle(R.string.folder_not_found)
+            .setMessage(R.string.reverting_to_default_folder)
+            .setPositiveButton(R.string.ok, null)
+            .setNeutralButton(R.string.more_settings) { _, _ ->
+                MoreSettings.start(mActivity)
+            }
+        val alertDialog = builder.create()
         alertDialog.setCancelable(false)
         alertDialog.show()
     }
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
index 791acbda7..4d8d68a40 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
@@ -1,7 +1,6 @@
 package app.grapheneos.camera.capturer
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -23,6 +22,7 @@ import app.grapheneos.camera.R
 import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.util.printStackTraceToString
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 private const val imageFileFormat = ".jpg"
 var isTakingPicture: Boolean = false
@@ -196,7 +196,7 @@ class ImageCapturer(val mActivity: MainActivity) {
     private fun showErrorDialog(message: String, exception: Throwable) {
         val ctx = mActivity
 
-        AlertDialog.Builder(ctx).apply {
+        MaterialAlertDialogBuilder(ctx).apply {
             setMessage(message)
             setPositiveButton(R.string.show_details) { _, _ ->
                 val pkgName = ctx.packageName
@@ -205,7 +205,7 @@ class ImageCapturer(val mActivity: MainActivity) {
                         "\npackage: $pkgName:$pkgVersion" +
                         "\n\n${exception.printStackTraceToString()}"
 
-                AlertDialog.Builder(ctx).apply {
+                MaterialAlertDialogBuilder(ctx).apply {
                     setItems(text.lines().toTypedArray(), null)
                     setNeutralButton(R.string.copy_to_clipboard) { _, _ ->
                         val clipData = ClipData.newPlainText(exception.javaClass.name, text)
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 76f9b501c..6e51938ef 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -40,6 +40,7 @@ import app.grapheneos.camera.databinding.GalleryBinding
 import app.grapheneos.camera.util.getParcelableArrayListExtra
 import app.grapheneos.camera.util.getParcelableExtra
 import app.grapheneos.camera.util.storageLocationToUiString
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -203,7 +204,7 @@ class InAppGallery : AppCompatActivity() {
     private fun deleteCurrentMedia() {
         val curItem = getCurrentItem()
 
-        AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.delete_title)
             .setMessage(getString(R.string.delete_description, curItem.uiName()))
             .setPositiveButton(R.string.delete) { _, _ ->
@@ -293,10 +294,8 @@ class InAppGallery : AppCompatActivity() {
         }
 
 
-        val alertDialog: AlertDialog.Builder =
-            AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
-
-        alertDialog.setTitle(getString(R.string.file_details))
+        val alertDialog = MaterialAlertDialogBuilder(this)
+            .setTitle(getString(R.string.file_details))
 
         val detailsBuilder = StringBuilder()
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index d94c01d4f..ab57aae2e 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -3,7 +3,6 @@ package app.grapheneos.camera.ui.activities
 import android.Manifest
 import android.animation.Animator
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -11,7 +10,6 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.database.ContentObserver
 import android.graphics.Bitmap
 import android.graphics.ImageDecoder
 import android.graphics.Point
@@ -51,6 +49,7 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.FocusMeteringAction
 import androidx.camera.core.MeteringPointFactory
@@ -94,6 +93,7 @@ import app.grapheneos.camera.util.ImageResizer
 import app.grapheneos.camera.util.executeIfAlive
 import app.grapheneos.camera.util.resolveActivity
 import app.grapheneos.camera.util.setBlurBitmapCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
@@ -305,10 +305,9 @@ open class MainActivity : AppCompatActivity(),
     }
 
     private fun showAudioPermissionDeniedDialog(onDisableAudio: () -> Unit = {}) {
-        val builder =
-            AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
-        builder.setTitle(R.string.audio_permission_dialog_title)
-        builder.setMessage(R.string.audio_permission_dialog_message)
+        val builder = MaterialAlertDialogBuilder(this)
+            .setTitle(R.string.audio_permission_dialog_title)
+            .setMessage(R.string.audio_permission_dialog_message)
 
         // Open the settings menu for the current app
         builder.setPositiveButton(R.string.settings) { _: DialogInterface?, _: Int ->
@@ -446,10 +445,9 @@ open class MainActivity : AppCompatActivity(),
 
                 // Don't build and show a new dialog if it's already visible
                 if (cameraPermissionDialog != null && cameraPermissionDialog!!.isShowing) return
-                val builder =
-                    AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
-                builder.setTitle(R.string.camera_permission_dialog_title)
-                builder.setMessage(R.string.camera_permission_dialog_message)
+                val builder = MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.camera_permission_dialog_title)
+                    .setMessage(R.string.camera_permission_dialog_message)
                 val positiveClicked = AtomicBoolean(false)
 
                 // Open the settings menu for the current app
@@ -1088,8 +1086,6 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
-    private lateinit var dialog: Dialog
-
     open fun bytesToHex(bytes: ByteArray): String {
         if (bytes.isEmpty()) return "" // outLen will be wrong for empty inputs
 
@@ -1137,10 +1133,9 @@ open class MainActivity : AppCompatActivity(),
         )
 
         runOnUiThread {
-            dialog = Dialog(this, R.style.Theme_Dialog)
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+            val builder = MaterialAlertDialogBuilder(this)
             val dialogBinding = ScanResultDialogBinding.inflate(layoutInflater)
-            dialog.setContentView(dialogBinding.root)
+            builder.setView(dialogBinding.root)
 
             val tabLayout: TabLayout = dialogBinding.encodingTabs
             val textView = dialogBinding.scanResultText
@@ -1212,14 +1207,14 @@ open class MainActivity : AppCompatActivity(),
                 )
             }
 
-            dialog.setOnDismissListener {
+            builder.setOnDismissListener {
                 isQRDialogShowing = false
                 camConfig.startCamera(true)
             }
 
             camConfig.cameraProvider?.unbindAll()
 
-            dialog.show()
+            builder.show()
         }
     }
 
@@ -1681,7 +1676,7 @@ open class MainActivity : AppCompatActivity(),
             ) && ActivityCompat.shouldShowRequestPermissionRationale(
                 this, Manifest.permission.ACCESS_COARSE_LOCATION
             ) -> {
-                AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert).let {
+                MaterialAlertDialogBuilder(this).let {
                     it.setTitle(R.string.location_permission_dialog_title)
                     it.setMessage(R.string.location_permission_dialog_message)
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index 163a74ffd..3d46a1414 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -14,7 +14,6 @@ import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import app.grapheneos.camera.CamConfig
 import app.grapheneos.camera.CapturedItems
@@ -22,6 +21,7 @@ import app.grapheneos.camera.NumInputFilter
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.MoreSettingsBinding
 import app.grapheneos.camera.util.storageLocationToUiString
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 
 open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
@@ -120,7 +120,7 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
         rSLocation = binding.refreshStorageLocation
         rSLocation.setOnClickListener {
 
-            val dialog = AlertDialog.Builder(this)
+            val dialog = MaterialAlertDialogBuilder(this)
 
             dialog.setTitle(R.string.are_you_sure)
 
diff --git a/app/src/main/res/drawable/qr_result_background.xml b/app/src/main/res/drawable/qr_result_background.xml
index 3fc1cb840..4525b51d6 100644
--- a/app/src/main/res/drawable/qr_result_background.xml
+++ b/app/src/main/res/drawable/qr_result_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/qr_result_background"/>
+    <solid android:color="?attr/colorSurfaceContainer"/>
     <corners android:radius="8dp"/>
 </shape>
diff --git a/app/src/main/res/layout/scan_result_dialog.xml b/app/src/main/res/layout/scan_result_dialog.xml
index 36f097c1d..34fc7afe3 100644
--- a/app/src/main/res/layout/scan_result_dialog.xml
+++ b/app/src/main/res/layout/scan_result_dialog.xml
@@ -66,7 +66,8 @@
         android:id="@+id/encoding_tabs"
         app:tabMode="scrollable"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:backgroundTint="@android:color/transparent" />
 
     <TextView
         android:id="@+id/scan_result_text"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index c543988b0..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="qr_result_background">#2E3133</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 9cf201432..000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme_Dialog" parent="android:Theme.DeviceDefault.Dialog">
-        <item name="android:windowMinWidthMajor">80%</item>
-        <item name="android:windowMinWidthMinor">80%</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 74ec80273..42e214024 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,6 +17,4 @@
     <color name="self_illumination_light">#ffe8cf</color>
 
     <color name="z_yellow">#ffdf00</color>
-
-    <color name="qr_result_background">#E1E3E5</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1b09e8034..172de2d3f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,11 +14,6 @@
         <item name="cornerSize">50%</item>
     </style>
 
-    <style name="Theme_Dialog" parent="android:Theme.DeviceDefault.Light.Dialog">
-        <item name="android:windowMinWidthMajor">80%</item>
-        <item name="android:windowMinWidthMinor">80%</item>
-    </style>
-
     <style name="OverlayActionBar" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowActionBarOverlay">true</item>

From f435354ef5d2359e5df6997b95880a94bfe2f18e Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:33:50 -0500
Subject: [PATCH 04/16] Use tick for haptics

Much finer haptic effect for when you zoom out and balance your camera
---
 .../java/app/grapheneos/camera/ui/activities/InAppGallery.kt   | 2 +-
 .../java/app/grapheneos/camera/ui/activities/MainActivity.kt   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 6e51938ef..355ffa3ba 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -580,7 +580,7 @@ class InAppGallery : AppCompatActivity() {
 
     fun vibrateDevice() {
         val vibrator = getSystemService(Vibrator::class.java)
-        vibrator?.vibrate(VibrationEffect.createOneShot(50, 10))
+        vibrator?.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK))
     }
 
     fun showMessage(msg: String) {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index ab57aae2e..5e3144bc7 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1631,10 +1631,9 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
-    // Vibrates the device for 100 milliseconds.
     private fun vibrateDevice() {
         val vibrator = getSystemService(Vibrator::class.java)
-        vibrator?.vibrate(VibrationEffect.createOneShot(50, 10))
+        vibrator?.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_TICK))
     }
 
     override fun onDestroy() {

From 2cd2f1534a1e00e0ac4bef7bcf6b5e3067c97fbd Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:36:56 -0500
Subject: [PATCH 05/16] Go edge to edge

---
 .../grapheneos/camera/ui/SettingsDialog.kt    |  2 +
 .../grapheneos/camera/ui/ZoomableImageView.kt |  8 +-
 .../camera/ui/activities/InAppGallery.kt      | 87 ++++++++++++++++---
 .../camera/ui/activities/MoreSettings.kt      | 27 +++++-
 .../camera/ui/activities/VideoPlayer.kt       | 67 +++++++++++++-
 app/src/main/res/drawable/shade.xml           |  4 +
 app/src/main/res/layout/activity_main.xml     |  3 +-
 app/src/main/res/layout/gallery.xml           | 12 +++
 app/src/main/res/layout/video_player.xml      |  5 ++
 app/src/main/res/values/dimens.xml            |  4 +-
 app/src/main/res/values/themes.xml            |  4 +-
 11 files changed, 194 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/shade.xml

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index be8649c47..f393de893 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -366,6 +366,8 @@ class SettingsDialog(val mActivity: MainActivity) :
             camConfig.startCamera(true)
         }
 
+        window?.attributes?.layoutInDisplayCutoutMode =
+            WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
         window?.setFlags(
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
diff --git a/app/src/main/java/app/grapheneos/camera/ui/ZoomableImageView.kt b/app/src/main/java/app/grapheneos/camera/ui/ZoomableImageView.kt
index b28280f57..cfe4077d4 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/ZoomableImageView.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/ZoomableImageView.kt
@@ -154,7 +154,7 @@ class ZoomableImageView @JvmOverloads constructor(
     }
 
     private fun onSingleClick() {
-        gActivity.toggleActionBarState()
+        gActivity.toggleUIState()
     }
 
     private fun onDoubleClick(event: MotionEvent) {
@@ -249,7 +249,7 @@ class ZoomableImageView @JvmOverloads constructor(
             scaleAnimator?.cancel()
 
             if (isZoomingDisabled) {
-                gActivity.showActionBar()
+                gActivity.showUI()
             } else {
                 gActivity.gallerySlider.isUserInputEnabled = false
             }
@@ -280,7 +280,7 @@ class ZoomableImageView @JvmOverloads constructor(
         isInZoomMode = true
 
         gActivity.let {
-            it.hideActionBar()
+            it.hideUI()
             it.gallerySlider.isUserInputEnabled = false
         }
     }
@@ -291,7 +291,7 @@ class ZoomableImageView @JvmOverloads constructor(
 
         isInZoomMode = false
 
-        gActivity.showActionBar()
+        gActivity.showUI()
         gActivity.vibrateDevice()
     }
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 355ffa3ba..3be8e5e5a 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -3,7 +3,6 @@ package app.grapheneos.camera.ui.activities
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -11,7 +10,6 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.media.MediaMetadataRetriever
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.VibrationEffect
@@ -24,10 +22,16 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.RelativeLayout
 import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.os.BundleCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.viewpager2.widget.ViewPager2
 import androidxc.exifinterface.media.ExifInterface
 import app.grapheneos.camera.CapturedItem
@@ -68,6 +72,8 @@ class InAppGallery : AppCompatActivity() {
 
     private var lastViewedMediaItem : CapturedItem? = null
 
+    private lateinit var windowInsetsController: WindowInsetsControllerCompat
+
     companion object {
         const val INTENT_KEY_SECURE_MODE = "is_secure_mode"
         const val INTENT_KEY_VIDEO_ONLY_MODE = "video_only_mode"
@@ -388,6 +394,28 @@ class InAppGallery : AppCompatActivity() {
         bgColorAnim.start()
     }
 
+    private fun animateShadeToTransparent() {
+        if (binding.shade.alpha == 0f) {
+            return
+        }
+
+        binding.shade.animate().apply {
+            duration = 300
+            alpha(0f)
+        }
+    }
+
+    private fun animateShadeToOriginal() {
+        if (binding.shade.alpha == 1f) {
+            return
+        }
+
+        binding.shade.animate().apply {
+            duration = 300
+            alpha(1f)
+        }
+    }
+
     private fun shareCurrentMedia() {
         if (isSecureMode) {
             showMessage(getString(R.string.sharing_not_allowed))
@@ -408,6 +436,12 @@ class InAppGallery : AppCompatActivity() {
         isSecureMode = intent.getBooleanExtra(INTENT_KEY_SECURE_MODE, false)
 
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        windowInsetsController = WindowCompat.getInsetsController(window, window.decorView).apply {
+            isAppearanceLightStatusBars = false
+            isAppearanceLightNavigationBars = false
+            show(WindowInsetsCompat.Type.systemBars())
+        }
 
         if (isSecureMode) {
             setShowWhenLocked(true)
@@ -419,7 +453,6 @@ class InAppGallery : AppCompatActivity() {
         setContentView(binding.root)
 
         supportActionBar?.let {
-            it.setBackgroundDrawable(ColorDrawable(ContextCompat.getColor(this, R.color.appbar)))
             it.setDisplayShowTitleEnabled(false)
             it.setDisplayHomeAsUpEnabled(true)
         }
@@ -427,13 +460,20 @@ class InAppGallery : AppCompatActivity() {
         rootView = binding.rootView
         rootView.setOnClickListener {
             if (gallerySliderAdapter != null) {
-                toggleActionBarState()
+                toggleUIState()
             }
         }
 
         gallerySlider = binding.gallerySlider
-        snackBar = Snackbar.make(gallerySlider, "", Snackbar.LENGTH_LONG)
+        snackBar = Snackbar.make(binding.snackbarAnchor, "", Snackbar.LENGTH_LONG)
         gallerySlider.setPageTransformer(GSlideTransformer())
+        ViewCompat.setOnApplyWindowInsetsListener(binding.snackbarAnchor) { view, insets ->
+            val systemBars =
+                insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
+            view.y = -systemBars.bottom.toFloat()
+            snackBar.setAnchorView(view)
+            insets
+        }
 
         if (savedInstanceState != null) {
             lastViewedMediaItem = BundleCompat.getParcelable(savedInstanceState, LAST_VIEWED_ITEM_KEY, CapturedItem::class.java)
@@ -492,10 +532,27 @@ class InAppGallery : AppCompatActivity() {
                         binding.placeholderText.root.visibility = View.VISIBLE
                     }
                 }, 500)
-
-                hideActionBar()
             }
         }
+
+        supportActionBar?.setBackgroundDrawable(null)
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.shade) { view, insets ->
+            val systemBars = insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
+            val actionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height)
+            view.layoutParams =
+                RelativeLayout.LayoutParams(
+                    RelativeLayout.LayoutParams.MATCH_PARENT,
+                    systemBars.top + actionBarHeight
+                )
+            view.background = ContextCompat.getDrawable(this@InAppGallery, R.drawable.shade)
+            insets
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showUI()
     }
 
     fun asyncResultReady(items: ArrayList<CapturedItem>) {
@@ -545,31 +602,35 @@ class InAppGallery : AppCompatActivity() {
             existingAdapter.notifyItemRangeInserted(1, items.size - 1)
         }
         gallerySlider.setCurrentItem(capturedItemPosition, false)
-        showActionBar()
+        showUI()
     }
 
-    fun toggleActionBarState() {
+    fun toggleUIState() {
         supportActionBar?.let {
             if (it.isShowing) {
-                hideActionBar()
+                hideUI()
             } else {
-                showActionBar()
+                showUI()
             }
         }
     }
 
-    fun showActionBar() {
+    fun showUI() {
         supportActionBar?.let {
             it.show()
             animateBackgroundToOriginal()
         }
+        animateShadeToOriginal()
+        windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
     }
 
-    fun hideActionBar() {
+    fun hideUI() {
         supportActionBar?.let {
             it.hide()
             animateBackgroundToBlack()
         }
+        animateShadeToTransparent()
+        windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index 3d46a1414..6583bfadb 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -10,11 +10,15 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
+import android.widget.Button
 import android.widget.EditText
-import android.widget.ImageView
 import android.widget.TextView
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import app.grapheneos.camera.CamConfig
 import app.grapheneos.camera.CapturedItems
 import app.grapheneos.camera.NumInputFilter
@@ -71,6 +75,7 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
 
         val camConfig = obtainCamConfig(intent)
         if (camConfig == null) {
@@ -81,9 +86,6 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
 
         binding = MoreSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setTitle(R.string.more_settings)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        window.navigationBarColor = Color.TRANSPARENT
 
         val showStorageSettings = this !is MoreSettingsSecure
 
@@ -237,6 +239,23 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
         if (!showStorageSettings) {
             binding.storageLocationSettings.visibility = View.GONE
         }
+
+        binding.appBar.setNavigationOnClickListener {
+            finish()
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val cutouts = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+            v.setPadding(cutouts.left, 0, cutouts.right, systemBars.bottom)
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBar) { v, insets ->
+            val cutouts = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+            v.setPadding(cutouts.left, 0, cutouts.right, 0)
+            insets
+        }
     }
 
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
index 11c15428c..bca4ff1a1 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/VideoPlayer.kt
@@ -6,9 +6,15 @@ import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.widget.FrameLayout
 import android.widget.MediaController
+import android.widget.RelativeLayout
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.Lifecycle
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.VideoPlayerBinding
@@ -28,6 +34,13 @@ class VideoPlayer : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+
+        val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        windowInsetsController.isAppearanceLightStatusBars = false
+        windowInsetsController.isAppearanceLightNavigationBars = false
+        windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
+
         val intent = this.intent
         if (intent.getBooleanExtra(IN_SECURE_MODE, false)) {
             setShowWhenLocked(true)
@@ -49,15 +62,31 @@ class VideoPlayer : AppCompatActivity() {
         val mediaController = object : MediaController(this) {
             override fun show() {
                 super.show()
-                supportActionBar?.show()
+                showActionBar()
+                windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
             }
 
             override fun hide() {
                 super.hide()
-                supportActionBar?.hide()
+                hideActionBar()
+                windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
             }
         }
 
+        supportActionBar?.setBackgroundDrawable(null)
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.shade) { view, insets ->
+            val systemBars = insets.getInsetsIgnoringVisibility(WindowInsetsCompat.Type.systemBars())
+            val actionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height)
+            view.layoutParams =
+                FrameLayout.LayoutParams(
+                    RelativeLayout.LayoutParams.MATCH_PARENT,
+                    systemBars.top + actionBarHeight
+                )
+            view.background = ContextCompat.getDrawable(this@VideoPlayer, R.drawable.shade)
+            insets
+        }
+
         thread {
             var hasAudio = true
             try {
@@ -86,7 +115,7 @@ class VideoPlayer : AppCompatActivity() {
                         videoView.start()
                     }
 
-                    supportActionBar?.show()
+                    showActionBar()
                     mediaController.show(0)
                 }
 
@@ -102,6 +131,38 @@ class VideoPlayer : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
+        showActionBar()
+    }
+
+    private fun hideActionBar() {
+        supportActionBar?.hide()
+        animateShadeToTransparent()
+    }
+
+    private fun showActionBar() {
         supportActionBar?.show()
+        animateShadeToOriginal()
+    }
+
+    private fun animateShadeToTransparent() {
+        if (binding.shade.alpha == 0f) {
+            return
+        }
+
+        binding.shade.animate().apply {
+            duration = 300
+            alpha(0f)
+        }
+    }
+
+    private fun animateShadeToOriginal() {
+        if (binding.shade.alpha == 1f) {
+            return
+        }
+
+        binding.shade.animate().apply {
+            duration = 300
+            alpha(1f)
+        }
     }
 }
diff --git a/app/src/main/res/drawable/shade.xml b/app/src/main/res/drawable/shade.xml
new file mode 100644
index 000000000..73f3d75e3
--- /dev/null
+++ b/app/src/main/res/drawable/shade.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/appbar" />
+</shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2c55cf04e..0c524d1a1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -432,8 +432,7 @@
             app:tabIndicatorHeight="30dp"
             android:background="@android:color/transparent"
             android:layout_marginTop="12dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginHorizontal="8dp"/>
+            android:layout_marginBottom="4dp" />
 
         <FrameLayout
             android:layout_height="26dp"
diff --git a/app/src/main/res/layout/gallery.xml b/app/src/main/res/layout/gallery.xml
index 90a7e7f0b..4b61405bb 100644
--- a/app/src/main/res/layout/gallery.xml
+++ b/app/src/main/res/layout/gallery.xml
@@ -16,4 +16,16 @@
         layout="@layout/gallery_placeholder"
         android:id="@+id/placeholder_text"
     />
+
+    <View
+        android:id="@+id/shade"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
+    <View
+        android:id="@+id/snackbar_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_alignParentBottom="true" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/video_player.xml b/app/src/main/res/layout/video_player.xml
index 425d44a35..57593b48a 100644
--- a/app/src/main/res/layout/video_player.xml
+++ b/app/src/main/res/layout/video_player.xml
@@ -12,4 +12,9 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"/>
 
+    <View
+        android:id="@+id/shade"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
 </FrameLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 720a74b62..2bbe41c23 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,4 +15,6 @@
     <dimen name="settings_dialog_menu_item_vertical">8dp</dimen>
 
     <dimen name="settings_dialog_horizontal_margin">12dp</dimen>
-</resources>
\ No newline at end of file
+
+    <dimen name="action_bar_height">60dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 172de2d3f..0af741837 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,8 +5,8 @@
         <item name="colorAccent">@color/selected_option_bg</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
 
-        <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">@android:color/black</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
     <style name="ShapeAppearance.Image.PILL" parent="">

From bc7481c9385cc5771804e64e1ef253cef31287b1 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:39:18 -0500
Subject: [PATCH 06/16] Material3 theming on SettingsDialog

---
 .../grapheneos/camera/ui/SettingsDialog.kt    | 109 +++++++++++++-----
 .../camera/ui/activities/MainActivity.kt      |   4 +-
 app/src/main/res/layout/settings.xml          |  57 +++++----
 app/src/main/res/values/dimens.xml            |   2 +
 app/src/main/res/values/themes.xml            |   5 +
 5 files changed, 123 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index f393de893..98b337582 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.app.Dialog
+import android.content.Context
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Handler
@@ -22,13 +23,11 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.ScrollView
 import android.widget.Spinner
 import android.widget.ToggleButton
 import androidx.annotation.StringRes
-import androidx.appcompat.widget.SwitchCompat
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.DynamicRange
@@ -36,15 +35,21 @@ import androidx.camera.core.ImageCapture
 import androidx.camera.video.Quality
 import androidx.camera.video.Recorder
 import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
 import app.grapheneos.camera.CamConfig
 import app.grapheneos.camera.R
 import app.grapheneos.camera.databinding.SettingsBinding
 import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.MoreSettings
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.materialswitch.MaterialSwitch
+import com.google.android.material.radiobutton.MaterialRadioButton
 import java.util.Collections
+import kotlin.math.max
 
-class SettingsDialog(val mActivity: MainActivity) :
-    Dialog(mActivity, R.style.Theme_App) {
+class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
+    Dialog(themedContext) {
     val camConfig = mActivity.camConfig
 
     private val binding: SettingsBinding by lazy { SettingsBinding.inflate(layoutInflater) }
@@ -63,13 +68,13 @@ class SettingsDialog(val mActivity: MainActivity) :
     var mScrollViewContent: View
 
     var cmRadioGroup: RadioGroup
-    var qRadio: RadioButton
-    var lRadio: RadioButton
+    var qRadio: MaterialRadioButton
+    var lRadio: MaterialRadioButton
 
-    var includeAudioToggle: SwitchCompat
-    var enableEISToggle: SwitchCompat
+    var includeAudioToggle: MaterialSwitch
+    var enableEISToggle: MaterialSwitch
 
-    var selfIlluminationToggle: SwitchCompat
+    var selfIlluminationToggle: MaterialSwitch
 
     private val timeOptions = mActivity.resources.getStringArray(R.array.time_options)
 
@@ -83,7 +88,8 @@ class SettingsDialog(val mActivity: MainActivity) :
 
     private var moreSettingsButton: View
 
-    private val bgBlue = mActivity.getColor(R.color.selected_option_bg)
+    private val tabSelectedColor =
+        MaterialColors.getColor(binding.root, com.google.android.material.R.attr.colorPrimary)
 
     private fun getString(@StringRes id: Int) = mActivity.getString(id)
 
@@ -372,6 +378,18 @@ class SettingsDialog(val mActivity: MainActivity) :
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
         )
+
+        var backgroundColor = ContextCompat.getColor(context, android.R.color.black)
+        backgroundColor = ColorUtils.setAlphaComponent(backgroundColor, 150)
+        val settingsDialogBackgroundDrawable =
+            ContextCompat.getDrawable(context, R.drawable.settings_bg)
+        settingsDialogBackgroundDrawable?.setTint(backgroundColor)
+        binding.settingsDialog.background = settingsDialogBackgroundDrawable
+
+        val moreSettingsBackgroundDrawable =
+            ContextCompat.getDrawable(context, R.drawable.settings_bg)
+        moreSettingsBackgroundDrawable?.setTint(backgroundColor)
+        binding.moreSettings.background = moreSettingsBackgroundDrawable
     }
 
     private fun resize() {
@@ -381,14 +399,26 @@ class SettingsDialog(val mActivity: MainActivity) :
 
                 mScrollViewContent.viewTreeObserver.removeOnGlobalLayoutListener(this)
 
-                val sdHM =
-                    mActivity.resources.getDimension(R.dimen.settings_dialog_horizontal_margin)
-
-                val sH = (mScrollViewContent.width - (sdHM * 8)).toInt()
-
+                val settingsDialogHorizontalMargin =
+                    mActivity.resources.getDimensionPixelSize(R.dimen.settings_dialog_horizontal_margin)
+                val moreSettingsButtonTopPadding =
+                    (8 * mActivity.resources.displayMetrics.density).toInt()
+                val totalDialogHeight = moreSettingsButton.height + moreSettingsButtonTopPadding +
+                        dialog.height
+                val availableWidth = dialog.width - (settingsDialogHorizontalMargin * 4)
+                val availableHeight = availableWidth - (totalDialogHeight - mScrollView.height)
+
+                val height = if (mScrollViewContent.height < mScrollView.height) {
+                    mScrollViewContent.height
+                } else {
+                    max(
+                        mScrollView.height.coerceAtMost(availableHeight),
+                        mScrollViewContent.height.coerceAtMost(availableHeight),
+                    )
+                }
                 val lp = LinearLayout.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    sH.coerceAtMost(mScrollViewContent.height)
+                    height,
                 )
 
                 mScrollView.layoutParams = lp
@@ -497,27 +527,38 @@ class SettingsDialog(val mActivity: MainActivity) :
                 mActivity.previewView.setBackgroundColor(color)
                 mActivity.rootView.setBackgroundColor(color)
                 mActivity.bottomOverlay.setBackgroundColor(color)
-                window?.statusBarColor = color
             }
 
             val colorAnimation2 = ValueAnimator.ofObject(ArgbEvaluator(), Color.WHITE, Color.BLACK)
             colorAnimation2.duration = 300
+
+            val selectedTextColor =
+                MaterialColors.getColor(binding.root, com.google.android.material.R.attr.colorOnPrimary)
+            val colorAnimation3 = ValueAnimator.ofObject(ArgbEvaluator(), selectedTextColor, Color.WHITE)
+            colorAnimation3.duration = 300
+
+            var currentUnselectedColor = Color.WHITE
             colorAnimation2.addUpdateListener { animator ->
+                currentUnselectedColor = animator.animatedValue as Int
+            }
+            colorAnimation3.addUpdateListener { animator ->
                 mActivity.tabLayout.setTabTextColors(
-                    animator.animatedValue as Int,
-                    Color.WHITE
+                    currentUnselectedColor,
+                    animator.animatedValue as Int
                 )
             }
 
-            val colorAnimation3 = ValueAnimator.ofObject(ArgbEvaluator(), bgBlue, Color.BLACK)
-            colorAnimation3.duration = 300
-            colorAnimation3.addUpdateListener { animator ->
+            val colorAnimation4 =
+                ValueAnimator.ofObject(ArgbEvaluator(), tabSelectedColor, Color.BLACK)
+            colorAnimation4.duration = 300
+            colorAnimation4.addUpdateListener { animator ->
                 mActivity.tabLayout.setSelectedTabIndicatorColor(animator.animatedValue as Int)
             }
 
             colorAnimation1.start()
             colorAnimation2.start()
             colorAnimation3.start()
+            colorAnimation4.start()
 
             setBrightness(1f)
 
@@ -533,27 +574,37 @@ class SettingsDialog(val mActivity: MainActivity) :
                 mActivity.previewView.setBackgroundColor(color)
                 mActivity.rootView.setBackgroundColor(color)
                 mActivity.bottomOverlay.setBackgroundColor(color)
-                window?.statusBarColor = color
             }
 
             val colorAnimation2 = ValueAnimator.ofObject(ArgbEvaluator(), Color.BLACK, Color.WHITE)
             colorAnimation2.duration = 300
+
+            val selectedTextColor =
+                MaterialColors.getColor(binding.root, com.google.android.material.R.attr.colorOnPrimary)
+            val colorAnimation3 = ValueAnimator.ofObject(ArgbEvaluator(), Color.WHITE, selectedTextColor)
+            colorAnimation3.duration = 300
+
+            var currentUnselectedTextColor = Color.BLACK
             colorAnimation2.addUpdateListener { animator ->
+                currentUnselectedTextColor = animator.animatedValue as Int
+            }
+            colorAnimation3.addUpdateListener { animator ->
                 mActivity.tabLayout.setTabTextColors(
-                    animator.animatedValue as Int,
-                    Color.WHITE
+                    currentUnselectedTextColor,
+                    animator.animatedValue as Int
                 )
             }
 
-            val colorAnimation3 = ValueAnimator.ofObject(ArgbEvaluator(), Color.BLACK, bgBlue)
-            colorAnimation3.duration = 300
-            colorAnimation3.addUpdateListener { animator ->
+            val colorAnimation4 = ValueAnimator.ofObject(ArgbEvaluator(), Color.BLACK, tabSelectedColor)
+            colorAnimation4.duration = 300
+            colorAnimation4.addUpdateListener { animator ->
                 mActivity.tabLayout.setSelectedTabIndicatorColor(animator.animatedValue as Int)
             }
 
             colorAnimation1.start()
             colorAnimation2.start()
             colorAnimation3.start()
+            colorAnimation4.start()
 
             setBrightness(getSystemBrightness())
         }
@@ -596,7 +647,7 @@ class SettingsDialog(val mActivity: MainActivity) :
             object : Animation.AnimationListener {
 
                 override fun onAnimationStart(p0: Animation?) {
-                    moreSettingsButton.visibility = View.GONE
+                    moreSettingsButton.visibility = View.INVISIBLE
                 }
 
                 override fun onAnimationEnd(p0: Animation?) {
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 5e3144bc7..5cea73805 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -93,6 +93,7 @@ import app.grapheneos.camera.util.ImageResizer
 import app.grapheneos.camera.util.executeIfAlive
 import app.grapheneos.camera.util.resolveActivity
 import app.grapheneos.camera.util.setBlurBitmapCompat
+import com.google.android.material.color.DynamicColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.snackbar.Snackbar
@@ -958,7 +959,8 @@ open class MainActivity : AppCompatActivity(),
         cbText = binding.captureButtonText
         cbCross = binding.captureButtonCross
 
-        settingsDialog = SettingsDialog(this)
+        val themedContext = DynamicColors.wrapContextIfAvailable(this, R.style.Theme_SettingsDialog)
+        settingsDialog = SettingsDialog(this, themedContext)
 
         SystemSettingsObserver(lifecycle,Settings.System.ACCELEROMETER_ROTATION,this) {
             forceUpdateOrientationSensor()
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 8fd79d2a2..c926816e6 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -23,8 +23,7 @@
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/settings_bg"
-            android:paddingVertical="@dimen/settings_dialog_padding_vertical"
+            android:paddingTop="@dimen/settings_dialog_padding_vertical"
             android:layout_marginTop="16dp"
             android:orientation="vertical"
             tools:ignore="UselessParent">
@@ -69,6 +68,7 @@
                         android:textOn="@string/aspect_ratio_16_9"
                         android:textOff="@string/aspect_ratio_4_3"
                         android:textSize="17dp"
+                        android:textColor="?attr/colorOnPrimary"
                         android:checked="false"
                         android:scaleType="centerCrop"
                         android:background="@drawable/aspect_ratio"
@@ -128,13 +128,11 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="4dp"
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:layout_marginHorizontal="@dimen/settings_dialog_padding_horizontal"
-                android:background="@android:color/darker_gray"/>
+                android:layout_height="1dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginHorizontal="@dimen/settings_dialog_padding_horizontal" />
 
             <ScrollView
                 android:id="@+id/settings_scrollview"
@@ -151,10 +149,11 @@
                     <LinearLayout
                         android:id="@+id/self_illumination_setting"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
                         <TextView
                             android:layout_height="wrap_content"
@@ -162,7 +161,7 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/self_illumination"/>
 
-                        <androidx.appcompat.widget.SwitchCompat
+                        <com.google.android.material.materialswitch.MaterialSwitch
                             android:id="@+id/self_illumination_switch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -174,10 +173,11 @@
                     <LinearLayout
                         android:id="@+id/video_quality_setting"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
                         android:layout_gravity="end"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
@@ -207,10 +207,11 @@
                     <LinearLayout
                         android:id="@+id/include_audio_setting"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
                         <TextView
                             android:layout_height="wrap_content"
@@ -218,7 +219,7 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/include_audio"/>
 
-                        <androidx.appcompat.widget.SwitchCompat
+                        <com.google.android.material.materialswitch.MaterialSwitch
                             android:id="@+id/include_audio_switch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -242,7 +243,7 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/enable_eis"/>
 
-                        <androidx.appcompat.widget.SwitchCompat
+                        <com.google.android.material.materialswitch.MaterialSwitch
                             android:id="@+id/enable_eis_switch"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -253,10 +254,11 @@
 
                     <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
                         <TextView
                             android:layout_alignParentStart="true"
@@ -275,7 +277,7 @@
                             android:layout_gravity="center_vertical|end"
                             android:orientation="horizontal">
 
-                            <RadioButton
+                            <com.google.android.material.radiobutton.MaterialRadioButton
                                 android:id="@+id/quality_radio"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -286,7 +288,7 @@
                                 android:layout_width="6dp"
                                 android:layout_height="0dp"/>
 
-                            <RadioButton
+                            <com.google.android.material.radiobutton.MaterialRadioButton
                                 android:id="@+id/latency_radio"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -300,10 +302,11 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
                         android:layout_gravity="end"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
@@ -334,10 +337,11 @@
                     <LinearLayout
                         android:id="@+id/timer_setting"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="@dimen/settings_dialog_menu_item_height"
                         android:paddingVertical="@dimen/settings_dialog_menu_item_vertical"
                         android:paddingHorizontal="@dimen/settings_dialog_menu_item_horizontal"
                         android:layout_gravity="end"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
@@ -365,19 +369,24 @@
                         </FrameLayout>
                     </LinearLayout>
 
+                    <!-- Extra padding for the bottom of the list -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="8dp" />
+
                 </LinearLayout>
+
             </ScrollView>
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/more_settings"
-            android:visibility="gone"
+            android:visibility="invisible"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_below="@id/settings_dialog"
             android:layout_alignParentEnd="true"
-            android:textColor="@color/white"
             android:background="@drawable/settings_bg"
             android:foreground="@drawable/more_settings_bg"
             android:layout_marginEnd="@dimen/settings_dialog_horizontal_margin"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2bbe41c23..33790bed2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,6 +14,8 @@
     <dimen name="settings_dialog_menu_item_horizontal">4dp</dimen>
     <dimen name="settings_dialog_menu_item_vertical">8dp</dimen>
 
+    <dimen name="settings_dialog_menu_item_height">48dp</dimen>
+
     <dimen name="settings_dialog_horizontal_margin">12dp</dimen>
 
     <dimen name="action_bar_height">60dp</dimen>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0af741837..41e4c7a3b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,6 +9,11 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
+    <style name="Theme.SettingsDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
+        <item name="android:windowMinWidthMinor">100%</item>
+        <item name="android:windowMinWidthMajor">100%</item>
+    </style>
+
     <style name="ShapeAppearance.Image.PILL" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>

From dcb9fd131c28e6356fd318cf27cadd9c757f10c8 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:43:38 -0500
Subject: [PATCH 07/16] Material3 theming in MoreSettings

---
 .../camera/ui/activities/MoreSettings.kt      |    2 +-
 app/src/main/res/layout/more_settings.xml     | 1176 +++++++++--------
 2 files changed, 592 insertions(+), 586 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
index 6583bfadb..18b228fbf 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MoreSettings.kt
@@ -36,7 +36,7 @@ open class MoreSettings : AppCompatActivity(), TextView.OnEditorActionListener {
 
     private lateinit var sLField: EditText
 
-    private lateinit var rSLocation: ImageView
+    private lateinit var rSLocation: Button
 
     private lateinit var rootView: View
 
diff --git a/app/src/main/res/layout/more_settings.xml b/app/src/main/res/layout/more_settings.xml
index 92700b1a0..b3412d5b7 100644
--- a/app/src/main/res/layout/more_settings.xml
+++ b/app/src/main/res/layout/more_settings.xml
@@ -1,727 +1,733 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context=".ui.activities.MoreSettings">
 
-    <LinearLayout
-        android:id="@+id/root_view"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            app:title="@string/more_settings"
+            app:navigationIcon="@drawable/back" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingTop="?actionBarSize">
+        android:clipToPadding="false"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-            android:id="@+id/general_settings"
-            android:layout_height="match_parent"
+            android:id="@+id/root_view"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:text="@string/general"
-                android:textColor="?android:colorAccent"
-                android:layout_marginStart="68dp"
-                android:layout_marginVertical="12dp"
-                android:textSize="14sp"
-                android:textStyle="bold"/>
-
             <LinearLayout
-                android:id="@+id/gyroscope_setting"
+                android:id="@+id/general_settings"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:focusable="true"
-                android:clickable="true"
-                android:orientation="horizontal"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp">
-
-                <ImageView
-                    android:id="@+id/gyroscope_setting_icon"
-                    android:src="@drawable/straighten"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/save_image_as_previewed"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/TextAppearance.Material3.LabelLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginVertical="12dp"
+                    android:layout_marginStart="68dp"
+                    android:text="@string/general" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/gyroscope_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/gyroscope_setting_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/save_image_as_previewed"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/straighten" />
 
-                    <TextView
-                        android:id="@+id/gyroscope_setting_title"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/gyroscope_suggestions"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/gyroscope_setting_description"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/gyroscope_setting_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/gyroscope_suggestions"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/gyroscope_setting_description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/gyroscope_setting_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
+
+                    </LinearLayout>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/gyroscope_setting_switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/gyroscope_setting_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/gyroscope_setting_switch"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/camera_sounds_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/camera_sounds_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/camera_sounds"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/volume_up" />
 
-            </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/camera_sounds_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/camera_sounds_icon"
-                    android:src="@drawable/volume_up"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/camera_sounds"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                        <TextView
+                            android:id="@+id/camera_sounds_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/camera_sounds"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/camera_sounds_description"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/camera_sounds_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
 
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/camera_sounds_title"
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/camera_sounds_switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/camera_sounds"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/camera_sounds_description"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/camera_sounds_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/camera_sounds_switch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
-
             </LinearLayout>
 
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/photo_settings"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:text="@string/photo"
-                android:textColor="?android:colorAccent"
-                android:layout_marginStart="68dp"
-                android:layout_marginVertical="12dp"
-                android:textSize="14sp"
-                android:textStyle="bold"/>
-
             <LinearLayout
-                android:id="@+id/zsl_setting"
-                android:visibility="gone"
+                android:id="@+id/photo_settings"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/zsl_icon"
-                    android:src="@drawable/zsl"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/zsl_setting_title"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/TextAppearance.Material3.LabelLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginVertical="12dp"
+                    android:layout_marginStart="68dp"
+                    android:text="@string/photo" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/zsl_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/zsl_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/zsl_setting_title"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/zsl" />
 
-                    <TextView
-                        android:id="@+id/zsl_setting_title"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/zsl_setting_title"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/zsl_setting_subtitle"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/zsl_setting_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/zsl_setting_title"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/zsl_setting_subtitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/zsl_setting_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
+
+                    </LinearLayout>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/zsl_setting_toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/zsl_setting_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/zsl_setting_toggle"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/save_image_as_preview_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/save_image_as_preview_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/save_image_as_previewed"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/selfie_preview" />
 
-            </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/save_image_as_preview_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/save_image_as_preview_icon"
-                    android:src="@drawable/selfie_preview"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/save_image_as_previewed"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                        <TextView
+                            android:id="@+id/save_image_as_preview_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/save_image_as_previewed"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/save_image_as_preview_subtitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/save_as_image_preview_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
 
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/save_image_as_preview_title"
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/save_image_as_preview_toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/save_image_as_previewed"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/save_image_as_preview_subtitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/save_as_image_preview_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/save_image_as_preview_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/photo_quality_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/photo_quality_icon"
-                    android:src="@drawable/image_quality"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/image_quality"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
-
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/photo_quality_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/photo_quality_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/image_quality"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/image_quality" />
 
-                    <TextView
-                        android:id="@+id/photo_quality_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/image_quality"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/photo_quality_subtitle"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/image_quality_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <TextView
+                            android:id="@+id/photo_quality_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/image_quality"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/photo_quality_subtitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/image_quality_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
+                    </LinearLayout>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_height="match_parent"
+                    <LinearLayout
                         android:layout_width="wrap_content"
-                        android:gravity="center"
-                        android:layout_gravity="center"
-                        app:boxBackgroundMode="none"
-                        android:clickable="true"
-                        android:focusableInTouchMode="true">
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
 
                         <EditText
                             android:id="@+id/photo_quality"
                             android:layout_width="36dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="2dp"
-                            android:paddingTop="15dp"
-                            android:textSize="16sp"
-                            android:maxLength="3"
-                            android:labelFor="@id/photo_quality_setting"
-                            android:textAlignment="center"
                             android:layout_gravity="center"
+                            android:layout_marginStart="2dp"
+                            android:clickable="true"
+                            android:focusableInTouchMode="true"
+                            android:imeOptions="actionDone"
                             android:importantForAutofill="no"
                             android:inputType="number"
-                            android:imeOptions="actionDone"/>
+                            android:labelFor="@id/photo_quality_setting"
+                            android:maxLength="3"
+                            android:paddingTop="15dp"
+                            android:textAlignment="center"
+                            android:textSize="16sp" />
 
-                    </com.google.android.material.textfield.TextInputLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginEnd="4dp"
+                            android:paddingTop="16dp"
+                            android:text="@string/percent_symbol"
+                            android:textSize="16sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/percent_symbol"
-                        android:textSize="16sp"
-                        android:paddingTop="16dp"
-                        android:layout_gravity="center"
-                        android:layout_marginEnd="4dp"/>
+                    </LinearLayout>
 
                 </LinearLayout>
 
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/remove_exif_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/remove_exif_icon"
-                    android:src="@drawable/info_adaptable"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/save_image_as_previewed"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
-
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/remove_exif_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/remove_exif_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/save_image_as_previewed"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/info_adaptable" />
 
-                    <TextView
-                        android:id="@+id/remove_exif_title"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/remove_exif_title"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/remove_exif_subtitle"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/remove_exif_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/remove_exif_title"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/remove_exif_subtitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/remove_exif_subtitle"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
+
+                    </LinearLayout>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/remove_exif_toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/remove_exif_subtitle"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/remove_exif_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
-
             </LinearLayout>
 
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/video_settings"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:text="@string/video_setting_title"
-                android:textColor="?android:colorAccent"
-                android:layout_marginStart="68dp"
-                android:layout_marginVertical="12dp"
-                android:textSize="14sp"
-                android:textStyle="bold"/>
-
             <LinearLayout
-                android:id="@+id/save_video_as_preview_setting"
+                android:id="@+id/video_settings"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:id="@+id/save_video_as_preview_icon"
-                    android:src="@drawable/selfie_preview"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/save_video_as_previewed"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/TextAppearance.Material3.LabelLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginVertical="12dp"
+                    android:layout_marginStart="68dp"
+                    android:text="@string/video_setting_title" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/save_video_as_preview_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/save_video_as_preview_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/save_video_as_previewed"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/selfie_preview" />
 
-                    <TextView
-                        android:id="@+id/save_video_as_preview_title"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="@string/save_video_as_previewed"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <TextView
-                        android:id="@+id/save_video_as_preview_subtitle"
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/save_video_as_preview_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/save_video_as_previewed"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/save_video_as_preview_subtitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:text="@string/save_as_video_preview_desc"
+                            android:textSize="14sp"
+                            tools:ignore="RtlSymmetry" />
+
+                    </LinearLayout>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/save_video_as_preview_toggle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/save_as_video_preview_desc"
-                        android:paddingStart="10dp"
-                        android:textSize="14sp"
-                        tools:ignore="RtlSymmetry"/>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginEnd="0dp" />
 
                 </LinearLayout>
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/save_video_as_preview_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="0dp"/>
-
             </LinearLayout>
 
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/storage_location_settings"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:text="@string/storage"
-                android:textColor="?android:colorAccent"
-                android:layout_marginStart="68dp"
-                android:layout_marginVertical="12dp"
-                android:textSize="14sp"
-                android:textStyle="bold"/>
-
             <LinearLayout
-                android:id="@+id/storage_location_setting"
+                android:id="@+id/storage_location_settings"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:focusable="true"
-                android:clickable="true"
-                android:orientation="horizontal"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp">
-
-                <ImageView
-                    android:id="@+id/storage_location_icon"
-                    android:src="@drawable/storage"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/save_image_as_previewed"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="0dp"
+                <TextView
+                    style="@style/TextAppearance.Material3.LabelLarge"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:layout_marginVertical="12dp"
+                    android:layout_marginStart="68dp"
+                    android:text="@string/storage" />
 
-                    <TextView
-                        android:id="@+id/storage_location_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/storage_location"
-                        android:layout_marginStart="10dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
+                <LinearLayout
+                    android:id="@+id/storage_location_setting"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp">
+
+                    <ImageView
+                        android:id="@+id/storage_location_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/save_image_as_previewed"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/storage" />
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-                        <EditText
-                            android:layout_weight="1"
-                            android:id="@+id/storage_location_field"
-                            android:hint="@string/storage_location"
-                            android:layout_width="0dp"
-                            android:cursorVisible="false"
+                        <TextView
+                            android:id="@+id/storage_location_title"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:focusable="false"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:textSize="14sp"
-                            android:drawableStart="@drawable/folder"
-                            android:drawablePadding="6dp"
-                            android:importantForAutofill="no"
-                            android:inputType="textNoSuggestions"/>
+                            android:layout_marginStart="10dp"
+                            android:text="@string/storage_location"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
 
-                        <ImageButton
-                            android:id="@+id/refresh_storage_location"
-                            android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/refresh"
-                            android:layout_gravity="center_vertical"
-                            android:contentDescription="@string/revert_back_to_dcim"/>
+                            android:orientation="horizontal">
+
+                            <EditText
+                                android:id="@+id/storage_location_field"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:cursorVisible="false"
+                                android:drawableStart="@drawable/folder"
+                                android:drawablePadding="6dp"
+                                android:focusable="false"
+                                android:hint="@string/storage_location"
+                                android:importantForAutofill="no"
+                                android:inputType="textNoSuggestions"
+                                android:paddingStart="10dp"
+                                android:paddingEnd="0dp"
+                                android:textSize="14sp" />
+
+                            <Button
+                                android:id="@+id/refresh_storage_location"
+                                style="?attr/materialIconButtonFilledStyle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:contentDescription="@string/revert_back_to_dcim"
+                                app:icon="@drawable/refresh" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
                 </LinearLayout>
 
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/image_format_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:visibility="gone">
-
-                <ImageView
-                    android:id="@+id/image_format_setting_icon"
-                    android:src="@drawable/rename"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/image_file_name_format"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
-
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/image_format_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/image_format_setting_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/image_file_name_format"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/rename" />
 
-                    <TextView
-                        android:id="@+id/image_format_setting_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/image_file_name_format"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <AutoCompleteTextView
-                        android:id="@+id/image_format_setting_field"
-                        android:importantForAutofill="no"
-                        android:inputType="text"
-                        android:labelFor="@id/image_format_setting_title"
-                        android:layout_width="match_parent"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="0dp"
-                        android:textSize="14sp"
-                        android:imeOptions="actionDone"
-                        tools:ignore="LabelFor"/>
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <TextView
+                            android:id="@+id/image_format_setting_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/image_file_name_format"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <AutoCompleteTextView
+                            android:id="@+id/image_format_setting_field"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:imeOptions="actionDone"
+                            android:importantForAutofill="no"
+                            android:inputType="text"
+                            android:labelFor="@id/image_format_setting_title"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="0dp"
+                            android:textSize="14sp"
+                            tools:ignore="LabelFor" />
 
-            </LinearLayout>
+                    </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/video_format_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="?android:attr/selectableItemBackground"
-                android:paddingTop="8dp"
-                android:paddingBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="6dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:visibility="gone">
-
-                <ImageView
-                    android:id="@+id/video_format_setting_icon"
-                    android:src="@drawable/rename"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:contentDescription="@string/video_file_name_format"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="8dp"/>
+                </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/video_format_setting"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="4dp"
-                    android:orientation="vertical">
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    android:paddingStart="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="10dp"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/video_format_setting_icon"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:contentDescription="@string/video_file_name_format"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="8dp"
+                        android:src="@drawable/rename" />
 
-                    <TextView
-                        android:id="@+id/video_format_setting_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/video_file_name_format"
-                        android:layout_marginStart="10dp"
-                        android:paddingBottom="2dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="16sp"/>
-
-                    <AutoCompleteTextView
-                        android:id="@+id/video_format_setting_field"
-                        android:layout_width="match_parent"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:labelFor="@id/video_format_setting_title"
-                        android:importantForAutofill="no"
-                        android:inputType="text"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="0dp"
-                        android:textSize="14sp"
-                        android:imeOptions="actionDone"
-                        tools:ignore="LabelFor"/>
+                        android:layout_marginEnd="4dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/video_format_setting_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:paddingBottom="2dp"
+                            android:text="@string/video_file_name_format"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="16sp" />
+
+                        <AutoCompleteTextView
+                            android:id="@+id/video_format_setting_field"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:imeOptions="actionDone"
+                            android:importantForAutofill="no"
+                            android:inputType="text"
+                            android:labelFor="@id/video_format_setting_title"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="0dp"
+                            android:textSize="14sp"
+                            tools:ignore="LabelFor" />
 
+                    </LinearLayout>
                 </LinearLayout>
+
             </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-</ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From 40cc459c53da967fb1595f379317c35587ea3722 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:46:06 -0500
Subject: [PATCH 08/16] Use Material3 base themes

---
 app/src/main/AndroidManifest.xml   |  8 ++++----
 app/src/main/res/values/themes.xml | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb45d3e2d..c6ba6bb4d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -160,28 +160,28 @@
 
         <activity
             android:name=".ui.activities.VideoPlayer"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.Viewer"
             android:taskAffinity=".ui.activities.VideoPlayer"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.InAppGallery"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.Viewer"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.MoreSettings"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.App"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.MoreSettingsSecure"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.App"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:showWhenLocked="true"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41e4c7a3b..1dcaac11a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.App" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorAccent">@color/selected_option_bg</item>
+    <style name="Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
 
         <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -19,7 +18,7 @@
         <item name="cornerSize">50%</item>
     </style>
 
-    <style name="OverlayActionBar" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="Theme.Viewer" parent="Theme.Material3.DayNight">
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActionBar">true</item>
@@ -27,5 +26,15 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="windowActionBar">true</item>
+
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+
+        <item name="android:homeAsUpIndicator">@drawable/back_white</item>
+
+        <item name="actionOverflowButtonStyle">@style/WhiteOverflowButtonStyle</item>
+    </style>
+
+    <style name="WhiteOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@android:color/white</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>

From 925456569e2614d56130bcdbf219989d7fe0989f Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:49:03 -0500
Subject: [PATCH 09/16] Adjust drawables and remove extra colors

Some of the drawables had to be separated into two because some icons need to both be always white and dynamically change.
---
 .../grapheneos/camera/ui/activities/MainActivity.kt    |  2 +-
 app/src/main/res/drawable/aspect_ratio.xml             |  2 +-
 app/src/main/res/drawable/back.xml                     | 10 ++++++++++
 app/src/main/res/drawable/back_white.xml               | 10 ++++++++++
 app/src/main/res/drawable/camera_shutter_normal.xml    |  2 +-
 app/src/main/res/drawable/camera_shutter_pressed.xml   |  2 +-
 app/src/main/res/drawable/delete.xml                   |  2 --
 app/src/main/res/drawable/dropdown.xml                 |  2 +-
 app/src/main/res/drawable/exposure_neg.xml             |  2 +-
 app/src/main/res/drawable/exposure_plus.xml            |  2 +-
 app/src/main/res/drawable/flash_auto.xml               |  2 +-
 app/src/main/res/drawable/flash_auto_circle.xml        |  2 +-
 app/src/main/res/drawable/flash_off.xml                |  2 +-
 app/src/main/res/drawable/flash_off_circle.xml         |  2 +-
 app/src/main/res/drawable/flash_on.xml                 |  4 ++--
 app/src/main/res/drawable/flash_on_circle.xml          |  2 +-
 app/src/main/res/drawable/folder.xml                   |  3 +--
 app/src/main/res/drawable/grid_3x3.xml                 |  1 +
 app/src/main/res/drawable/grid_3x3_circle.xml          |  2 +-
 app/src/main/res/drawable/grid_4x4.xml                 |  3 +--
 app/src/main/res/drawable/grid_4x4_circle.xml          |  2 +-
 app/src/main/res/drawable/grid_goldenratio.xml         |  1 +
 app/src/main/res/drawable/grid_goldenratio_circle.xml  |  2 +-
 app/src/main/res/drawable/grid_off.xml                 |  2 +-
 app/src/main/res/drawable/grid_off_circle.xml          |  2 +-
 app/src/main/res/drawable/image_quality.xml            |  3 +--
 app/src/main/res/drawable/info_adaptable.xml           |  3 +--
 app/src/main/res/drawable/location.xml                 |  4 ++--
 app/src/main/res/drawable/location_off.xml             |  2 +-
 app/src/main/res/drawable/location_on.xml              |  2 +-
 app/src/main/res/drawable/mode_indicator.xml           |  9 +--------
 app/src/main/res/drawable/more.xml                     |  9 +++++++++
 app/src/main/res/drawable/option_circle.xml            |  2 +-
 app/src/main/res/drawable/refresh.xml                  |  3 +--
 app/src/main/res/drawable/retake.xml                   |  2 --
 app/src/main/res/drawable/selfie_preview.xml           |  3 +--
 app/src/main/res/drawable/settings_bg.xml              | 10 +++-------
 app/src/main/res/drawable/settings_normal.xml          |  2 +-
 app/src/main/res/drawable/settings_pressed.xml         |  2 +-
 app/src/main/res/drawable/share.xml                    |  2 +-
 .../res/drawable/{share_grey.xml => share_white.xml}   |  2 +-
 app/src/main/res/drawable/storage.xml                  |  3 +--
 app/src/main/res/drawable/straighten.xml               |  5 ++---
 app/src/main/res/drawable/torch.xml                    |  4 ++--
 app/src/main/res/drawable/torch_off.xml                |  6 ++----
 app/src/main/res/drawable/torch_off_button.xml         | 10 +++++-----
 app/src/main/res/drawable/torch_off_white.xml          | 10 ++++++++++
 app/src/main/res/drawable/torch_on.xml                 |  5 ++---
 app/src/main/res/drawable/torch_on_button.xml          |  8 ++++----
 app/src/main/res/drawable/torch_on_white.xml           | 10 ++++++++++
 app/src/main/res/drawable/volume_up.xml                |  3 +--
 app/src/main/res/drawable/white_option_circle.xml      |  2 +-
 app/src/main/res/drawable/zsl.xml                      |  3 +--
 app/src/main/res/layout/activity_main.xml              | 10 +++++-----
 app/src/main/res/layout/gallery.xml                    |  2 +-
 app/src/main/res/layout/scan_result_dialog.xml         |  5 ++---
 app/src/main/res/layout/video_player.xml               |  6 +++---
 app/src/main/res/menu/gallery.xml                      |  2 +-
 app/src/main/res/values/colors.xml                     |  8 +-------
 59 files changed, 123 insertions(+), 107 deletions(-)
 create mode 100644 app/src/main/res/drawable/back.xml
 create mode 100644 app/src/main/res/drawable/back_white.xml
 create mode 100644 app/src/main/res/drawable/more.xml
 rename app/src/main/res/drawable/{share_grey.xml => share_white.xml} (92%)
 create mode 100644 app/src/main/res/drawable/torch_off_white.xml
 create mode 100644 app/src/main/res/drawable/torch_on_white.xml

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 5cea73805..3c6ca2f91 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1593,7 +1593,7 @@ open class MainActivity : AppCompatActivity(),
                 gLeftDash.setBackgroundResource(R.drawable.white_shadow_rect)
                 gRightDash.setBackgroundResource(R.drawable.white_shadow_rect)
 
-                gAngleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+                gAngleTextView.setTextColor(ContextCompat.getColor(this, android.R.color.white))
             }
 
             val zOffset = (lzAngle / 60) * dp32
diff --git a/app/src/main/res/drawable/aspect_ratio.xml b/app/src/main/res/drawable/aspect_ratio.xml
index 147f3c42b..768477b12 100644
--- a/app/src/main/res/drawable/aspect_ratio.xml
+++ b/app/src/main/res/drawable/aspect_ratio.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/selected_option_bg"/>
+    <solid android:color="?attr/colorPrimary" />
     <size
         android:height="@dimen/toggle_button_size"
         android:width="@dimen/toggle_button_size"/>
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
new file mode 100644
index 000000000..f99fea719
--- /dev/null
+++ b/app/src/main/res/drawable/back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/back_white.xml b/app/src/main/res/drawable/back_white.xml
new file mode 100644
index 000000000..670b59ebe
--- /dev/null
+++ b/app/src/main/res/drawable/back_white.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/camera_shutter_normal.xml b/app/src/main/res/drawable/camera_shutter_normal.xml
index 666b267fc..35489efdc 100644
--- a/app/src/main/res/drawable/camera_shutter_normal.xml
+++ b/app/src/main/res/drawable/camera_shutter_normal.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <stroke
-        android:color="@color/white"
+        android:color="@android:color/white"
         android:width="6dp"/>
 
     <solid
diff --git a/app/src/main/res/drawable/camera_shutter_pressed.xml b/app/src/main/res/drawable/camera_shutter_pressed.xml
index d65b95872..13a220f57 100644
--- a/app/src/main/res/drawable/camera_shutter_pressed.xml
+++ b/app/src/main/res/drawable/camera_shutter_pressed.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <stroke
-        android:color="@color/white"
+        android:color="@android:color/white"
         android:width="6dp"/>
 
     <solid
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index d00f05caa..1ff6ff43a 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -7,8 +7,6 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:strokeColor="@color/black"
-        android:strokeWidth="0.25"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/dropdown.xml b/app/src/main/res/drawable/dropdown.xml
index 0f42a052e..32519d404 100644
--- a/app/src/main/res/drawable/dropdown.xml
+++ b/app/src/main/res/drawable/dropdown.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorOnSurface"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/app/src/main/res/drawable/exposure_neg.xml b/app/src/main/res/drawable/exposure_neg.xml
index 15473672e..dbde23dfc 100644
--- a/app/src/main/res/drawable/exposure_neg.xml
+++ b/app/src/main/res/drawable/exposure_neg.xml
@@ -7,7 +7,7 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:strokeColor="@color/black"
+        android:strokeColor="@android:color/black"
         android:strokeWidth="0.25"
         android:pathData="M19,13H5v-2h14v2z"/>
 
diff --git a/app/src/main/res/drawable/exposure_plus.xml b/app/src/main/res/drawable/exposure_plus.xml
index 90136e96d..aaad104a9 100644
--- a/app/src/main/res/drawable/exposure_plus.xml
+++ b/app/src/main/res/drawable/exposure_plus.xml
@@ -7,7 +7,7 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:strokeColor="@color/black"
+        android:strokeColor="@android:color/black"
         android:strokeWidth="0.25"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/flash_auto.xml b/app/src/main/res/drawable/flash_auto.xml
index f65697266..bbec0b026 100644
--- a/app/src/main/res/drawable/flash_auto.xml
+++ b/app/src/main/res/drawable/flash_auto.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:strokeWidth="0.25" android:strokeColor="@color/black" android:fillColor="@android:color/white" android:pathData="M3,2v12h3v9l7,-12L9,11l4,-9L3,2zM19,2h-2l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L19,2zM16.85,7.65L18,4l1.15,3.65h-2.3z"/>
+    <path android:fillColor="?attr/colorOnPrimary" android:pathData="M3,2v12h3v9l7,-12L9,11l4,-9L3,2zM19,2h-2l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L19,2zM16.85,7.65L18,4l1.15,3.65h-2.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/flash_auto_circle.xml b/app/src/main/res/drawable/flash_auto_circle.xml
index ff7d1cf2e..2242768a4 100644
--- a/app/src/main/res/drawable/flash_auto_circle.xml
+++ b/app/src/main/res/drawable/flash_auto_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorPrimary" />
             <padding
                 android:left="@dimen/toggle_button_padding"
                 android:right="@dimen/toggle_button_padding"
diff --git a/app/src/main/res/drawable/flash_off.xml b/app/src/main/res/drawable/flash_off.xml
index 607d13ce2..e91d62093 100644
--- a/app/src/main/res/drawable/flash_off.xml
+++ b/app/src/main/res/drawable/flash_off.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:strokeWidth="0.25" android:strokeColor="@color/black" android:fillColor="@android:color/white" android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/flash_off_circle.xml b/app/src/main/res/drawable/flash_off_circle.xml
index b7936f2b6..0e1300af9 100644
--- a/app/src/main/res/drawable/flash_off_circle.xml
+++ b/app/src/main/res/drawable/flash_off_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/unselected_option_bg"/>
+            <solid android:color="?attr/colorSurfaceContainer" />
             <padding
                 android:left="@dimen/toggle_button_padding"
                 android:right="@dimen/toggle_button_padding"
diff --git a/app/src/main/res/drawable/flash_on.xml b/app/src/main/res/drawable/flash_on.xml
index 256296d3d..2520bf5ea 100644
--- a/app/src/main/res/drawable/flash_on.xml
+++ b/app/src/main/res/drawable/flash_on.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:strokeWidth="0.25" android:strokeColor="@color/black" android:fillColor="@android:color/white" android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z"/>
+    <path android:fillColor="?attr/colorOnPrimary" android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/flash_on_circle.xml b/app/src/main/res/drawable/flash_on_circle.xml
index 7cf1c3b02..590775ff8 100644
--- a/app/src/main/res/drawable/flash_on_circle.xml
+++ b/app/src/main/res/drawable/flash_on_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorPrimary" />
             <padding
                 android:left="@dimen/toggle_button_padding"
                 android:right="@dimen/toggle_button_padding"
diff --git a/app/src/main/res/drawable/folder.xml b/app/src/main/res/drawable/folder.xml
index 153942ff5..1fa3d2a0d 100644
--- a/app/src/main/res/drawable/folder.xml
+++ b/app/src/main/res/drawable/folder.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/grid_3x3.xml b/app/src/main/res/drawable/grid_3x3.xml
index ba1bd84fe..aba9e643f 100644
--- a/app/src/main/res/drawable/grid_3x3.xml
+++ b/app/src/main/res/drawable/grid_3x3.xml
@@ -3,6 +3,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
+    android:tint="?attr/colorOnPrimary"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
diff --git a/app/src/main/res/drawable/grid_3x3_circle.xml b/app/src/main/res/drawable/grid_3x3_circle.xml
index 34f109d07..9e0a24134 100644
--- a/app/src/main/res/drawable/grid_3x3_circle.xml
+++ b/app/src/main/res/drawable/grid_3x3_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorPrimary" />
             <padding
                 android:left="@dimen/grid_on_toggle_button_padding"
                 android:right="@dimen/grid_on_toggle_button_padding"
diff --git a/app/src/main/res/drawable/grid_4x4.xml b/app/src/main/res/drawable/grid_4x4.xml
index 933a1ab51..fd8632de6 100644
--- a/app/src/main/res/drawable/grid_4x4.xml
+++ b/app/src/main/res/drawable/grid_4x4.xml
@@ -3,8 +3,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
-    android:strokeColor="#FFFFFF"
-    android:strokeWidth="2"
+    android:tint="?attr/colorOnPrimary"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
diff --git a/app/src/main/res/drawable/grid_4x4_circle.xml b/app/src/main/res/drawable/grid_4x4_circle.xml
index 069de5241..2f3453e8c 100644
--- a/app/src/main/res/drawable/grid_4x4_circle.xml
+++ b/app/src/main/res/drawable/grid_4x4_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorPrimary" />
             <padding
                 android:left="@dimen/grid_on_toggle_button_padding"
                 android:right="@dimen/grid_on_toggle_button_padding"
diff --git a/app/src/main/res/drawable/grid_goldenratio.xml b/app/src/main/res/drawable/grid_goldenratio.xml
index 16e72d9f5..2e38cd39f 100644
--- a/app/src/main/res/drawable/grid_goldenratio.xml
+++ b/app/src/main/res/drawable/grid_goldenratio.xml
@@ -3,6 +3,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
+    android:tint="?attr/colorOnPrimary"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
diff --git a/app/src/main/res/drawable/grid_goldenratio_circle.xml b/app/src/main/res/drawable/grid_goldenratio_circle.xml
index 9762fdda4..232e7f3a7 100644
--- a/app/src/main/res/drawable/grid_goldenratio_circle.xml
+++ b/app/src/main/res/drawable/grid_goldenratio_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorPrimary" />
             <padding
                 android:left="@dimen/grid_on_toggle_button_padding"
                 android:right="@dimen/grid_on_toggle_button_padding"
diff --git a/app/src/main/res/drawable/grid_off.xml b/app/src/main/res/drawable/grid_off.xml
index 49e631e58..6b4c17d81 100644
--- a/app/src/main/res/drawable/grid_off.xml
+++ b/app/src/main/res/drawable/grid_off.xml
@@ -6,7 +6,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M8,4v1.45l2,2L10,4h4v4h-3.45l2,2L14,10v1.45l2,2L16,10h4v4h-3.45l2,2L20,16v1.45l2,2L22,4c0,-1.1 -0.9,-2 -2,-2L4.55,2l2,2L8,4zM16,4h4v4h-4L16,4zM1.27,1.27L0,2.55l2,2L2,20c0,1.1 0.9,2 2,2h15.46l2,2 1.27,-1.27L1.27,1.27zM10,12.55L11.45,14L10,14v-1.45zM4,6.55L5.45,8L4,8L4,6.55zM8,20L4,20v-4h4v4zM8,14L4,14v-4h3.45l0.55,0.55L8,14zM14,20h-4v-4h3.45l0.55,0.54L14,20zM16,20v-1.46L17.46,20L16,20z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/grid_off_circle.xml b/app/src/main/res/drawable/grid_off_circle.xml
index 5566f87d0..98c97e15d 100644
--- a/app/src/main/res/drawable/grid_off_circle.xml
+++ b/app/src/main/res/drawable/grid_off_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="center">
         <shape android:shape="oval">
-            <solid android:color="@color/unselected_option_bg"/>
+            <solid android:color="?attr/colorSurfaceContainer" />
             <padding
                 android:left="@dimen/grid_off_toggle_button_padding"
                 android:right="@dimen/grid_off_toggle_button_padding"
diff --git a/app/src/main/res/drawable/image_quality.xml b/app/src/main/res/drawable/image_quality.xml
index 6dfef3552..5903db248 100644
--- a/app/src/main/res/drawable/image_quality.xml
+++ b/app/src/main/res/drawable/image_quality.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM18,14c0,0.55 -0.45,1 -1,1h-0.75v1.5h-1.5L14.75,15L14,15c-0.55,0 -1,-0.45 -1,-1v-4c0,-0.55 0.45,-1 1,-1h3c0.55,0 1,0.45 1,1v4zM14.5,13.5h2v-3h-2v3z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/info_adaptable.xml b/app/src/main/res/drawable/info_adaptable.xml
index 6a5c448b1..82d83c785 100644
--- a/app/src/main/res/drawable/info_adaptable.xml
+++ b/app/src/main/res/drawable/info_adaptable.xml
@@ -1,13 +1,12 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/location.xml b/app/src/main/res/drawable/location.xml
index fe627e973..e3446a9a0 100644
--- a/app/src/main/res/drawable/location.xml
+++ b/app/src/main/res/drawable/location.xml
@@ -4,7 +4,7 @@
         <layer-list>
             <item>
                 <shape android:shape="oval">
-                    <solid android:color="@color/unselected_option_bg"/>
+                    <solid android:color="?attr/colorSurfaceContainer"/>
                     <padding
                         android:left="@dimen/toggle_button_padding"
                         android:right="@dimen/toggle_button_padding"
@@ -20,7 +20,7 @@
         <layer-list>
             <item>
                 <shape android:shape="oval">
-                    <solid android:color="@color/selected_option_bg"/>
+                    <solid android:color="?attr/colorPrimary"/>
                     <padding
                         android:left="@dimen/toggle_button_padding"
                         android:right="@dimen/toggle_button_padding"
diff --git a/app/src/main/res/drawable/location_off.xml b/app/src/main/res/drawable/location_off.xml
index 941126ec0..c9ef297b1 100644
--- a/app/src/main/res/drawable/location_off.xml
+++ b/app/src/main/res/drawable/location_off.xml
@@ -6,7 +6,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/location_on.xml b/app/src/main/res/drawable/location_on.xml
index 8128e2d59..a1555821d 100644
--- a/app/src/main/res/drawable/location_on.xml
+++ b/app/src/main/res/drawable/location_on.xml
@@ -6,7 +6,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorOnPrimary"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/mode_indicator.xml b/app/src/main/res/drawable/mode_indicator.xml
index 289ec37de..51187f77b 100644
--- a/app/src/main/res/drawable/mode_indicator.xml
+++ b/app/src/main/res/drawable/mode_indicator.xml
@@ -4,15 +4,8 @@
     <item
         android:left="-12dp"
         android:right="-12dp">
-
         <shape android:shape="rectangle">
-
-            <solid android:color="@color/white"/>
-            <corners android:radius="27.5dp"/>
-            <stroke
-                android:width="0.5dp"
-                android:color="#fff"/>
-
+            <corners android:radius="27.5dp" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/more.xml b/app/src/main/res/drawable/more.xml
new file mode 100644
index 000000000..b29b2aef5
--- /dev/null
+++ b/app/src/main/res/drawable/more.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/option_circle.xml b/app/src/main/res/drawable/option_circle.xml
index 09ea19ed3..f5e289f2c 100644
--- a/app/src/main/res/drawable/option_circle.xml
+++ b/app/src/main/res/drawable/option_circle.xml
@@ -11,6 +11,6 @@
 
     <stroke
         android:width="2dp"
-        android:color="@color/white"/>
+        android:color="@android:color/white"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/refresh.xml b/app/src/main/res/drawable/refresh.xml
index b064e3c44..6229bd0af 100644
--- a/app/src/main/res/drawable/refresh.xml
+++ b/app/src/main/res/drawable/refresh.xml
@@ -1,12 +1,11 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>
diff --git a/app/src/main/res/drawable/retake.xml b/app/src/main/res/drawable/retake.xml
index d650a69ea..3b9fbd7ad 100644
--- a/app/src/main/res/drawable/retake.xml
+++ b/app/src/main/res/drawable/retake.xml
@@ -7,8 +7,6 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:strokeColor="@color/black"
-        android:strokeWidth="0.25"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/selfie_preview.xml b/app/src/main/res/drawable/selfie_preview.xml
index 548644ef6..076b8a5a3 100644
--- a/app/src/main/res/drawable/selfie_preview.xml
+++ b/app/src/main/res/drawable/selfie_preview.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM12,7c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,19L6,19v-1.4c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1L18,19z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/settings_bg.xml b/app/src/main/res/drawable/settings_bg.xml
index 0af17f3c2..8fdf761d7 100644
--- a/app/src/main/res/drawable/settings_bg.xml
+++ b/app/src/main/res/drawable/settings_bg.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="#99000000"/>
-    <corners android:radius="16dp"/>
-
-</shape>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/src/main/res/drawable/settings_normal.xml b/app/src/main/res/drawable/settings_normal.xml
index 7dd89d53a..f7f14f4ab 100644
--- a/app/src/main/res/drawable/settings_normal.xml
+++ b/app/src/main/res/drawable/settings_normal.xml
@@ -8,7 +8,7 @@
             <padding
                 android:left="8dp"
                 android:right="8dp"/>
-            <solid android:color="@color/unselected_option_bg"/>
+            <solid android:color="?attr/colorSurface"/>
             <corners android:radius="100dp"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/settings_pressed.xml b/app/src/main/res/drawable/settings_pressed.xml
index 8b06fcc50..f0fae8dd7 100644
--- a/app/src/main/res/drawable/settings_pressed.xml
+++ b/app/src/main/res/drawable/settings_pressed.xml
@@ -8,7 +8,7 @@
             <padding
                 android:left="8dp"
                 android:right="8dp"/>
-            <solid android:color="@color/selected_option_bg"/>
+            <solid android:color="?attr/colorSurfaceVariant"/>
             <corners android:radius="100dp"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml
index ed8423f0d..87fe3479f 100644
--- a/app/src/main/res/drawable/share.xml
+++ b/app/src/main/res/drawable/share.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/white"
+      android:fillColor="?attr/colorControlNormal"
       android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/app/src/main/res/drawable/share_grey.xml b/app/src/main/res/drawable/share_white.xml
similarity index 92%
rename from app/src/main/res/drawable/share_grey.xml
rename to app/src/main/res/drawable/share_white.xml
index 13bb17316..88147d8e8 100644
--- a/app/src/main/res/drawable/share_grey.xml
+++ b/app/src/main/res/drawable/share_white.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="?attr/colorControlNormal"
+      android:fillColor="@android:color/white"
       android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/app/src/main/res/drawable/storage.xml b/app/src/main/res/drawable/storage.xml
index fdc32a324..9588f5573 100644
--- a/app/src/main/res/drawable/storage.xml
+++ b/app/src/main/res/drawable/storage.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/straighten.xml b/app/src/main/res/drawable/straighten.xml
index 4f72fbff3..e3b4de3a5 100644
--- a/app/src/main/res/drawable/straighten.xml
+++ b/app/src/main/res/drawable/straighten.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
-        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,8h2v4h2L7,8h2v4h2L11,8h2v4h2L15,8h2v4h2L19,8h2v8z"/>
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,8h2v4h2L7,8h2v4h2L11,8h2v4h2L15,8h2v4h2L19,8h2v8z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/torch.xml b/app/src/main/res/drawable/torch.xml
index 88f7c2597..65f49d77b 100644
--- a/app/src/main/res/drawable/torch.xml
+++ b/app/src/main/res/drawable/torch.xml
@@ -4,7 +4,7 @@
         <layer-list>
             <item>
                 <shape android:shape="oval">
-                    <solid android:color="@color/unselected_option_bg"/>
+                    <solid android:color="?attr/colorSurfaceContainer"/>
                     <padding
                         android:left="@dimen/toggle_button_padding"
                         android:right="@dimen/toggle_button_padding"
@@ -21,7 +21,7 @@
         <layer-list>
             <item>
                 <shape android:shape="oval">
-                    <solid android:color="@color/selected_option_bg"/>
+                    <solid android:color="?attr/colorPrimary"/>
                     <padding
                         android:left="@dimen/toggle_button_padding"
                         android:right="@dimen/toggle_button_padding"
diff --git a/app/src/main/res/drawable/torch_off.xml b/app/src/main/res/drawable/torch_off.xml
index 5f5865791..7c37d0a8c 100644
--- a/app/src/main/res/drawable/torch_off.xml
+++ b/app/src/main/res/drawable/torch_off.xml
@@ -6,9 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:strokeColor="@color/black"
-        android:strokeWidth="0.25"
-        android:fillColor="@android:color/white"
-        android:pathData="M6,14l3,3v7h6v-7l3,-3V9H6V14zM11,1"/>
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M6,14l3,3v7h6v-7l3,-3V9H6V14zM11,1" />
 
 </vector>
diff --git a/app/src/main/res/drawable/torch_off_button.xml b/app/src/main/res/drawable/torch_off_button.xml
index 87d0cb0d4..aa366ee33 100644
--- a/app/src/main/res/drawable/torch_off_button.xml
+++ b/app/src/main/res/drawable/torch_off_button.xml
@@ -9,17 +9,17 @@
         <shape android:shape="oval">
 
             <stroke
-                android:color="@color/white"
-                android:width="4dp"/>
+                android:width="4dp"
+                android:color="@android:color/white" />
             <solid android:color="@android:color/transparent"/>
         </shape>
     </item>
 
 
     <item
-        android:drawable="@drawable/torch_off"
+        android:drawable="@drawable/torch_off_white"
         android:gravity="center"
-        android:height="36dp"
-        android:width="36dp"/>
+        android:width="36dp"
+        android:height="36dp"/>
 
 </layer-list>
diff --git a/app/src/main/res/drawable/torch_off_white.xml b/app/src/main/res/drawable/torch_off_white.xml
new file mode 100644
index 000000000..a819ee184
--- /dev/null
+++ b/app/src/main/res/drawable/torch_off_white.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,14l3,3v7h6v-7l3,-3V9H6V14zM11,1" />
+</vector>
diff --git a/app/src/main/res/drawable/torch_on.xml b/app/src/main/res/drawable/torch_on.xml
index 7fdbb6000..d5cdddeaa 100644
--- a/app/src/main/res/drawable/torch_on.xml
+++ b/app/src/main/res/drawable/torch_on.xml
@@ -4,12 +4,11 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
+    android:tint="?attr/colorOnPrimary"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:strokeColor="@color/black"
-        android:strokeWidth="0.25"
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M6,14l3,3v5h6v-5l3,-3V9H6V14zM11,2h2v3h-2V2zM3.5,5.88l1.41,-1.41l2.12,2.12L5.62,8L3.5,5.88zM16.96,6.59l2.12,-2.12l1.41,1.41L18.38,8L16.96,6.59z"/>
 
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/torch_on_button.xml b/app/src/main/res/drawable/torch_on_button.xml
index 0b67390c5..ccc4d2431 100644
--- a/app/src/main/res/drawable/torch_on_button.xml
+++ b/app/src/main/res/drawable/torch_on_button.xml
@@ -8,7 +8,7 @@
 
         <shape android:shape="oval">
             <stroke
-                android:color="@color/white"
+                android:color="@android:color/white"
                 android:width="4dp"/>
             <solid android:color="@color/unselected_option_bg"/>
         </shape>
@@ -16,9 +16,9 @@
 
 
     <item
-        android:drawable="@drawable/torch_on"
+        android:drawable="@drawable/torch_on_white"
         android:gravity="center"
-        android:height="36dp"
-        android:width="36dp"/>
+        android:width="36dp"
+        android:height="36dp"/>
 
 </layer-list>
diff --git a/app/src/main/res/drawable/torch_on_white.xml b/app/src/main/res/drawable/torch_on_white.xml
new file mode 100644
index 000000000..361c8de9c
--- /dev/null
+++ b/app/src/main/res/drawable/torch_on_white.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,14l3,3v5h6v-5l3,-3V9H6V14zM11,2h2v3h-2V2zM3.5,5.88l1.41,-1.41l2.12,2.12L5.62,8L3.5,5.88zM16.96,6.59l2.12,-2.12l1.41,1.41L18.38,8L16.96,6.59z" />
+</vector>
diff --git a/app/src/main/res/drawable/volume_up.xml b/app/src/main/res/drawable/volume_up.xml
index c8cec25e7..39f8ca901 100644
--- a/app/src/main/res/drawable/volume_up.xml
+++ b/app/src/main/res/drawable/volume_up.xml
@@ -1,13 +1,12 @@
 <vector
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/white_option_circle.xml b/app/src/main/res/drawable/white_option_circle.xml
index 658f26876..1f5978d66 100644
--- a/app/src/main/res/drawable/white_option_circle.xml
+++ b/app/src/main/res/drawable/white_option_circle.xml
@@ -11,6 +11,6 @@
 
     <stroke
         android:width="2dp"
-        android:color="@color/white"/>
+        android:color="@android:color/white"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/zsl.xml b/app/src/main/res/drawable/zsl.xml
index 2b62257c6..d4ada277c 100644
--- a/app/src/main/res/drawable/zsl.xml
+++ b/app/src/main/res/drawable/zsl.xml
@@ -1,13 +1,12 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:tint="?android:textColorPrimary"
     android:viewportHeight="24"
     android:viewportWidth="24"
     android:width="24dp">
 
     <path
-        android:fillColor="?android:textColorPrimary"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M1,5h2v14L1,19zM5,5h2v14L5,19zM22,5L10,5c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L23,6c0,-0.55 -0.45,-1 -1,-1zM11,17l2.5,-3.15L15.29,16l2.5,-3.22L21,17L11,17z"/>
 
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0c524d1a1..03bf16423 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,13 +5,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/black"
     tools:context=".ui.activities.MainActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/root"
-        android:background="@color/default_bg"
         tools:context=".ui.activities.MainActivity">
 
         <FrameLayout
@@ -58,7 +58,7 @@
                     android:id="@+id/bottom_overlay"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:background="@color/default_bg"
+                    android:background="@android:color/black"
                     app:layout_constraintTop_toBottomOf="@id/preview"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
@@ -90,7 +90,7 @@
                         android:shadowDx="1.5"
                         android:shadowDy="1.3"
                         android:shadowRadius="1.6"
-                        android:textColor="@color/white"
+                        android:textColor="@android:color/white"
                         android:textAlignment="center"/>
 
                     <View
@@ -146,7 +146,7 @@
                 android:shadowDx="1.5"
                 android:shadowDy="1.3"
                 android:shadowRadius="1.6"
-                android:textColor="@color/white"/>
+                android:textColor="@android:color/white"/>
 
             <app.grapheneos.camera.ui.CustomGrid
                 android:id="@+id/preview_grid"
@@ -476,7 +476,7 @@
             android:layout_below="@id/three_buttons"
             android:layout_centerHorizontal="true"
             android:visibility="gone"
-            android:textColor="@color/white"
+            android:textColor="@android:color/white"
             android:textSize="16sp"
             android:text="@string/start_value_timer"/>
 
diff --git a/app/src/main/res/layout/gallery.xml b/app/src/main/res/layout/gallery.xml
index 4b61405bb..db514febf 100644
--- a/app/src/main/res/layout/gallery.xml
+++ b/app/src/main/res/layout/gallery.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root_view"
-    android:background="@color/system_neutral1_900"
+    android:background="@android:color/black"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/scan_result_dialog.xml b/app/src/main/res/layout/scan_result_dialog.xml
index 34fc7afe3..5a37639e7 100644
--- a/app/src/main/res/layout/scan_result_dialog.xml
+++ b/app/src/main/res/layout/scan_result_dialog.xml
@@ -5,8 +5,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:padding="18dp"
-    android:theme="@style/Theme_Dialog">
+    android:padding="18dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,7 +45,7 @@
                 android:layout_marginEnd="10dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:id="@+id/share_qr_text"
-                android:src="@drawable/share_grey"
+                android:src="@drawable/share"
                 android:contentDescription="@string/share_qr_text"/>
 
             <ImageButton
diff --git a/app/src/main/res/layout/video_player.xml b/app/src/main/res/layout/video_player.xml
index 57593b48a..e06e22d96 100644
--- a/app/src/main/res/layout/video_player.xml
+++ b/app/src/main/res/layout/video_player.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/system_neutral1_900"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/black"
     tools:context=".ui.activities.VideoPlayer">
 
     <VideoView
         android:id="@+id/video_player"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <View
         android:id="@+id/shade"
diff --git a/app/src/main/res/menu/gallery.xml b/app/src/main/res/menu/gallery.xml
index 56127807e..b7df8f02e 100644
--- a/app/src/main/res/menu/gallery.xml
+++ b/app/src/main/res/menu/gallery.xml
@@ -25,7 +25,7 @@
 
     <item
         android:id="@+id/share_icon"
-        android:icon="@drawable/share"
+        android:icon="@drawable/share_white"
         android:title="@string/share_media"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 42e214024..696617df3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-
     <color name="system_accent1_100">#cbe2ff</color>
-    <color name="system_accent1_500">#1b69c5</color>
 
     <color name="system_neutral1_100">#dde2e9</color>
     <color name="system_neutral1_900">#181c1f</color>
 
-    <color name="default_bg">@color/black</color>
-    <color name="selected_option_bg">@color/system_accent1_500</color>
     <color name="unselected_option_bg">#2d3034</color>
     <color name="appbar">#77000000</color>
 
     <color name="self_illumination_light">#ffe8cf</color>
 
     <color name="z_yellow">#ffdf00</color>
-</resources>
\ No newline at end of file
+</resources>

From a1d537b29397f8854af2e4e7ab5def17bd66daba Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Mon, 4 Nov 2024 23:49:36 -0500
Subject: [PATCH 10/16] Use Material3 theming on mode indicator

---
 app/src/main/res/layout/activity_main.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 03bf16423..79eb338c0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -430,6 +430,8 @@
             app:tabIndicator="@drawable/mode_indicator"
             android:overScrollMode="never"
             app:tabIndicatorHeight="30dp"
+            app:tabTextColor="@android:color/white"
+            app:tabSelectedTextColor="?attr/colorOnPrimary"
             android:background="@android:color/transparent"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="4dp" />

From 63e653b4aa2590c59d6365ee2049ac5c7bf0c79f Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 5 Nov 2024 00:13:18 -0500
Subject: [PATCH 11/16] Adjust padding around settings items

---
 app/src/main/res/layout/more_settings.xml | 43 ++++++++++-------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout/more_settings.xml b/app/src/main/res/layout/more_settings.xml
index b3412d5b7..c3b8117f2 100644
--- a/app/src/main/res/layout/more_settings.xml
+++ b/app/src/main/res/layout/more_settings.xml
@@ -46,7 +46,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginVertical="12dp"
-                    android:layout_marginStart="68dp"
+                    android:layout_marginStart="78dp"
                     android:text="@string/general" />
 
                 <LinearLayout
@@ -57,9 +57,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -74,7 +73,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -116,9 +115,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -133,7 +131,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -180,7 +178,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginVertical="12dp"
-                    android:layout_marginStart="68dp"
+                    android:layout_marginStart="78dp"
                     android:text="@string/photo" />
 
                 <LinearLayout
@@ -251,9 +249,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -268,7 +265,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -310,9 +307,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -327,7 +323,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -395,9 +391,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -412,7 +407,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -459,7 +454,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginVertical="12dp"
-                    android:layout_marginStart="68dp"
+                    android:layout_marginStart="78dp"
                     android:text="@string/video_setting_title" />
 
                 <LinearLayout
@@ -470,9 +465,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -487,7 +481,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 
@@ -534,7 +528,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginVertical="12dp"
-                    android:layout_marginStart="68dp"
+                    android:layout_marginStart="78dp"
                     android:text="@string/storage" />
 
                 <LinearLayout
@@ -545,9 +539,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:orientation="horizontal"
-                    android:paddingStart="10dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="6dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="10dp">
 
                     <ImageView
@@ -562,7 +555,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
 

From 91b4b0589a68fa734a53dd004f35d4db8ab6ad21 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 5 Nov 2024 08:53:51 -0500
Subject: [PATCH 12/16] Target SDK 35

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c15f0f5b6..9e137fb44 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
     defaultConfig {
         applicationId = "app.grapheneos.camera"
         minSdk = 29
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 75
         versionName = versionCode.toString()
         resourceConfigurations.add("en")

From afc77dfbcb6e75ec63061dfd076d3546906705ba Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 5 Nov 2024 14:11:12 -0500
Subject: [PATCH 13/16] Always use dark mode in main activity

---
 app/src/main/AndroidManifest.xml   | 6 ++++--
 app/src/main/res/values/themes.xml | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c6ba6bb4d..e6f770750 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,7 +39,8 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
             android:screenOrientation="nosensor"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Camera">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -72,7 +73,8 @@
             android:screenOrientation="nosensor"
             android:showWhenLocked="true"
             android:excludeFromRecents="true"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Camera">
 
             <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1dcaac11a..fbd01863f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Base application theme. -->
+    <style name="Theme.Camera" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
     <style name="Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
 

From 864426584cbbfe2673e6a65ea569de833ca5e7bb Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Tue, 19 Nov 2024 11:46:00 -0500
Subject: [PATCH 14/16] Fix black navigation bar in camera preview

---
 .../grapheneos/camera/ui/activities/MainActivity.kt    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index 3c6ca2f91..dcac2a9c9 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -204,6 +204,8 @@ open class MainActivity : AppCompatActivity(),
     private lateinit var gLeftDash: View
     private lateinit var gRightDash: View
 
+    private var bottomNavigationBarPadding: Int = 0
+
     val thumbnailLoaderExecutor = Executors.newSingleThreadExecutor()
 
     private val runnable = Runnable {
@@ -905,12 +907,16 @@ open class MainActivity : AppCompatActivity(),
                     insets.left,
                     0,
                     insets.right,
-                    insets.bottom,
+                    0,
                 )
 
                 it
             }
 
+            zoomBarPanel.setPadding(0, 0, 0, insets.bottom)
+            exposureBarPanel.setPadding(0, 0, 0, insets.bottom)
+            bottomNavigationBarPadding = insets.bottom
+
             if (insets.top != 0 && !isInsetSet) {
                 mainFrame.layoutParams =
                     (mainFrame.layoutParams as ViewGroup.MarginLayoutParams).let {
@@ -1045,7 +1051,7 @@ open class MainActivity : AppCompatActivity(),
                                 if (extraHeight169 > 0) {
                                     extraHeight169
                                 } else {
-                                    it.bottomMargin
+                                    bottomNavigationBarPadding
                                 }
                             )
 

From 304695e3be966b0f52085454bac3372dcd9281dc Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 20 Nov 2024 11:33:24 -0500
Subject: [PATCH 15/16] Settings dialog fixes

Shrink material switch and always show scrollbar

In order to shrink the switch and retain the ability to press the negative space between a label and a switch to toggle, I had to pass touch events to the switch from its container.
---
 .../grapheneos/camera/ui/SettingsDialog.kt    | 33 ++++++++----
 app/src/main/res/layout/settings.xml          | 54 ++++++++++++++-----
 app/src/main/res/values/dimens.xml            |  6 ++-
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
index 98b337582..6a310ee71 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
@@ -3,6 +3,7 @@ package app.grapheneos.camera.ui
 import android.Manifest
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.content.pm.PackageManager
@@ -48,6 +49,7 @@ import com.google.android.material.radiobutton.MaterialRadioButton
 import java.util.Collections
 import kotlin.math.max
 
+@SuppressLint("ClickableViewAccessibility")
 class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
     Dialog(themedContext) {
     val camConfig = mActivity.camConfig
@@ -254,8 +256,13 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         }
 
         selfIlluminationToggle = binding.selfIlluminationSwitch
-        selfIlluminationToggle.setOnClickListener {
-            camConfig.selfIlluminate = selfIlluminationToggle.isChecked
+        selfIlluminationToggle.setOnCheckedChangeListener { _, isChecked ->
+            camConfig.selfIlluminate = isChecked
+        }
+        binding.selfIlluminationSwitchContainer.setOnTouchListener { _, event ->
+            event.setLocation(0f, 0f)
+            selfIlluminationToggle.dispatchTouchEvent(event)
+            true
         }
 
         focusTimeoutSpinner = binding.focusTimeoutSpinner
@@ -329,7 +336,7 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
         timerSetting = binding.timerSetting
 
         includeAudioToggle = binding.includeAudioSwitch
-        includeAudioToggle.setOnClickListener {
+        includeAudioToggle.setOnCheckedChangeListener { _, _ ->
             if (mActivity.videoCapturer.isRecording) {
                 if (ActivityCompat.checkSelfPermission(mActivity, Manifest.permission.RECORD_AUDIO)
                     != PackageManager.PERMISSION_GRANTED) {
@@ -339,13 +346,13 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
                     // Ensure the option is visually off
                     includeAudioToggle.isChecked = false
-                    return@setOnClickListener
+                    return@setOnCheckedChangeListener
                 }
 
                 if (!mActivity.videoCapturer.includeAudio) {
                     mActivity.showMessage("Enabling audio while recording is not currently supported when it was disabled at the start")
                     includeAudioToggle.isChecked = false
-                    return@setOnClickListener
+                    return@setOnCheckedChangeListener
                 }
 
                 if  (includeAudioToggle.isChecked) {
@@ -363,14 +370,22 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
 
             camConfig.includeAudio = includeAudioToggle.isChecked
         }
+        binding.includeAudioSwitchContainer.setOnTouchListener { _, event ->
+            event.setLocation(0f, 0f)
+            includeAudioToggle.dispatchTouchEvent(event)
+            true
+        }
 
         enableEISToggle = binding.enableEisSwitch
-        enableEISToggle.setOnClickListener {
-            camConfig.enableEIS = enableEISToggle.isChecked
-        }
-        enableEISToggle.setOnCheckedChangeListener { _, _ ->
+        enableEISToggle.setOnCheckedChangeListener { _, isChecked ->
+            camConfig.enableEIS = isChecked
             camConfig.startCamera(true)
         }
+        binding.enableEisSwitchContainer.setOnTouchListener { _, event ->
+            event.setLocation(0f, 0f)
+            enableEISToggle.dispatchTouchEvent(event)
+            true
+        }
 
         window?.attributes?.layoutInDisplayCutoutMode =
             WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index c926816e6..2a0671f6e 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -137,7 +137,8 @@
             <ScrollView
                 android:id="@+id/settings_scrollview"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content">
+                android:layout_width="wrap_content"
+                android:fadeScrollbars="false">
 
                 <LinearLayout
                     android:id="@+id/settings_scrollview_content"
@@ -161,12 +162,21 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/self_illumination"/>
 
-                        <com.google.android.material.materialswitch.MaterialSwitch
-                            android:id="@+id/self_illumination_switch"
+                        <LinearLayout
+                            android:id="@+id/self_illumination_switch_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:checked="false"
-                            android:layout_gravity="end"/>
+                            android:gravity="end|center_vertical">
+
+                            <com.google.android.material.materialswitch.MaterialSwitch
+                                android:id="@+id/self_illumination_switch"
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/settings_dialog_switch_height"
+                                android:scaleX="@integer/settings_dialog_switch_scale"
+                                android:scaleY="@integer/settings_dialog_switch_scale"
+                                android:checked="false"/>
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
@@ -219,12 +229,21 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/include_audio"/>
 
-                        <com.google.android.material.materialswitch.MaterialSwitch
-                            android:id="@+id/include_audio_switch"
+                        <LinearLayout
+                            android:id="@+id/include_audio_switch_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:checked="true"
-                            android:layout_gravity="end"/>
+                            android:gravity="end|center_vertical">
+
+                            <com.google.android.material.materialswitch.MaterialSwitch
+                                android:id="@+id/include_audio_switch"
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/settings_dialog_switch_height"
+                                android:scaleX="@integer/settings_dialog_switch_scale"
+                                android:scaleY="@integer/settings_dialog_switch_scale"
+                                android:checked="true"/>
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
@@ -243,12 +262,21 @@
                             android:layout_gravity="center_vertical"
                             android:text="@string/enable_eis"/>
 
-                        <com.google.android.material.materialswitch.MaterialSwitch
-                            android:id="@+id/enable_eis_switch"
+                        <LinearLayout
+                            android:id="@+id/enable_eis_switch_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:checked="true"
-                            android:layout_gravity="end"/>
+                            android:gravity="end|center_vertical">
+
+                            <com.google.android.material.materialswitch.MaterialSwitch
+                                android:id="@+id/enable_eis_switch"
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/settings_dialog_switch_height"
+                                android:scaleX="@integer/settings_dialog_switch_scale"
+                                android:scaleY="@integer/settings_dialog_switch_scale"
+                                android:checked="true"/>
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 33790bed2..ae532d203 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,9 +14,13 @@
     <dimen name="settings_dialog_menu_item_horizontal">4dp</dimen>
     <dimen name="settings_dialog_menu_item_vertical">8dp</dimen>
 
-    <dimen name="settings_dialog_menu_item_height">48dp</dimen>
+    <dimen name="settings_dialog_menu_item_height">44dp</dimen>
 
     <dimen name="settings_dialog_horizontal_margin">12dp</dimen>
 
     <dimen name="action_bar_height">60dp</dimen>
+
+    <dimen name="settings_dialog_switch_height">24dp</dimen>
+
+    <item name="settings_dialog_switch_scale" format="float" type="integer">0.8</item>
 </resources>

From fa9842e45423da50ff2bb7c6a856bef17bb5a17e Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 20 Nov 2024 12:21:06 -0500
Subject: [PATCH 16/16] Ignore short edges mode for camera screen dialogs

The MaterialAlertDialog appears broken when large, the status bar is hidden, and short edges mode used in the parent window. This tells the dialog to use the default mode to prevent weird layout issues.
---
 .../java/app/grapheneos/camera/CamConfig.kt   |  7 ++---
 .../camera/capturer/ImageCapturer.kt          |  5 ++--
 .../app/grapheneos/camera/ui/DialogUtil.kt    | 27 +++++++++++++++++++
 .../camera/ui/activities/MainActivity.kt      |  9 ++++---
 4 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/app/grapheneos/camera/ui/DialogUtil.kt

diff --git a/app/src/main/java/app/grapheneos/camera/CamConfig.kt b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
index 71c6e573c..291df9746 100644
--- a/app/src/main/java/app/grapheneos/camera/CamConfig.kt
+++ b/app/src/main/java/app/grapheneos/camera/CamConfig.kt
@@ -47,6 +47,7 @@ import app.grapheneos.camera.ui.activities.SecureActivity
 import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
 import app.grapheneos.camera.ui.activities.VideoOnlyActivity
+import app.grapheneos.camera.ui.showIgnoringShortEdgeMode
 import app.grapheneos.camera.util.edit
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.BarcodeFormat
@@ -1450,7 +1451,7 @@ class CamConfig(private val mActivity: MainActivity) {
     }
 
     fun showMoreOptionsForQR() {
-        val builder = AlertDialog.Builder(mActivity)
+        val builder = MaterialAlertDialogBuilder(mActivity)
         builder.setTitle(mActivity.resources.getString(R.string.more_options))
 
         val optionNames = arrayListOf<String>()
@@ -1524,7 +1525,7 @@ class CamConfig(private val mActivity: MainActivity) {
             }
         }
 
-        dialog.show()
+        dialog.showIgnoringShortEdgeMode()
     }
 
     fun onStorageLocationNotFound() {
@@ -1540,6 +1541,6 @@ class CamConfig(private val mActivity: MainActivity) {
             }
         val alertDialog = builder.create()
         alertDialog.setCancelable(false)
-        alertDialog.show()
+        alertDialog.showIgnoringShortEdgeMode()
     }
 }
diff --git a/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt b/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
index 4d8d68a40..4ee56b80d 100644
--- a/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
+++ b/app/src/main/java/app/grapheneos/camera/capturer/ImageCapturer.kt
@@ -21,6 +21,7 @@ import app.grapheneos.camera.CapturedItem
 import app.grapheneos.camera.R
 import app.grapheneos.camera.ui.activities.MainActivity
 import app.grapheneos.camera.ui.activities.SecureMainActivity
+import app.grapheneos.camera.ui.showIgnoringShortEdgeMode
 import app.grapheneos.camera.util.printStackTraceToString
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
@@ -213,10 +214,10 @@ class ImageCapturer(val mActivity: MainActivity) {
                         cm.setPrimaryClip(clipData)
                         ctx.showMessage(R.string.copied_text_to_clipboard)
                     }
-                    show()
+                    showIgnoringShortEdgeMode()
                 }
             }
-            show()
+            showIgnoringShortEdgeMode()
         }
     }
 
diff --git a/app/src/main/java/app/grapheneos/camera/ui/DialogUtil.kt b/app/src/main/java/app/grapheneos/camera/ui/DialogUtil.kt
new file mode 100644
index 000000000..572133669
--- /dev/null
+++ b/app/src/main/java/app/grapheneos/camera/ui/DialogUtil.kt
@@ -0,0 +1,27 @@
+package app.grapheneos.camera.ui
+
+import android.view.WindowManager
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+/**
+ * When in an activity where the status bar is hidden, the window layoutInDisplayCutoutMode
+ * is set to [WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES], and a
+ * material alert dialog is present that is large enough, the layout of the dialog will appear
+ * broken and sometimes will shift randomly. These extensions force the dialog window to ignore
+ * the short edges mode so that it will appear as normal.
+ */
+
+fun AlertDialog.ignoreShortEdges() {
+    window?.attributes?.layoutInDisplayCutoutMode =
+        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+}
+
+fun AlertDialog.showIgnoringShortEdgeMode(): AlertDialog {
+    ignoreShortEdges()
+    show()
+    return this
+}
+
+fun MaterialAlertDialogBuilder.showIgnoringShortEdgeMode(): AlertDialog =
+    this.create().showIgnoringShortEdgeMode()
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
index dcac2a9c9..0465e1d29 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -88,6 +88,7 @@ import app.grapheneos.camera.ui.QRToggle
 import app.grapheneos.camera.ui.SettingsDialog
 import app.grapheneos.camera.ui.seekbar.ExposureBar
 import app.grapheneos.camera.ui.seekbar.ZoomBar
+import app.grapheneos.camera.ui.showIgnoringShortEdgeMode
 import app.grapheneos.camera.util.CameraControl
 import app.grapheneos.camera.util.ImageResizer
 import app.grapheneos.camera.util.executeIfAlive
@@ -329,7 +330,7 @@ open class MainActivity : AppCompatActivity(),
             onDisableAudio()
         }
 
-        audioPermissionDialog = builder.show()
+        audioPermissionDialog = builder.showIgnoringShortEdgeMode()
     }
 
     fun updateLastFrame() {
@@ -474,7 +475,7 @@ open class MainActivity : AppCompatActivity(),
                         finish()
                     }
                 }
-                cameraPermissionDialog = builder.show()
+                cameraPermissionDialog = builder.showIgnoringShortEdgeMode()
             }
 
             // Request for the permission (Android will actually popup the permission
@@ -1222,7 +1223,7 @@ open class MainActivity : AppCompatActivity(),
 
             camConfig.cameraProvider?.unbindAll()
 
-            builder.show()
+            builder.showIgnoringShortEdgeMode()
         }
     }
 
@@ -1703,7 +1704,7 @@ open class MainActivity : AppCompatActivity(),
                             camConfig.requireLocation = false
                         }
                     }
-                }.show()
+                }.showIgnoringShortEdgeMode()
             }
 
             (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)