Move to a mode for toggling portrait

Author: izaak

app/src/main/java/co/stonephone/stonecamera/StoneCameraApp.kt

@@ -5,7 +5,6 @@ package co.stonephone.stonecamera
 
 import android.annotation.SuppressLint
 import android.graphics.Rect
-import android.util.Log
 import androidx.annotation.OptIn
 import androidx.camera.camera2.interop.ExperimentalCamera2Interop
 import androidx.camera.lifecycle.ProcessCameraProvider
@@ -21,16 +20,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FlipCameraAndroid
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -58,8 +51,8 @@ import co.stonephone.stonecamera.plugins.SettingLocation
 import co.stonephone.stonecamera.plugins.SettingsTrayPlugin
 import co.stonephone.stonecamera.plugins.ShutterFlashPlugin
 import co.stonephone.stonecamera.plugins.TapToFocusPlugin
-import co.stonephone.stonecamera.plugins.VolumeControlsPlugin
 import co.stonephone.stonecamera.plugins.VideoModePlugin
+import co.stonephone.stonecamera.plugins.VolumeControlsPlugin
 import co.stonephone.stonecamera.plugins.ZoomBarPlugin
 import co.stonephone.stonecamera.plugins.ZoomBasePlugin
 import co.stonephone.stonecamera.ui.RenderPluginSetting
@@ -71,7 +64,6 @@ import co.stonephone.stonecamera.utils.getAllCamerasInfo
 // Order here is important, they are loaded and initialised in the order they are listed
 // ZoomBar depends on ZoomBase, etc.
 val PLUGINS = listOf(
-    PortraitModePlugin(),
     QRScannerPlugin(),
     ZoomBasePlugin(),
     ZoomBarPlugin(),
@@ -83,6 +75,7 @@ val PLUGINS = listOf(
     ShutterFlashPlugin(),
     VolumeControlsPlugin(),
     PhotoModePlugin(),
+    PortraitModePlugin(),
     VideoModePlugin(),
     SettingsTrayPlugin()
 //    DebugPlugin()

app/src/main/java/co/stonephone/stonecamera/StoneCameraViewModel.kt

@@ -11,15 +11,23 @@ import android.net.Uri
 import android.util.Log
 import android.view.MotionEvent
 import androidx.annotation.OptIn
-import androidx.camera.core.*
+import androidx.camera.core.Camera
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ExperimentalGetImage
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.video.Quality
 import androidx.camera.video.QualitySelector
 import androidx.camera.video.Recorder
 import androidx.camera.video.Recording
 import androidx.camera.video.VideoCapture
 import androidx.camera.view.PreviewView
-import androidx.compose.runtime.*
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModel
@@ -139,7 +147,6 @@ class StoneCameraViewModel(
         recreateUseCases()
     }
 
-
     //--------------------------------------------------------------------------------
     // Public methods to manipulate the above states
     //--------------------------------------------------------------------------------

app/src/main/java/co/stonephone/stonecamera/plugins/IPlugin.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.CompletableDeferred
 
 // PluginUseCase Enum ("photo", "analysis", "video")
 enum class PluginUseCase {
-    PHOTO, PORTRAIT, ANALYSIS, VIDEO
+    PHOTO, ANALYSIS, VIDEO
 }
 
 // Plugin interface definition

app/src/main/java/co/stonephone/stonecamera/plugins/PhotoMode.kt

@@ -23,15 +23,15 @@ import androidx.compose.ui.unit.dp
 import co.stonephone.stonecamera.StoneCameraViewModel
 import co.stonephone.stonecamera.ui.ResponsiveOrientation
 
-class PhotoModePlugin : IPlugin {
+open class PhotoModePlugin : IPlugin {
     override val id: String = "photoMode"
     override val name: String = "Photo Mode"
 
     private lateinit var viewModel: StoneCameraViewModel
 
     // Should Analysis be added by QRScanner instead? Probably doesn't matter for now
     override val modeUseCases: List<PluginUseCase>
-        get() = listOf(PluginUseCase.PHOTO, PluginUseCase.PORTRAIT, PluginUseCase.ANALYSIS, PluginUseCase.VIDEO)
+        get() = listOf(PluginUseCase.PHOTO, PluginUseCase.ANALYSIS, PluginUseCase.VIDEO)
 
     override val modeLabel
         get() = "photo"

app/src/main/java/co/stonephone/stonecamera/plugins/Portrait.kt renamed to app/src/main/java/co/stonephone/stonecamera/plugins/PortraitMode.kt

@@ -4,10 +4,10 @@ import android.content.ContentResolver
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
-import android.media.ExifInterface
 import android.net.Uri
 import android.util.Log
 import androidx.camera.core.ImageCapture
+import androidx.exifinterface.media.ExifInterface
 import co.stonephone.stonecamera.MyApplication
 import co.stonephone.stonecamera.StoneCameraViewModel
 import com.google.mediapipe.framework.image.BitmapImageBuilder
@@ -21,17 +21,20 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.nio.ByteBuffer
-import java.util.Objects
 import kotlin.math.max
 import kotlin.math.min
 
-class PortraitModePlugin : IPlugin {
-    override val id: String = "portraitModePlugin"
+class PortraitModePlugin : PhotoModePlugin() {
+    override val id: String = "portraitMode"
     override val name: String = "Portrait Mode"
 
     private val logTag: String = "PortraitMode"
 
-    private var imagesegmenter: ImageSegmenter? = null
+    override val modeLabel
+        get() = "portrait"
+
+    private var imageSegmenter: ImageSegmenter? = null
+    private lateinit var viewModel: StoneCameraViewModel
 
     init {
         setupImageSegmenter()
@@ -45,9 +48,9 @@ class PortraitModePlugin : IPlugin {
         stoneCameraViewModel: StoneCameraViewModel,
         outputFileResults: ImageCapture.OutputFileResults
     ) {
-        val portraitModeSetting = stoneCameraViewModel.getSetting<String>("portraitMode") ?: "OFF"
 
-        if (Objects.equals(portraitModeSetting, "OFF")) {
+        //TODO: This kind of check should probably be built into the plugin interface, something reusable
+        if (viewModel.selectedMode == modeLabel) {
             return
         }
 
@@ -60,7 +63,7 @@ class PortraitModePlugin : IPlugin {
             val rotation: Int = getOriginalImageRotation(contentResolver, originalImageUri)
 
             val segmentationResults: ImageSegmenterResult =
-                imagesegmenter?.segment(BitmapImageBuilder(originalImage).build())
+                imageSegmenter?.segment(BitmapImageBuilder(originalImage).build())
                     ?: return@launch
 
             // TODO try and use the confidence mask. Will give floats in range 0 => 1. Apply blur on a percent of the confidence.
@@ -278,7 +281,7 @@ class PortraitModePlugin : IPlugin {
                 .setOutputConfidenceMasks(true)
 
             val options = optionsBuilder.build()
-            imagesegmenter = ImageSegmenter.createFromOptions(MyApplication.getAppContext(), options)
+            imageSegmenter = ImageSegmenter.createFromOptions(MyApplication.getAppContext(), options)
         } catch (e: IllegalStateException) {
             Log.e(logTag, "Image segmenter failed to load model with error: " + e.message)
         } catch (e: RuntimeException) {