Merge pull request #88 from YAPP-Github/feature/moneymong-306-예외-처리

Feature/moneymong 306 예외 처리

Author: Heonbyeong

app/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
             android:exported="true"
             android:label="${appLabel}"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.Moneymongandroid">
+            android:theme="@style/Theme.Moneymongandroid"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt

@@ -187,7 +187,7 @@ fun LedgerDetailScreen(
                     .background(Gray01)
                     .padding(it)
             ) {
-                Spacer(modifier = Modifier.height(12.dp))
+                Spacer(modifier = Modifier.height(4.dp))
                 Box(
                     modifier = Modifier
                         .fillMaxSize()
@@ -565,20 +565,20 @@ fun LedgerDetailScreen(
                         MDSButton(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .padding(vertical = 24.dp, horizontal = 20.dp),
+                                .padding(vertical = 12.dp, horizontal = 20.dp),
                             text = "완료하기",
                             enabled = state.enabledEdit,
-                            size = MDSButtonSize.MEDIUM,
+                            size = MDSButtonSize.LARGE,
                             type = MDSButtonType.PRIMARY,
                             onClick = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailEditDone) }
                         )
                     } else {
                         MDSButton(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .padding(vertical = 24.dp, horizontal = 20.dp),
+                                .padding(vertical = 12.dp, horizontal = 20.dp),
                             text = "수정하기",
-                            size = MDSButtonSize.MEDIUM,
+                            size = MDSButtonSize.LARGE,
                             type = MDSButtonType.PRIMARY,
                             onClick = { viewModel.eventEmit(LedgerDetailSideEffect.LedgerDetailEdit) }
                         )

feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/view/LedgerDetailTopbarView.kt

@@ -43,15 +43,15 @@ fun LedgerDetailTopbarView(
                 .noRippleClickable {
                     onClickPrev()
                 }
-                .padding(vertical = 10.dp, horizontal = MMHorizontalSpacing)
+                .padding(vertical = 18.dp, horizontal = MMHorizontalSpacing)
                 .align(Alignment.CenterStart),
             painter = painterResource(id = drawable.ic_chevron_left),
             contentDescription = null,
             tint = Gray07
         )
         Text(
             modifier = Modifier
-                .padding(vertical = 8.dp)
+                .padding(vertical = 16.dp)
                 .align(Alignment.Center),
             text = title,
             style = Heading1,
@@ -75,7 +75,7 @@ fun LedgerDetailTopbarView(
                     .noRippleClickable {
                         onClickDelete()
                     }
-                    .padding(vertical = 10.dp, horizontal = MMHorizontalSpacing)
+                    .padding(vertical = 18.dp, horizontal = MMHorizontalSpacing)
                     .align(Alignment.CenterEnd),
                 painter = painterResource(id = drawable.ic_delete),
                 contentDescription = null,

feature/ocr-detail/src/main/java/com/moneymong/moneymong/ocr_detail/OCRDetailViewModel.kt

@@ -21,6 +21,9 @@ import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
 import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
@@ -39,12 +42,26 @@ class OCRDetailViewModel @Inject constructor(
 
     fun init(document: DocumentEntity?) = intent {
         val receipt = document?.images?.first()?.receipt?.result
-        val paymentDateString = receipt?.paymentInfo?.date?.formatted.run {
-            "${this?.year ?: ""}${this?.month ?: ""}${this?.day ?: ""}"
-        }
-        val paymentTimeString = receipt?.paymentInfo?.time?.formatted.run {
-            "${this?.hour ?: ""}${this?.minute ?: ""}${this?.second ?: ""}"
-        }
+        val currentDate = SimpleDateFormat("yyyyMMdd", Locale.KOREA).format(Date(System.currentTimeMillis()))
+        val currentTime = SimpleDateFormat("HHmmss", Locale.KOREA).format(Date(System.currentTimeMillis()))
+        val paymentDateString = receipt?.paymentInfo?.date?.formatted?.let {
+            ("${it.year}${it.month}${it.day}").run {
+                if (validateValue(length = 8, isDigit = true) && isValidPaymentDate()) {
+                    this
+                } else {
+                    currentDate
+                }
+            }
+        } ?: currentDate
+        val paymentTimeString = receipt?.paymentInfo?.time?.formatted?.let {
+            ("${it.hour}${it.minute}${it.second}").run {
+                if (validateValue(length = 6, isDigit = true) && isValidPaymentTime()) {
+                    this
+                } else {
+                    currentTime
+                }
+            }
+        } ?: currentTime
         reduce {
             state.copy(
                 document = document,
@@ -77,7 +94,7 @@ class OCRDetailViewModel @Inject constructor(
                 id = state.agencyId,
                 storeInfo = state.storeNameValue.text,
                 fundType = state.fundType,
-                amount = state.totalPriceValue.text.toInt(),
+                amount = state.totalPriceValue.text.replace(".", "").toInt(),
                 description = state.memoValue.text,
                 paymentDate = state.postPaymentDate,
                 receiptImageUrls = state.receiptImageUrls,

feature/ocr-result/src/main/java/com/moneymong/moneymong/ocr_result/OCRResultState.kt

@@ -2,7 +2,10 @@ package com.moneymong.moneymong.ocr_result
 
 import com.moneymong.moneymong.common.base.State
 import com.moneymong.moneymong.common.ext.toZonedDateTime
+import com.moneymong.moneymong.common.ui.isValidPaymentDate
+import com.moneymong.moneymong.common.ui.isValidPaymentTime
 import com.moneymong.moneymong.common.ui.toWonFormat
+import com.moneymong.moneymong.common.ui.validateValue
 import com.moneymong.moneymong.domain.entity.ocr.DocumentEntity
 import com.moneymong.moneymong.domain.entity.ocr.DocumentResultEntity
 import java.io.File
@@ -46,16 +49,28 @@ data class OCRResultState(
     val formattedDate: String
         get() {
             val currentDate = SimpleDateFormat("yyyy년 MM월 dd일", Locale.KOREA).format(Date(System.currentTimeMillis()))
-            return receipt?.paymentInfo?.date?.let {
-                "${it.formatted?.year}년 ${it.formatted?.month}월 ${it.formatted?.day}일"
+            return receipt?.paymentInfo?.date?.formatted?.let {
+                ("${it.year}${it.month}${it.day}").run {
+                    if (validateValue(length = 8, isDigit = true) && isValidPaymentDate()) {
+                        "${it.year}년 ${it.month}월 ${it.day}일"
+                    } else {
+                        currentDate
+                    }
+                }
             } ?: currentDate
         }
 
     val formattedTime: String
         get() {
             val currentTime = SimpleDateFormat("HH:mm:ss", Locale.KOREA).format(Date(System.currentTimeMillis()))
-            return receipt?.paymentInfo?.time?.let {
-                "${it.formatted?.hour}:${it.formatted?.minute}:${it.formatted?.second}"
+            return receipt?.paymentInfo?.time?.formatted?.let {
+                ("${it.hour}${it.minute}${it.second}").run {
+                    if (validateValue(length = 6, isDigit = true) && isValidPaymentTime()) {
+                        "${it.hour}:${it.minute}:${it.second}"
+                    } else {
+                        currentTime
+                    }
+                }
             } ?: currentTime
         }
 

feature/ocr/src/main/java/com/moneymong/moneymong/ocr/view/OCRHelperView.kt

@@ -48,7 +48,7 @@ fun OCRHelperView(
         ) {
             Icon(
                 modifier = Modifier
-                    .padding(vertical = 10.dp, horizontal = 20.dp)
+                    .padding(vertical = 16.dp, horizontal = 20.dp)
                     .noRippleClickable { onClickClose() },
                 painter = painterResource(id = R.drawable.ic_close_default),
                 contentDescription = null,

feature/ocr/src/main/java/com/moneymong/moneymong/ocr/view/OCRTopbarView.kt

@@ -46,7 +46,7 @@ fun OCRTopbarView(
             if (visibleHelp) {
                 Icon(
                     modifier = Modifier
-                        .padding(vertical = 10.dp, horizontal = 20.dp)
+                        .padding(vertical = 16.dp, horizontal = 20.dp)
                         .noRippleClickable { onClickHelp() },
                     painter = painterResource(id = drawable.ic_warning_outline),
                     contentDescription = null,
@@ -57,7 +57,7 @@ fun OCRTopbarView(
             }
             Icon(
                 modifier = Modifier
-                    .padding(vertical = 10.dp, horizontal = 20.dp)
+                    .padding(vertical = 16.dp, horizontal = 20.dp)
                     .noRippleClickable { onClickClose() },
                 painter = painterResource(id = drawable.ic_close_default),
                 contentDescription = null,
@@ -67,7 +67,7 @@ fun OCRTopbarView(
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(start = 20.dp, top = 42.dp, end = 20.dp)
+                .padding(start = 20.dp, top = 56.dp, end = 20.dp)
                 .drawBehind {
                     drawIntoCanvas {
                         val paint = Paint()