Fix: 토끼 리뷰사항 반영

Author: wjdrjs00

presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportScreen.kt

@@ -66,6 +66,7 @@ import com.threegap.bitnagil.presentation.report.component.template.CompleteRepo
 import com.threegap.bitnagil.presentation.report.component.template.SubmittingReportContent
 import com.threegap.bitnagil.presentation.report.model.ReportSideEffect
 import com.threegap.bitnagil.presentation.report.model.ReportState
+import com.threegap.bitnagil.presentation.report.model.ReportState.Companion.MAX_IMAGE_COUNT
 import com.threegap.bitnagil.presentation.report.model.SubmitState
 import com.threegap.bitnagil.presentation.report.model.uiTitle
 import kotlinx.coroutines.delay
@@ -95,7 +96,7 @@ fun ReportScreenContainer(
     var pendingCameraPhotoUri by remember { mutableStateOf<Uri?>(null) }
 
     val pickMultipleMediaLauncher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.PickMultipleVisualMedia(ReportViewModel.MAX_IMAGE_COUNT),
+        contract = ActivityResultContracts.PickMultipleVisualMedia(MAX_IMAGE_COUNT),
         onResult = viewModel::addImages,
     )
 
@@ -242,7 +243,7 @@ private fun ReportScreen(
                     AddPhotoButton(
                         onClick = onShowImageSourceBottomSheet,
                         imageCount = uiState.reportImages.size,
-                        maxImageCount = ReportViewModel.MAX_IMAGE_COUNT,
+                        maxImageCount = MAX_IMAGE_COUNT,
                     )
 
                     LazyRow(
@@ -324,7 +325,7 @@ private fun ReportScreen(
                 )
             }
 
-            ReportField(title = " 신고 위치") {
+            ReportField(title = "신고 위치") {
                 CurrentLocationInput(
                     currentLocation = uiState.currentAddress,
                     onClick = onGetCurrentLocationClick,

presentation/src/main/java/com/threegap/bitnagil/presentation/report/ReportViewModel.kt

@@ -11,6 +11,7 @@ import com.threegap.bitnagil.domain.report.usecase.SubmitReportUseCase
 import com.threegap.bitnagil.presentation.common.file.convertUriToImageFile
 import com.threegap.bitnagil.presentation.report.model.ReportSideEffect
 import com.threegap.bitnagil.presentation.report.model.ReportState
+import com.threegap.bitnagil.presentation.report.model.ReportState.Companion.MAX_IMAGE_COUNT
 import com.threegap.bitnagil.presentation.report.model.SubmitState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -119,13 +120,13 @@ class ReportViewModel @Inject constructor(
 
     fun submitReportWithImages() {
         intent {
-            reduce { state.copy(submitState = SubmitState.SUBMITTING) }
-
             val category = state.selectedCategory ?: return@intent
             val address = state.currentAddress ?: return@intent
             val latitude = state.currentLatitude ?: return@intent
             val longitude = state.currentLongitude ?: return@intent
 
+            reduce { state.copy(submitState = SubmitState.SUBMITTING) }
+
             coroutineScope {
                 val minDelayJob = async {
                     delay(1000L)
@@ -173,13 +174,11 @@ class ReportViewModel @Inject constructor(
                             )
                         }
                     },
-                    onFailure = { error -> },
+                    onFailure = { error ->
+                        reduce { state.copy(submitState = SubmitState.IDLE) }
+                    },
                 )
             }
         }
     }
-
-    companion object {
-        const val MAX_IMAGE_COUNT = 3
-    }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/CompleteReportCard.kt

@@ -63,7 +63,7 @@ fun CompleteReportCard(
         }
 
         CompleteReportCardItem(
-            title = "키테고리",
+            title = "카테고리",
         ) {
             Text(
                 text = category?.uiTitle ?: "카테고리 없음",

presentation/src/main/java/com/threegap/bitnagil/presentation/report/component/ReportCategoryBottomSheet.kt

@@ -23,7 +23,6 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
-import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
 import com.threegap.bitnagil.domain.report.model.ReportCategory
 import com.threegap.bitnagil.presentation.report.model.iconRes
 import com.threegap.bitnagil.presentation.report.model.uiDescription
@@ -51,7 +50,8 @@ fun ReportCategoryBottomSheet(
         Column(
             modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 28.dp),
         ) {
-            ReportCategory.entries.forEachIndexed { index, category ->
+            val categories = ReportCategory.entries
+            categories.forEachIndexed { index, category ->
                 ReportCategoryItem(
                     icon = category.iconRes,
                     title = category.uiTitle,
@@ -67,7 +67,7 @@ fun ReportCategoryBottomSheet(
                     },
                 )
 
-                if (index < RecommendLevel.entries.size) {
+                if (index < categories.lastIndex) {
                     HorizontalDivider(
                         color = BitnagilTheme.colors.coolGray97,
                     )

presentation/src/main/java/com/threegap/bitnagil/presentation/report/model/ReportState.kt

@@ -2,7 +2,6 @@ package com.threegap.bitnagil.presentation.report.model
 
 import android.net.Uri
 import com.threegap.bitnagil.domain.report.model.ReportCategory
-import com.threegap.bitnagil.presentation.report.ReportViewModel
 
 data class ReportState(
     val reportImages: List<Uri>,
@@ -18,7 +17,7 @@ data class ReportState(
     val submitState: SubmitState,
 ) {
     val canAddMoreImages: Boolean
-        get() = reportImages.size < ReportViewModel.Companion.MAX_IMAGE_COUNT
+        get() = reportImages.size < MAX_IMAGE_COUNT
 
     val isSubmittable: Boolean
         get() = reportImages.isNotEmpty() &&
@@ -30,6 +29,8 @@ data class ReportState(
             currentLongitude != null
 
     companion object {
+        const val MAX_IMAGE_COUNT = 3
+
         val Init = ReportState(
             reportImages = emptyList(),
             reportTitle = "",