Merge pull request #51 from Team-BuddyCon/feat/barcode

바코드 인식 API 사용하여 이미지 등록
Team-BuddyCon · Feb 25, 2024 · 9834206 · 9834206
2 parents c400942 + 641493a
commit 9834206
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 28 deletions.
diff --git a/...signsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/ConfirmDialog.kt b/...signsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/ConfirmDialog.kt
@@ -3,25 +3,33 @@ package com.yapp.buddycon.designsystem.component.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.yapp.buddycon.designsystem.R
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 
 @Composable
 fun ConfirmDialog(
     dialogTitle: String,
     dialogContent: String? = null,
-    onClick: (() -> Unit)? = null
+    onClick: (() -> Unit)? = null,
+    onDismissRequest: () -> Unit = {}
 ) {
-    BaseDialog(
-        dialogTitle = dialogTitle,
-        dialogContent = dialogContent,
-        dialogButtons = listOf(
-            DialogButtons.Light(
-                title = stringResource(id = R.string.confirm),
-                action = onClick
+    Dialog(
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+        onDismissRequest = onDismissRequest
+    ) {
+        BaseDialog(
+            dialogTitle = dialogTitle,
+            dialogContent = dialogContent,
+            dialogButtons = listOf(
+                DialogButtons.Light(
+                    title = stringResource(id = R.string.confirm),
+                    action = onClick
+                )
             )
         )
-    )
+    }
 }
 
 @Preview

diff --git a/...signsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/DefaultDialog.kt b/...signsystem/src/main/java/com/yapp/buddycon/designsystem/component/dialog/DefaultDialog.kt
@@ -2,6 +2,8 @@ package com.yapp.buddycon.designsystem.component.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 
 @Composable
@@ -10,23 +12,28 @@ fun DefaultDialog(
     dismissText: String,
     confirmText: String,
     dialogContent: String? = null,
-    onDismiss: (() -> Unit)? = null,
-    onConfirm: (() -> Unit)? = null
+    onConfirm: (() -> Unit)? = null,
+    onDismissRequest: (() -> Unit) = {}
 ) {
-    BaseDialog(
-        dialogTitle = dialogTitle,
-        dialogContent = dialogContent,
-        dialogButtons = listOf(
-            DialogButtons.Dark(
-                title = dismissText,
-                action = onDismiss
-            ),
-            DialogButtons.Light(
-                title = confirmText,
-                action = onConfirm
+    Dialog(
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+        onDismissRequest = onDismissRequest
+    ) {
+        BaseDialog(
+            dialogTitle = dialogTitle,
+            dialogContent = dialogContent,
+            dialogButtons = listOf(
+                DialogButtons.Dark(
+                    title = dismissText,
+                    action = onDismissRequest
+                ),
+                DialogButtons.Light(
+                    title = confirmText,
+                    action = onConfirm
+                )
             )
         )
-    )
+    }
 }
 
 @Preview

diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -64,4 +64,7 @@
     <string name="map">지도</string>
     <string name="map_location_permission">위치 정보를 허용했어요!</string>
 
+    <!--    Error Popup-->
+    <string name="gifticon_register_error">쿠폰을 등록하지 못했어요</string>
+    <string name="gifticon_register_error_reason">바코드가 잘리거나 손상되지 않았는지\n확인 후에 다시 시도해 주세요.</string>
 </resources>
diff --git a/core/navigation/src/main/java/com/yapp/buddycon/navigation/gifticon/GifticonGraph.kt b/core/navigation/src/main/java/com/yapp/buddycon/navigation/gifticon/GifticonGraph.kt
@@ -1,5 +1,7 @@
 package com.yapp.buddycon.navigation.gifticon
 
+import androidx.compose.runtime.remember
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
@@ -22,10 +24,12 @@ fun NavGraphBuilder.gifticonGraph(
             }
         }
 
-        composable(GifticonDestination.Register.route) {
-            GifticonRegisterScreen {
-                navHostController.popBackStack()
-            }
+        composable(GifticonDestination.Register.route) { entry ->
+            val parentEntry = remember(entry) { navHostController.getBackStackEntry(GifticonDestination.Gifticon.route) }
+            GifticonRegisterScreen(
+                gifticonViewModel = hiltViewModel(parentEntry),
+                onBack = { navHostController.popBackStack() }
+            )
         }
     }
 }
diff --git a/feature/gifticon/build.gradle b/feature/gifticon/build.gradle
@@ -49,6 +49,9 @@ dependencies {
     implementation libs.androidx.activity.compose
     implementation platform(libs.androidx.compose.bom)
     implementation libs.bundles.androidx.compose
+    implementation libs.barcode.scanning
+    implementation libs.timber
+
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espresso.core

diff --git a/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/GifticonScreen.kt b/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/GifticonScreen.kt
@@ -7,18 +7,33 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.yapp.buddycon.designsystem.R
 import com.yapp.buddycon.designsystem.component.appbar.TopAppBarWithNotification
 import com.yapp.buddycon.designsystem.component.button.FloatingActionButton
+import com.yapp.buddycon.designsystem.component.dialog.ConfirmDialog
 import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 import com.yapp.buddycon.gifticon.available.AvailabeGifticonScreen
 
 @Composable
 fun GifticonScreeen(
+    gifticonViewModel: GifticonViewModel = hiltViewModel(),
     onNavigateToRegister: () -> Unit = {}
 ) {
+    val showErrorPopup by gifticonViewModel.showErrorPopup.collectAsStateWithLifecycle()
+    if (showErrorPopup) {
+        ConfirmDialog(
+            dialogTitle = stringResource(R.string.gifticon_register_error),
+            dialogContent = stringResource(R.string.gifticon_register_error_reason),
+            onClick = { gifticonViewModel.showGifticonRegisterError(false) },
+            onDismissRequest = { gifticonViewModel.showGifticonRegisterError(false) }
+        )
+    }
+
     Scaffold(
         topBar = {
             TopAppBarWithNotification(stringResource(R.string.gifticon))

diff --git a/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/GifticonViewModel.kt b/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/GifticonViewModel.kt
@@ -0,0 +1,18 @@
+package com.yapp.buddycon.gifticon
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+@HiltViewModel
+class GifticonViewModel @Inject constructor() : ViewModel() {
+
+    private val _showErrorPopup = MutableStateFlow(false)
+    val showErrorPopup = _showErrorPopup.asStateFlow()
+
+    fun showGifticonRegisterError(isShow: Boolean) {
+        _showErrorPopup.value = isShow
+    }
+}
diff --git a/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/register/GifticonRegisterScreen.kt b/feature/gifticon/src/main/java/com/yapp/buddycon/gifticon/register/GifticonRegisterScreen.kt
@@ -42,6 +42,8 @@ import androidx.compose.ui.window.DialogProperties
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
+import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.common.InputImage
 import com.yapp.buddycon.designsystem.R
 import com.yapp.buddycon.designsystem.component.appbar.TopAppBarWithBack
 import com.yapp.buddycon.designsystem.component.button.BuddyConButton
@@ -58,17 +60,42 @@ import com.yapp.buddycon.designsystem.theme.BuddyConTheme
 import com.yapp.buddycon.designsystem.theme.Grey30
 import com.yapp.buddycon.designsystem.theme.Grey70
 import com.yapp.buddycon.designsystem.theme.Paddings
+import com.yapp.buddycon.gifticon.GifticonViewModel
+import timber.log.Timber
+import java.io.IOException
 
 @Composable
 fun GifticonRegisterScreen(
+    gifticonViewModel: GifticonViewModel = hiltViewModel(),
     onBack: () -> Unit = {}
 ) {
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
     var imageUri by remember { mutableStateOf<Uri?>(null) }
     val galleryLauncher = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        imageUri = uri
+        try {
+            val image = uri?.let { InputImage.fromFilePath(context, it) }
+            val scanner = BarcodeScanning.getClient()
+            image?.let { image ->
+                scanner.process(image)
+                    .addOnSuccessListener { barcodes ->
+                        if (barcodes.isNotEmpty()) {
+                            imageUri = uri
+                        } else {
+                            Timber.d("There is not barcode in image")
+                            gifticonViewModel.showGifticonRegisterError(true)
+                            onBack()
+                        }
+                    }.addOnFailureListener {
+                        Timber.e("barcode scanner detection error: ${it.message}")
+                        gifticonViewModel.showGifticonRegisterError(true)
+                        onBack()
+                    }
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
     }
 
     LaunchedEffect(imageUri) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,6 +23,7 @@ timber = "5.0.1"
 
 ## 3rd library
 coil-compose = "2.4.0"
+barcode-scanning = "17.2.0"
 
 ## retrofit2
 retrofit2 = "2.9.0"
@@ -85,6 +86,7 @@ accompanist-pager-indicators = { group = "com.google.accompanist", name = "accom
 
 ## 3rd library
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil-compose" }
+barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "barcode-scanning" }
 
 ## retrofit2
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit2" }