Code refactor

Author: T8RIN

core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/widget/FilterTemplateAddingGroup.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.ui.utils.content_pickers.rememberFilePicker
-import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberQrCodeScanner
+import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberBarcodeScanner
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedButton
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedIconButton
 import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHostState
@@ -77,7 +77,7 @@ internal fun FilterTemplateAddingGroup(
         onFailure: suspend () -> Unit
     ) = onAddTemplateFilterFromUri(uri, onSuccess, onFailure)
 
-    val scanner = rememberQrCodeScanner {
+    val scanner = rememberBarcodeScanner {
         addTemplateFilterFromString(
             string = it,
             onSuccess = { filterName, filtersCount ->

core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/QrCodeScanner.kt core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/BarcodeScanner.kt

@@ -25,20 +25,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import io.github.g00fy2.quickie.QRResult
 import io.github.g00fy2.quickie.ScanCustomCode
 import io.github.g00fy2.quickie.config.BarcodeFormat
 import io.github.g00fy2.quickie.config.ScannerConfig
-import kotlinx.coroutines.launch
 import ru.tech.imageresizershrinker.core.resources.R
-import ru.tech.imageresizershrinker.core.ui.utils.provider.LocalComponentActivity
-import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHostState
-import ru.tech.imageresizershrinker.core.ui.widget.other.showFailureToast
+import ru.tech.imageresizershrinker.core.ui.utils.provider.rememberLocalEssentials
 
-private class QrCodeScannerImpl(
+private class BarcodeScannerImpl(
     private val scannerLauncher: ManagedActivityResultLauncher<ScannerConfig, QRResult>
-) : QrCodeScanner {
+) : BarcodeScanner {
 
     override fun scan() {
         val config = ScannerConfig.build {
@@ -57,37 +53,26 @@ private class QrCodeScannerImpl(
 
 @Stable
 @Immutable
-interface QrCodeScanner {
+interface BarcodeScanner {
     fun scan()
 }
 
 
 @Composable
-fun rememberQrCodeScanner(
-    onSuccess: (String) -> Unit
-): QrCodeScanner {
-    val scope = rememberCoroutineScope()
-    val toastHostState = LocalToastHostState.current
-    val context = LocalComponentActivity.current
+fun rememberBarcodeScanner(
+    onSuccess: (rawCode: String) -> Unit
+): BarcodeScanner {
+    val essentials = rememberLocalEssentials()
 
     val scannerLauncher = rememberLauncherForActivityResult(ScanCustomCode()) { result ->
         when (result) {
-            is QRResult.QRError -> {
-                scope.launch {
-                    toastHostState.showFailureToast(
-                        context = context,
-                        throwable = result.exception
-                    )
-                }
-            }
+            is QRResult.QRError -> essentials.showFailureToast(result.exception)
 
             QRResult.QRMissingPermission -> {
-                scope.launch {
-                    toastHostState.showToast(
-                        message = context.getString(R.string.grant_camera_permission_to_scan_qr_code),
-                        icon = Icons.Outlined.CameraAlt
-                    )
-                }
+                essentials.showToast(
+                    messageSelector = { getString(R.string.grant_camera_permission_to_scan_qr_code) },
+                    icon = Icons.Outlined.CameraAlt
+                )
             }
 
             is QRResult.QRSuccess -> {
@@ -100,6 +85,6 @@ fun rememberQrCodeScanner(
 
 
     return remember(scannerLauncher) {
-        QrCodeScannerImpl(scannerLauncher)
+        BarcodeScannerImpl(scannerLauncher)
     }
 }

core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/provider/LocalEssentials.kt

@@ -18,6 +18,7 @@
 package ru.tech.imageresizershrinker.core.ui.utils.provider
 
 import android.content.ClipData
+import android.content.Context
 import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.compose.material.icons.Icons
@@ -96,6 +97,16 @@ data class LocalEssentials internal constructor(
         )
     }
 
+    fun showToast(
+        messageSelector: Context.() -> String,
+        icon: ImageVector? = null,
+        duration: ToastDuration = ToastDuration.Short
+    ) = showToast(
+        message = messageSelector(context),
+        icon = icon,
+        duration = duration
+    )
+
     fun showFailureToast(
         throwable: Throwable
     ) {

feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/ScanQrCodeContent.kt

@@ -45,7 +45,7 @@ import kotlinx.coroutines.launch
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.ui.utils.helper.asClip
 import ru.tech.imageresizershrinker.core.ui.utils.helper.isLandscapeOrientationAsState
-import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberQrCodeScanner
+import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberBarcodeScanner
 import ru.tech.imageresizershrinker.core.ui.utils.provider.LocalComponentActivity
 import ru.tech.imageresizershrinker.core.ui.utils.provider.rememberLocalEssentials
 import ru.tech.imageresizershrinker.core.ui.widget.AdaptiveLayoutScreen
@@ -74,7 +74,7 @@ fun ScanQrCodeContent(
 
     val params = component.params
 
-    val scanner = rememberQrCodeScanner {
+    val scanner = rememberBarcodeScanner {
         component.updateParams(
             params = params.copy(
                 content = it