Refactor: ReportCategory 확장함수 정의 및 기존 ui 모델 제거

Author: wjdrjs00

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

@@ -220,7 +220,7 @@ private fun ReportScreen(
 
             ReportField(title = "카테고리") {
                 ReportCategorySelector(
-                    title = uiState.selectedCategory?.title,
+                    title = uiState.selectedCategory?.uiTitle,
                     onClick = onShowReportCategoryBottomSheet,
                 )
             }

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

@@ -6,9 +6,9 @@ import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.domain.address.usecase.FetchCurrentAddressUseCase
 import com.threegap.bitnagil.domain.file.usecase.UploadReportImagesUseCase
 import com.threegap.bitnagil.domain.report.model.Report
+import com.threegap.bitnagil.domain.report.model.ReportCategory
 import com.threegap.bitnagil.domain.report.usecase.SubmitReportUseCase
 import com.threegap.bitnagil.presentation.common.file.convertUriToImageFile
-import com.threegap.bitnagil.presentation.report.model.ReportCategoryUi
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -65,7 +65,7 @@ class ReportViewModel @Inject constructor(
         }
     }
 
-    fun selectReportCategory(category: ReportCategoryUi) {
+    fun selectReportCategory(category: ReportCategory) {
         intent {
             reduce { state.copy(selectedCategory = category) }
         }

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

@@ -22,28 +22,29 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.threegap.bitnagil.designsystem.BitnagilTheme
-import com.threegap.bitnagil.presentation.report.model.ReportCategoryUi
+import com.threegap.bitnagil.domain.report.model.ReportCategory
+import com.threegap.bitnagil.presentation.report.model.uiTitle
 
 @Composable
 fun CompleteReportCard(
     title: String,
-    category: ReportCategoryUi?,
+    category: ReportCategory?,
     address: String?,
     content: String,
     images: List<String>,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
 
     Column(
         modifier = modifier
             .background(
                 color = BitnagilTheme.colors.coolGray98,
-                shape = RoundedCornerShape(12.dp)
+                shape = RoundedCornerShape(12.dp),
             )
             .padding(20.dp)
             .fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(20.dp)
+        verticalArrangement = Arrangement.spacedBy(20.dp),
     ) {
         Text(
             text = "제보 요약정보",
@@ -52,7 +53,7 @@ fun CompleteReportCard(
         )
 
         CompleteReportCardItem(
-            title = "제목"
+            title = "제목",
         ) {
             Text(
                 text = title,
@@ -62,17 +63,17 @@ fun CompleteReportCard(
         }
 
         CompleteReportCardItem(
-            title = "키테고리"
+            title = "키테고리",
         ) {
             Text(
-                text = category?.title ?: "카테고리 없음",
+                text = category?.uiTitle ?: "카테고리 없음",
                 color = BitnagilTheme.colors.coolGray10,
                 style = BitnagilTheme.typography.body1Medium,
             )
         }
 
         CompleteReportCardItem(
-            title = "신고 위치"
+            title = "신고 위치",
         ) {
             Text(
                 text = address ?: "주소 없음",
@@ -82,18 +83,18 @@ fun CompleteReportCard(
         }
 
         CompleteReportCardItem(
-            title = "제보 내용"
+            title = "제보 내용",
         ) {
             Text(
                 text = content,
                 color = BitnagilTheme.colors.coolGray10,
                 style = BitnagilTheme.typography.body1Medium,
-                textAlign = TextAlign.End
+                textAlign = TextAlign.End,
             )
         }
 
         CompleteReportCardItem(
-            title = "제보 사진"
+            title = "제보 사진",
         ) {
             LazyRow(
                 horizontalArrangement = Arrangement.End,
@@ -118,18 +119,18 @@ fun CompleteReportCard(
 private fun CompleteReportCardItem(
     title: String,
     modifier: Modifier = Modifier,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
             text = title,
             color = BitnagilTheme.colors.coolGray30,
             style = BitnagilTheme.typography.body1Medium,
-            modifier = Modifier.padding(end = 12.dp)
+            modifier = Modifier.padding(end = 12.dp),
         )
         content()
     }
@@ -140,7 +141,7 @@ private fun CompleteReportCardItem(
 private fun Preview() {
     CompleteReportCard(
         title = "어쩌구",
-        category = ReportCategoryUi.WATERFACILITY,
+        category = ReportCategory.WATERFACILITY,
         address = "서울특별시 강남구 역삼동",
         content = "어쩌구 저쩌구",
         images = listOf(),

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

@@ -24,15 +24,18 @@ 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.presentation.report.model.ReportCategoryUi
+import com.threegap.bitnagil.domain.report.model.ReportCategory
+import com.threegap.bitnagil.presentation.report.model.iconRes
+import com.threegap.bitnagil.presentation.report.model.uiDescription
+import com.threegap.bitnagil.presentation.report.model.uiTitle
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ReportCategoryBottomSheet(
-    selectedCategory: ReportCategoryUi?,
+    selectedCategory: ReportCategory?,
     onDismiss: () -> Unit,
-    onSelected: (ReportCategoryUi) -> Unit,
+    onSelected: (ReportCategory) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val sheetState = rememberModalBottomSheetState()
@@ -48,11 +51,11 @@ fun ReportCategoryBottomSheet(
         Column(
             modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 28.dp),
         ) {
-            ReportCategoryUi.entries.forEachIndexed { index, category ->
+            ReportCategory.entries.forEachIndexed { index, category ->
                 ReportCategoryItem(
-                    icon = category.icon,
-                    title = category.title,
-                    description = category.description,
+                    icon = category.iconRes,
+                    title = category.uiTitle,
+                    description = category.uiDescription,
                     isSelected = selectedCategory == category,
                     onClick = {
                         onSelected(category)
@@ -124,7 +127,7 @@ private fun ReportCategoryItem(
 @Composable
 private fun ReportCategoryBottomSheetPreview() {
     ReportCategoryBottomSheet(
-        selectedCategory = ReportCategoryUi.WATERFACILITY,
+        selectedCategory = ReportCategory.WATERFACILITY,
         onDismiss = {},
         onSelected = {},
     )

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

@@ -0,0 +1,28 @@
+package com.threegap.bitnagil.presentation.report.model
+
+import com.threegap.bitnagil.designsystem.R
+import com.threegap.bitnagil.domain.report.model.ReportCategory
+
+val ReportCategory.uiTitle: String
+    get() = when (this) {
+        ReportCategory.TRANSPORTATION -> "교통 시설"
+        ReportCategory.LIGHTING -> "조명 시설"
+        ReportCategory.WATERFACILITY -> "상하수도 시설"
+        ReportCategory.AMENITY -> "편의 시설"
+    }
+
+val ReportCategory.uiDescription: String
+    get() = when (this) {
+        ReportCategory.TRANSPORTATION -> "신호등 고장, 표지판 파손, 횡단보도 등"
+        ReportCategory.LIGHTING -> "가로등, 보안등 파손 등"
+        ReportCategory.WATERFACILITY -> "맨홀 뚜껑 손상 등"
+        ReportCategory.AMENITY -> "벤치 파손, 휴지통 넘침 등"
+    }
+
+val ReportCategory.iconRes: Int
+    get() = when (this) {
+        ReportCategory.TRANSPORTATION -> R.drawable.ic_car
+        ReportCategory.LIGHTING -> R.drawable.ic_light
+        ReportCategory.WATERFACILITY -> R.drawable.ic_water
+        ReportCategory.AMENITY -> R.drawable.ic_hammer
+    }