Merge pull request #257 from YAPP-Github/BOOK-491-feature/#251

feat: OCR 인식에 갤러리 이미지 선택 기능 추가

Author: seoyoon513

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ReedButton.kt

@@ -26,6 +26,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.common.utils.MultipleEventsCutter
 import com.ninecraft.booket.core.common.utils.get
@@ -93,6 +94,8 @@ fun ReedButton(
 
         Text(
             text = text,
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 1,
             style = sizeStyle.textStyle.copy(
                 color = if (enabled) colorStyle.contentColor() else colorStyle.disabledContentColor(),
             ),

core/designsystem/src/main/res/drawable/ic_gallery.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,2.25C19.729,2.25 20.429,2.54 20.944,3.056C21.46,3.571 21.75,4.271 21.75,5V19C21.75,19.729 21.46,20.429 20.944,20.944C20.429,21.46 19.729,21.75 19,21.75H5C4.271,21.75 3.571,21.46 3.056,20.944C2.54,20.429 2.25,19.729 2.25,19V5C2.25,4.271 2.54,3.571 3.056,3.056C3.571,2.54 4.271,2.25 5,2.25H19ZM8.395,13.096C8.302,13.022 8.17,13.023 8.079,13.099L3.75,16.706V19C3.75,19.331 3.882,19.649 4.116,19.884C4.351,20.118 4.668,20.25 5,20.25H19C19.331,20.25 19.649,20.118 19.884,19.884C20.118,19.649 20.25,19.331 20.25,19V18.713L16.799,15.492C16.705,15.405 16.559,15.403 16.463,15.488L15.161,16.646C14.524,17.212 13.571,17.237 12.905,16.704L8.395,13.096ZM5,3.75C4.668,3.75 4.351,3.882 4.116,4.116C3.882,4.351 3.75,4.668 3.75,5V14.753L7.118,11.946C7.757,11.414 8.683,11.405 9.332,11.925L13.842,15.532C13.937,15.608 14.073,15.605 14.164,15.524L15.466,14.367C16.141,13.767 17.163,13.779 17.823,14.396L20.25,16.66V5C20.25,4.668 20.118,4.351 19.884,4.116C19.649,3.882 19.331,3.75 19,3.75H5ZM16,7C17.105,7 18,7.895 18,9C18,10.105 17.105,11 16,11C14.895,11 14,10.105 14,9C14,7.895 14.895,7 16,7Z"
+      android:fillColor="#ffffff"/>
+</vector>

core/ocr/src/main/kotlin/com/ninecraft/booket/core/ocr/recognizer/CloudOcrRecognizer.kt

@@ -1,8 +1,10 @@
 package com.ninecraft.booket.core.ocr.recognizer
 
+import android.content.Context
 import android.net.Uri
 import android.util.Base64
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
+import com.ninecraft.booket.core.di.ApplicationContext
 import com.ninecraft.booket.core.ocr.BuildConfig
 import com.ninecraft.booket.core.ocr.model.AnnotateImageRequest
 import com.ninecraft.booket.core.ocr.model.CloudVisionRequest
@@ -21,13 +23,22 @@ import com.ninecraft.booket.core.di.DataScope
 @SingleIn(DataScope::class)
 @Inject
 class CloudOcrRecognizer(
+    @ApplicationContext private val context: Context,
     private val service: CloudVisionService,
 ) {
     suspend fun recognizeText(imageUri: Uri): Result<CloudVisionResponse> = runSuspendCatching {
         withContext(Dispatchers.IO) {
-            val filePath = imageUri.path ?: throw IllegalArgumentException("URI does not have a valid path.")
-            val file = File(filePath)
-            val byte = file.readBytes()
+            val byte = when (imageUri.scheme) {
+                null, "file" -> {
+                    val filePath = imageUri.path ?: throw IllegalArgumentException("URI does not have a valid path.")
+                    val file = File(filePath)
+                    file.readBytes()
+                }
+                else -> {
+                    context.contentResolver.openInputStream(imageUri)?.use { it.readBytes() }
+                        ?: throw IllegalArgumentException("Unable to open image input stream.")
+                }
+            }
             val base64Image = Base64.encodeToString(byte, Base64.NO_WRAP)
 
             val request = CloudVisionRequest(

core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt

@@ -32,13 +32,17 @@ fun ReedDialog(
     description: String? = null,
     dismissButtonText: String? = null,
     onDismissRequest: () -> Unit = {},
+    dismissOnClickOutside: Boolean = true,
+    dismissOnBackPress: Boolean = true,
     headerContent: @Composable (() -> Unit)? = null,
 ) {
     Dialog(
         onDismissRequest = {
             onDismissRequest()
         },
         properties = DialogProperties(
+            dismissOnClickOutside = dismissOnClickOutside,
+            dismissOnBackPress = dismissOnBackPress,
             usePlatformDefaultWidth = false,
         ),
     ) {

feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/HandleOcrSideEffects.kt

@@ -14,7 +14,7 @@ internal fun HandleOcrSideEffects(
     RememberedEffect(state.sideEffect) {
         when (state.sideEffect) {
             is OcrSideEffect.ShowToast -> {
-                Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, state.sideEffect.message.asString(context), Toast.LENGTH_SHORT).show()
             }
 
             null -> {}

feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrPresenter.kt

@@ -2,14 +2,21 @@ package com.ninecraft.booket.feature.record.ocr
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.core.net.toUri
 import com.ninecraft.booket.core.common.analytics.AnalyticsHelper
+import com.ninecraft.booket.core.common.utils.UiText
 import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.ocr.recognizer.CloudOcrRecognizer
+import com.ninecraft.booket.feature.record.R
+import com.ninecraft.booket.feature.record.ocr.OcrSideEffect.ShowToast
 import com.ninecraft.booket.feature.screens.OcrScreen
+import com.ninecraft.booket.feature.screens.OcrScreen.OcrResult
 import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
@@ -24,6 +31,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.collections.immutable.toPersistentSet
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @AssistedInject
@@ -41,22 +49,65 @@ class OcrPresenter(
 
     companion object {
         private const val RECORD_OCR_SENTENCE = "record_OCR_sentence"
+        private const val CAMERA_MAX_FAILURES = 2
     }
 
     @Composable
     override fun present(): OcrUiState {
         val scope = rememberCoroutineScope()
+        var isLoading by rememberRetained { mutableStateOf(false) }
         var currentUi by rememberRetained { mutableStateOf(OcrUi.CAMERA) }
         var isPermissionDialogVisible by rememberRetained { mutableStateOf(false) }
+        var selectedImage by rememberRetained { mutableStateOf("") }
         var sentenceList by rememberRetained { mutableStateOf(persistentListOf<String>()) }
         var selectedIndices by rememberRetained { mutableStateOf(persistentSetOf<Int>()) }
         var mergedSentence by rememberRetained { mutableStateOf("") }
         var isTextDetectionFailed by rememberRetained { mutableStateOf(false) }
+        var isCameraRecognitionFailedDialogVisible by rememberRetained { mutableStateOf(false) }
+        var isGalleryRecognitionFailedDialogVisible by rememberRetained { mutableStateOf(false) }
         var isRecaptureDialogVisible by rememberRetained { mutableStateOf(false) }
-        var isLoading by rememberRetained { mutableStateOf(false) }
+        var cameraFailureCount by rememberRetained { mutableIntStateOf(0) }
         var sideEffect by rememberRetained { mutableStateOf<OcrSideEffect?>(null) }
 
-        fun recognizeText(imageUri: Uri) {
+        LaunchedEffect(isTextDetectionFailed) {
+            if (isTextDetectionFailed) {
+                delay(2000)
+                isTextDetectionFailed = false
+            }
+        }
+
+        fun handleRecognitionSuccess(text: String) {
+            isTextDetectionFailed = false
+            cameraFailureCount = 0
+
+            val sentences = text
+                .split("\n")
+                .map { it.trim() }
+                .filter { it.isNotEmpty() }
+
+            sentenceList = sentences.toPersistentList()
+            currentUi = OcrUi.RESULT
+            analyticsHelper.logScreenView(RECORD_OCR_SENTENCE)
+        }
+
+        fun handleRecognitionFailure(source: RecognizeSource) {
+            when (source) {
+                RecognizeSource.CAMERA -> {
+                    isTextDetectionFailed = true
+                    cameraFailureCount += 1
+
+                    if (cameraFailureCount > CAMERA_MAX_FAILURES) {
+                        isCameraRecognitionFailedDialogVisible = true
+                    }
+                }
+
+                RecognizeSource.GALLERY -> {
+                    isGalleryRecognitionFailedDialogVisible = true
+                }
+            }
+        }
+
+        fun recognizeText(imageUri: Uri, source: RecognizeSource) {
             scope.launch {
                 try {
                     isLoading = true
@@ -65,25 +116,17 @@ class OcrPresenter(
                             val text = it.responses.firstOrNull()?.fullTextAnnotation?.text.orEmpty()
 
                             if (text.isNotBlank()) {
-                                isTextDetectionFailed = false
-                                val sentences = text
-                                    .split("\n")
-                                    .map { it.trim() }
-                                    .filter { it.isNotEmpty() }
-
-                                sentenceList = sentences.toPersistentList()
-                                currentUi = OcrUi.RESULT
-                                analyticsHelper.logScreenView(RECORD_OCR_SENTENCE)
+                                handleRecognitionSuccess(text)
                             } else {
-                                isTextDetectionFailed = true
+                                handleRecognitionFailure(source)
                             }
                         }
                         .onFailure { exception ->
-                            isTextDetectionFailed = true
+                            handleRecognitionFailure(source)
 
                             val handleErrorMessage = { message: String ->
                                 Logger.e("Cloud Vision API Error: ${exception.message}")
-                                sideEffect = OcrSideEffect.ShowToast(message)
+                                sideEffect = ShowToast(UiText.DirectString(message))
                             }
 
                             handleException(
@@ -118,14 +161,24 @@ class OcrPresenter(
 
                 is OcrUiEvent.OnCaptureFailed -> {
                     isLoading = false
-                    sideEffect = OcrSideEffect.ShowToast("이미지 캡처에 실패했어요")
+                    sideEffect = ShowToast(UiText.StringResource(R.string.ocr_capture_failed))
                     Logger.e("ImageCaptureException: ${event.exception.message}")
                 }
 
                 is OcrUiEvent.OnImageCaptured -> {
                     isTextDetectionFailed = false
 
-                    recognizeText(event.imageUri)
+                    recognizeText(event.imageUri, RecognizeSource.CAMERA)
+                }
+
+                is OcrUiEvent.OnImageSelected -> {
+                    currentUi = OcrUi.IMAGE
+                    selectedImage = event.imageUri
+                    isTextDetectionFailed = false
+                    cameraFailureCount = 0
+
+                    val pareUri = selectedImage.toUri()
+                    recognizeText(pareUri, RecognizeSource.GALLERY)
                 }
 
                 is OcrUiEvent.OnReCaptureButtonClick -> {
@@ -135,7 +188,7 @@ class OcrPresenter(
                 is OcrUiEvent.OnSelectionConfirmed -> {
                     mergedSentence = selectedIndices
                         .sorted().joinToString("") { sentenceList[it] }
-                    navigator.pop(result = OcrScreen.OcrResult(mergedSentence))
+                    navigator.pop(result = OcrResult(mergedSentence))
                 }
 
                 is OcrUiEvent.OnSentenceSelected -> {
@@ -155,6 +208,19 @@ class OcrPresenter(
                 is OcrUiEvent.OnRecaptureDialogDismissed -> {
                     isRecaptureDialogVisible = false
                 }
+
+                OcrUiEvent.OnImageContentClosed -> {
+                    currentUi = OcrUi.CAMERA
+                }
+
+                OcrUiEvent.OnCameraRecognitionFailedDialogDismissed -> {
+                    isCameraRecognitionFailedDialogVisible = false
+                    cameraFailureCount = 0
+                }
+
+                OcrUiEvent.OnImageRecognitionFailedDialogDismissed -> {
+                    isGalleryRecognitionFailedDialogVisible = false
+                }
             }
         }
 
@@ -165,9 +231,12 @@ class OcrPresenter(
         return OcrUiState(
             currentUi = currentUi,
             isPermissionDialogVisible = isPermissionDialogVisible,
+            selectedImage = selectedImage,
             sentenceList = sentenceList,
             selectedIndices = selectedIndices,
             isTextDetectionFailed = isTextDetectionFailed,
+            isCameraRecognitionFailedDialogVisible = isCameraRecognitionFailedDialogVisible,
+            isGalleryRecognitionFailedDialogVisible = isGalleryRecognitionFailedDialogVisible,
             isRecaptureDialogVisible = isRecaptureDialogVisible,
             isLoading = isLoading,
             sideEffect = sideEffect,