Update mainOverlay immediately

Since we don't have a concrete position where previewView will appear anymore, we need to ensure that mainOverlay is at the right position and that we hide previewView until it's ready. As a result, I needed to move hiding previewView and showing mainOverlay to the moment where we change the camera configuration. I also needed to make sure that mainOverlay appears at the old y position of previewView. Once that is ready we can simply show previewView once again when we observe StreamingState.STREAMING.

This also has a side effect of fixing a small issue where you could see previewView show a broken image for a frame when swapping between aspect ratios.

Author: t895

app/src/main/java/app/grapheneos/camera/CamConfig.kt

@@ -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 app.grapheneos.camera.util.setBlurBitmapCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.BarcodeFormat
 import java.util.concurrent.ExecutionException
@@ -1049,6 +1050,21 @@ class CamConfig(private val mActivity: MainActivity) {
     fun startCamera(forced: Boolean = false) {
         if ((!forced && camera != null) || cameraProvider == null) return
 
+        // To use the last frame instead of showing a blank screen when
+        // the camera that is being currently used gets unbind
+        mActivity.updateLastFrame()
+
+        if (mActivity.lastFrame != null && mActivity !is CaptureActivity) {
+            setBlurBitmapCompat(mActivity.mainOverlay, mActivity.lastFrame!!)
+            mActivity.settingsIcon.visibility = View.INVISIBLE
+            mActivity.settingsIcon.isEnabled = false
+            mActivity.mainOverlay.visibility = View.VISIBLE
+        }
+        mActivity.previewGrid.visibility = View.INVISIBLE
+        mActivity.mainOverlay.y = mActivity.previewView.y
+        mActivity.mainOverlay.visibility = View.VISIBLE
+        mActivity.previewView.visibility = View.INVISIBLE
+
         mActivity.exposureBar.hidePanel()
         modePref = mActivity.getSharedPreferences(currentMode.name, Context.MODE_PRIVATE)
 
@@ -1086,10 +1102,6 @@ class CamConfig(private val mActivity: MainActivity) {
 
         val builder = ImageCapture.Builder()
 
-        // To use the last frame instead of showing a blank screen when
-        // the camera that is being currently used gets unbind
-        mActivity.updateLastFrame()
-
         // Unbind/close all other camera(s) [if any]
         cameraProvider?.unbindAll()
 

app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt

@@ -93,7 +93,6 @@ import app.grapheneos.camera.util.CameraControl
 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
@@ -131,7 +130,7 @@ open class MainActivity : AppCompatActivity(),
     // is already visible and to dismiss it if the permission gets granted.
     private var cameraPermissionDialog: AlertDialog? = null
     private var audioPermissionDialog: AlertDialog? = null
-    private var lastFrame: Bitmap? = null
+    var lastFrame: Bitmap? = null
 
     private lateinit var mainFrame: View
     lateinit var rootView: View
@@ -649,6 +648,7 @@ open class MainActivity : AppCompatActivity(),
         timerView = binding.timer
         previewView.previewStreamState.observe(this) { state: StreamState ->
             if (state == StreamState.STREAMING) {
+                previewView.visibility = View.VISIBLE
                 mainOverlay.visibility = View.INVISIBLE
                 camConfig.reloadSettings()
                 if (!camConfig.isQRMode) {
@@ -660,15 +660,6 @@ open class MainActivity : AppCompatActivity(),
                 }
 
                 restartRecordingIfPermissionsWasUnavailable()
-            } else {
-                previewGrid.visibility = View.INVISIBLE
-                val lastFrame = lastFrame
-                if (lastFrame != null && this !is CaptureActivity) {
-                    setBlurBitmapCompat(mainOverlay, lastFrame)
-                    settingsIcon.visibility = View.INVISIBLE
-                    settingsIcon.isEnabled = false
-                    mainOverlay.visibility = View.VISIBLE
-                }
             }
         }
         flipCameraCircle = binding.flipCameraCircle