diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewInfoResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewInfoResponse.kt index 263780c1..24faca6e 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewInfoResponse.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MealReviewInfoResponse.kt @@ -2,6 +2,7 @@ package com.eatssu.android.data.remote.dto.response import com.eatssu.android.domain.model.ReviewInfo import com.google.gson.annotations.SerializedName +import kotlin.math.round data class MealReviewInfoResponse( @SerializedName("menuNames") val menuNames: List? = null, @@ -21,7 +22,7 @@ data class MealReviewInfoResponse( fun MealReviewInfoResponse.toDomain() = ReviewInfo( reviewCnt = totalReviewCount ?: 0, - rating = rating ?: 0.0, + rating = (round((rating ?: 0.0) * 10) / 10), oneStarCount = reviewRatingCount?.oneStarCount ?: 0, twoStarCount = reviewRatingCount?.twoStarCount ?: 0, threeStarCount = reviewRatingCount?.threeStarCount ?: 0, diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewInfoResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewInfoResponse.kt index bda76827..518b960a 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewInfoResponse.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MenuReviewInfoResponse.kt @@ -2,6 +2,7 @@ package com.eatssu.android.data.remote.dto.response import com.eatssu.android.domain.model.ReviewInfo import com.google.gson.annotations.SerializedName +import kotlin.math.round data class MenuReviewInfoResponse( @SerializedName("menuName") val menuName: String? = null, @@ -21,7 +22,7 @@ data class MenuReviewInfoResponse( fun MenuReviewInfoResponse.toDomain() = ReviewInfo( reviewCnt = totalReviewCount ?: 0, - rating = rating ?: 0.0, + rating = (round((rating ?: 0.0) * 10) / 10), oneStarCount = reviewRatingCount?.oneStarCount ?: 0, twoStarCount = reviewRatingCount?.twoStarCount ?: 0, threeStarCount = reviewRatingCount?.threeStarCount ?: 0, diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewNav.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewNav.kt index f6395f49..159f1831 100644 --- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewNav.kt +++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/ReviewNav.kt @@ -72,8 +72,8 @@ fun ReviewNav( val reviewId = prev?.get("reviewId") ?: 0L val initialRating = prev?.get("initialRating") ?: 0 val initialContent = prev?.get("initialContent") ?: "" - val menuLikeInfoNames = - prev?.get>("menuList") ?: arrayListOf() + val menuLikeInfoNames = prev?.get>("menuList") + ?.let { ArrayList(it) } ?: arrayListOf() ModifyReviewScreen( reviewId = reviewId, diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt index b9b96302..45810030 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt @@ -1,5 +1,6 @@ package com.eatssu.android.presentation.mypage.myreview +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -38,6 +39,7 @@ import com.eatssu.common.UiEvent import com.eatssu.common.UiState import com.eatssu.design_system.component.EatSsuTopBar import com.eatssu.design_system.theme.EatssuTheme +import com.eatssu.design_system.theme.Gray100 import com.eatssu.design_system.theme.Gray600 import timber.log.Timber @@ -114,8 +116,7 @@ internal fun MyReviewListScreen( Surface(modifier = modifier.padding(innerPadding)) { Column( modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp), + .fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, ) { @@ -127,7 +128,9 @@ internal fun MyReviewListScreen( val reviewList = dataState.myReviews ?: emptyList() LazyColumn( - modifier = Modifier.weight(1f) + modifier = Modifier + .weight(1f) + .padding(horizontal = 24.dp), ) { items(reviewList) { item -> ReviewItem( @@ -150,7 +153,9 @@ internal fun MyReviewListScreen( is MyReviewState.NoReview -> { Timber.d("리뷰 없음") Column( - modifier = Modifier.fillMaxSize(), + modifier = Modifier + .fillMaxSize() + .background(Gray100), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewNav.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewNav.kt index 1d338f1f..909a006b 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewNav.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewNav.kt @@ -47,8 +47,8 @@ fun MyReviewNav( val reviewId = prev?.get("reviewId") ?: 0L val initialRating = prev?.get("initialRating") ?: 0 val initialContent = prev?.get("initialContent") ?: "" - val menuLikeInfoNames = - prev?.get>("menuList") ?: arrayListOf() + val menuLikeInfoNames = prev?.get>("menuList") + ?.let { ArrayList(it) } ?: arrayListOf() ModifyReviewScreen( reviewId = reviewId,