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.

Author: t895

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()
     }
 }

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()
         }
     }
 

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()

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)