feat: allow changing preferred script from main screen (#11)

* feat: update select script screen to show preferred script and update it

* feat: allow updating preferred script from camera screen

* fix: use preferred script when analyzing image

Author: rohit9625

app/src/main/java/dev/androhit/natively/camera/ui/CameraScreen.kt

@@ -23,6 +23,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -61,15 +62,16 @@ fun CameraScreen(
     cameraController: CameraController,
     viewModel: CameraViewModel,
     onViewImage: () -> Unit = {},
-    script: TextScript? = null,
+    onChangeScript: () -> Unit = {},
 ) {
     val selectedFeature by viewModel.selectedFeature.collectAsStateWithLifecycle()
     val detectedTextLines by viewModel.detectedTextLines.collectAsStateWithLifecycle()
     val translationState by viewModel.translationState.collectAsStateWithLifecycle()
+    val userPrefs by viewModel.userPreferences.collectAsStateWithLifecycle()
 
-    LaunchedEffect(selectedFeature, script) {
+    LaunchedEffect(selectedFeature, userPrefs?.preferredScript) {
         if (selectedFeature == CameraFeature.LiveTranslate) {
-            script?.let { viewModel.updateScript(script) }
+            userPrefs?.preferredScript?.let { viewModel.updateScript(it) }
             viewModel.attachTextAnalyzer()
         }
     }
@@ -139,6 +141,13 @@ fun CameraScreen(
                 }
             }
 
+            ChangeScriptButton(
+                script = userPrefs?.preferredScript ?: TextScript.Latin,
+                onClick = onChangeScript,
+                modifier = Modifier.align(Alignment.TopStart)
+                    .padding(16.dp)
+            )
+
             Column(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
@@ -187,6 +196,37 @@ fun CameraScreen(
     }
 }
 
+@Composable
+fun ChangeScriptButton(
+    script: TextScript,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val symbol = when(script) {
+        TextScript.Latin -> R.drawable.ic_latin_symbol
+        TextScript.Devanagari -> R.drawable.ic_devanagari_symbol
+        TextScript.Chinese -> R.drawable.ic_chinese_symbol
+        TextScript.Japanese -> R.drawable.ic_japanese_symbol
+        TextScript.Korean -> R.drawable.ic_korean_symbol
+    }
+    Surface(
+        modifier = modifier.widthIn(max = 272.dp),
+        shape = CircleShape,
+        color = MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
+        tonalElevation = 6.dp,
+        shadowElevation = 12.dp
+    ) {
+        IconButton(
+            onClick = onClick,
+        ) {
+            Icon(
+                painter = painterResource(symbol),
+                contentDescription = "Change Script",
+            )
+        }
+    }
+}
+
 @Composable
 fun DetectedTextChipsLayer(
     textLines: List<RecognizedText>,

app/src/main/java/dev/androhit/natively/camera/ui/CameraViewModel.kt

@@ -61,6 +61,10 @@ class CameraViewModel(
         viewModelScope.launch { userPrefRepository.updateIsFirstLaunch(firstLaunch) }
     }
 
+    fun updatePreferredScript(script: TextScript) {
+        viewModelScope.launch { userPrefRepository.updatePreferredScript(script) }
+    }
+
     fun onFeatureSelected(feature: CameraFeature) {
         _selectedFeature.value = feature
         _capturedImage.value = null
@@ -127,7 +131,8 @@ class CameraViewModel(
     fun analyzeCapturedImage() {
         _capturedImage.value?.let {
             viewModelScope.launch {
-                val lines = textAnalyzer.analyzeImage(it)
+                val script = userPreferences.value?.preferredScript ?: TextScript.Latin
+                val lines = textAnalyzer.analyzeImage(it, script)
                 _detectedTextLines.value = lines
             }
         }

app/src/main/java/dev/androhit/natively/camera/ui/ScriptSelectionScreen.kt

@@ -97,9 +97,11 @@ val scripts = TextScript.entries.map {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ScriptSelectionScreen(
+    isFirstLaunch: Boolean,
+    script: TextScript,
     onProceed: (TextScript) -> Unit,
 ) {
-    var selectedScript by remember { mutableStateOf<TextScript?>(null) }
+    var selectedScript by remember { mutableStateOf(script) }
     var error by remember { mutableStateOf<Int?>(null) }
 
     Scaffold(
@@ -169,7 +171,10 @@ fun ScriptSelectionScreen(
                     .padding(bottom = 8.dp)
             ) {
                 Text(
-                    text = stringResource(R.string.proceed),
+                    text = stringResource(
+                        if (isFirstLaunch) R.string.proceed
+                        else R.string.update_script
+                    ),
                     style = MaterialTheme.typography.titleMedium
                 )
             }
@@ -233,7 +238,11 @@ private fun ScriptItem(
 @Composable
 fun ScriptSelectionScreenPreview() {
     NativelyTheme(dynamicColor = false) {
-        ScriptSelectionScreen(onProceed = {})
+        ScriptSelectionScreen(
+            isFirstLaunch = false,
+            script = TextScript.Latin,
+            onProceed = {}
+        )
     }
 }
 

app/src/main/java/dev/androhit/natively/navigation/MainNavigation.kt

@@ -25,7 +25,7 @@ fun MainNavigation(modifier: Modifier = Modifier) {
 
     val mainBackStack = rememberNavBackStack(
         if(userPres?.isFirstLaunch ?: false) Route.SelectScript
-        else Route.Camera(userPres?.preferredScript ?: TextScript.Latin)
+        else Route.Camera
     )
 
     NavDisplay(
@@ -42,9 +42,11 @@ fun MainNavigation(modifier: Modifier = Modifier) {
                 CameraScreen(
                     cameraController = cameraController,
                     viewModel = viewModel,
-                    script = it.script,
                     onViewImage = {
                         mainBackStack.add(Route.ViewImage)
+                    },
+                    onChangeScript = {
+                        mainBackStack.add(Route.SelectScript)
                     }
                 )
             }
@@ -59,10 +61,15 @@ fun MainNavigation(modifier: Modifier = Modifier) {
             }
 
             entry<Route.SelectScript> {
-                ScriptSelectionScreen {
-                    viewModel.updateIsFirstLaunch(false)
-                    mainBackStack.add(Route.Camera(it))
-                }
+                ScriptSelectionScreen(
+                    isFirstLaunch = userPres?.isFirstLaunch ?: true,
+                    script = userPres?.preferredScript ?: TextScript.Latin,
+                    onProceed = {
+                        viewModel.updatePreferredScript(it)
+                        viewModel.updateIsFirstLaunch(false)
+                        mainBackStack.add(Route.Camera)
+                    }
+                )
             }
         }
     )

app/src/main/java/dev/androhit/natively/navigation/Route.kt

@@ -11,7 +11,7 @@ sealed interface Route: NavKey {
     data object SelectScript: Route, NavKey
 
     @Serializable
-    data class Camera(val script: TextScript? = null) : Route, NavKey
+    data object Camera : Route, NavKey
 
     @Serializable
     data object ViewImage : Route, NavKey

app/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
     <string name="proceed">Proceed</string>
     <string name="select_script_rationale">Select a script to improve text detection accuracy</string>
     <string name="choose_text_script">Choose Text Script</string>
-
+    <string name="update_script">Update Script</string>
     <string name="languages">Languages</string>
     <string name="latin">Latin</string>
     <string name="devanagari">Devanagari</string>