Merge pull request #151 from YAPP-Github/feature/#146-report_history

[Feature/#146] 내 제보 기록 화면 구현

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -14,6 +14,7 @@ import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
 import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
 import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
 import com.threegap.bitnagil.presentation.report.ReportScreenContainer
+import com.threegap.bitnagil.presentation.reporthistory.ReportHistoryScreenContainer
 import com.threegap.bitnagil.presentation.routinelist.RoutineListScreenContainer
 import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
 import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
@@ -140,6 +141,11 @@ fun MainNavHost(
                         launchSingleTop = true
                     }
                 },
+                navigateToReportHistory = {
+                    navigator.navController.navigate(Route.ReportHistory) {
+                        launchSingleTop = true
+                    }
+                },
             )
         }
 
@@ -305,5 +311,17 @@ fun MainNavHost(
                 },
             )
         }
+
+        composable<Route.ReportHistory> {
+            ReportHistoryScreenContainer(
+                navigateToBack = {
+                    if (navigator.navController.previousBackStackEntry != null) {
+                        navigator.navController.popBackStack()
+                    }
+                },
+                navigateToReportDetail = {
+                },
+            )
+        }
     }
 }

app/src/main/java/com/threegap/bitnagil/Route.kt

@@ -51,4 +51,7 @@ sealed interface Route {
 
     @Serializable
     data object Report : Route
+
+    @Serializable
+    data object ReportHistory : Route
 }

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

@@ -44,6 +44,7 @@ fun HomeNavHost(
     navigateToEmotion: () -> Unit,
     navigateToRoutineList: (String) -> Unit,
     navigateToReport: () -> Unit,
+    navigateToReportHistory: () -> Unit,
 ) {
     val navigator = rememberHomeNavigator()
     var showFloatingOverlay by remember { mutableStateOf(false) }
@@ -89,6 +90,7 @@ fun HomeNavHost(
                             navigateToOnBoarding = navigateToOnBoarding,
                             navigateToNotice = navigateToNotice,
                             navigateToQnA = navigateToQnA,
+                            navigateToReportHistory = navigateToReportHistory,
                         )
                     }
                 }

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/color/BitnagilColors.kt

@@ -12,8 +12,10 @@ data class BitnagilColors(
     val error: Color = Error,
     val error10: Color = Error10,
     val skyBlue10: Color = SkyBlue10,
+    val blue300: Color = Blue300,
     val purple10: Color = Purple10,
     val green10: Color = Green10,
+    val green300: Color = Green300,
     val pink10: Color = Pink10,
     val yellow10: Color = Yellow10,
     val progressBarGradientStartColor: Color = ProgressBarGradientStartColor,

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/color/Color.kt

@@ -8,8 +8,10 @@ val Kakao = Color(0xFFFEE500)
 val Error = Color(0xFFFF6868)
 val Error10 = Color(0xFFFF5858)
 val SkyBlue10 = Color(0xFFDBF1FF)
+val Blue300 = Color(0xFF0093F5)
 val Purple10 = Color(0xFFE6E2FF)
 val Green10 = Color(0xFFE6F5C6)
+val Green300 = Color(0xFF3FAF00)
 val Pink10 = Color(0xFFFEE3E9)
 val Yellow10 = Color(0xFFFFF5C7)
 val ProgressBarGradientStartColor = Color(0xFFA9CFFF)

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilChip.kt

@@ -0,0 +1,60 @@
+package com.threegap.bitnagil.designsystem.component.atom
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.threegap.bitnagil.designsystem.BitnagilTheme
+import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
+
+@Composable
+fun BitnagilChip(
+    title: String,
+    isSelected: Boolean,
+    onCategorySelected: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = modifier
+            .background(
+                color = if (!isSelected) BitnagilTheme.colors.white else BitnagilTheme.colors.coolGray10,
+                shape = RoundedCornerShape(20.dp),
+            )
+            .height(36.dp)
+            .clickableWithoutRipple(onClick = onCategorySelected)
+            .padding(
+                vertical = 6.dp,
+                horizontal = 14.dp,
+            ),
+    ) {
+        Text(
+            text = title,
+            color = if (!isSelected) BitnagilTheme.colors.coolGray60 else BitnagilTheme.colors.white,
+            style = if (!isSelected) BitnagilTheme.typography.caption1Medium else BitnagilTheme.typography.caption1SemiBold,
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun RecommendCategoryChipStatesPreview() {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        BitnagilChip(
+            title = "맞춤 추천",
+            isSelected = true,
+            onCategorySelected = {},
+        )
+    }
+}

data/src/main/java/com/threegap/bitnagil/data/report/datasource/ReportDataSource.kt

@@ -1,7 +1,9 @@
 package com.threegap.bitnagil.data.report.datasource
 
 import com.threegap.bitnagil.data.report.model.request.ReportRequestDto
+import com.threegap.bitnagil.data.report.model.response.ReportHistoriesPerDateDto
 
 interface ReportDataSource {
     suspend fun submitReport(reportRequestDto: ReportRequestDto): Result<Long>
+    suspend fun getReports(): Result<ReportHistoriesPerDateDto>
 }

data/src/main/java/com/threegap/bitnagil/data/report/datasourceImpl/ReportDataSourceImpl.kt

@@ -3,6 +3,7 @@ package com.threegap.bitnagil.data.report.datasourceImpl
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.report.datasource.ReportDataSource
 import com.threegap.bitnagil.data.report.model.request.ReportRequestDto
+import com.threegap.bitnagil.data.report.model.response.ReportHistoriesPerDateDto
 import com.threegap.bitnagil.data.report.service.ReportService
 import javax.inject.Inject
 
@@ -12,4 +13,8 @@ class ReportDataSourceImpl @Inject constructor(
     override suspend fun submitReport(reportRequestDto: ReportRequestDto): Result<Long> {
         return safeApiCall { reportService.submitReport(reportRequestDto) }
     }
+
+    override suspend fun getReports(): Result<ReportHistoriesPerDateDto> {
+        return safeApiCall { reportService.getReports() }
+    }
 }

data/src/main/java/com/threegap/bitnagil/data/report/model/response/ReportHistoriesPerDateDto.kt

@@ -0,0 +1,19 @@
+package com.threegap.bitnagil.data.report.model.response
+
+import com.threegap.bitnagil.domain.report.model.ReportItem
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.time.LocalDate
+
+@Serializable
+data class ReportHistoriesPerDateDto(
+    @SerialName("reportInfos")
+    val reportInfos: Map<String, List<ReportItemDto>>,
+)
+
+fun ReportHistoriesPerDateDto.toDomainMap(): Map<LocalDate, List<ReportItem>> =
+    this.reportInfos
+        .mapKeys { LocalDate.parse(it.key) }
+        .mapValues { entry ->
+            entry.value.map { it.toDomain() }
+        }

data/src/main/java/com/threegap/bitnagil/data/report/model/response/ReportItemDto.kt

@@ -0,0 +1,33 @@
+package com.threegap.bitnagil.data.report.model.response
+
+import com.threegap.bitnagil.domain.report.model.ReportCategory
+import com.threegap.bitnagil.domain.report.model.ReportItem
+import com.threegap.bitnagil.domain.report.model.ReportStatus
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ReportItemDto(
+    @SerialName("reportId")
+    val reportId: Int,
+    @SerialName("reportStatus")
+    val reportStatus: String,
+    @SerialName("reportTitle")
+    val reportTitle: String,
+    @SerialName("reportCategory")
+    val reportCategory: String,
+    @SerialName("reportLocation")
+    val reportLocation: String,
+    @SerialName("reportImageUrl")
+    val reportImageUrl: String,
+)
+
+fun ReportItemDto.toDomain(): ReportItem =
+    ReportItem(
+        id = this.reportId,
+        status = ReportStatus.fromString(this.reportStatus),
+        title = this.reportTitle,
+        category = ReportCategory.fromString(this.reportCategory),
+        address = this.reportLocation,
+        imageUrl = this.reportImageUrl,
+    )