[chore] #4 코드리뷰 반영

AND-SOPT-ANDROID · Oct 31, 2024 · 34bdb6a · 34bdb6a
1 parent 34eb143
commit 34bdb6a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/app/src/main/java/org/sopt/and/presentation/ui/home/HomeContract.kt b/app/src/main/java/org/sopt/and/presentation/ui/home/HomeContract.kt
@@ -1,5 +1,6 @@
 package org.sopt.and.presentation.ui.home
 
+import okhttp3.internal.immutableListOf
 import org.sopt.and.presentation.util.UiEffect
 import org.sopt.and.presentation.util.UiEvent
 import org.sopt.and.presentation.util.UiState
@@ -10,15 +11,15 @@ class HomeContract {
     }
 
     enum class HomeStatus {
-        Idle, Success, Fail
+        Loading, Success, Fail
     }
 
     data class HomeState(
-        val bannerImgList: List<String> = listOf(),
+        val bannerImgList: List<String> = immutableListOf(),
         val currentBannerPage: Int = 0,
-        val editorRecommendedList: List<String> = listOf(),
-        val todayTopRankingList: List<String> = listOf(),
-        val homeStatus: HomeStatus = HomeStatus.Idle
+        val editorRecommendedList: List<String> = immutableListOf(),
+        val todayTopRankingList: List<String> = immutableListOf(),
+        val homeStatus: HomeStatus = HomeStatus.Loading
     ) : UiState
 
     sealed class HomeSideEffect : UiEffect {

diff --git a/app/src/main/java/org/sopt/and/presentation/ui/home/HomeScreen.kt b/app/src/main/java/org/sopt/and/presentation/ui/home/HomeScreen.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -155,21 +154,18 @@ fun HomeBannerItemCountText(
     currentPage: String,
     pageCount: String
 ) {
-    Row(
-        modifier = Modifier
+    Text(
+        text = stringResource(
+            id = R.string.home_banner_page_count,
+            currentPage,
+            pageCount
+        ),
+        modifier = modifier
             .clip(RoundedCornerShape(15.dp))
             .background(Gray100)
-            .padding(horizontal = 8.dp, vertical = 4.dp)
-    ) {
-        Text(
-            text = stringResource(
-                id = R.string.home_banner_page_count,
-                currentPage,
-                pageCount
-            ),
-            fontSize = 10.sp
-        )
-    }
+            .padding(horizontal = 8.dp, vertical = 4.dp),
+        fontSize = 10.sp
+    )
 }
 
 @Composable
@@ -226,14 +222,12 @@ fun TodayTopRankingImgList(
 @Composable
 fun HomePreview() {
     ANDANDROIDTheme {
-        val homeViewModel = HomeViewModel()
-
         HomeScreen(
-            bannerImgList = homeViewModel.mockBannerItem,
+            bannerImgList = listOf(""),
             numPages = "6",
             onCurrentPageChanged = { },
-            editorRecommendedImgList = homeViewModel.mockEditorRecommendedItem,
-            todayTopRankingImgList = homeViewModel.mockTodayTopRankingItem
+            editorRecommendedImgList = listOf(""),
+            todayTopRankingImgList = listOf("")
         )
     }
 }
diff --git a/app/src/main/java/org/sopt/and/presentation/ui/my/MyScreen.kt b/app/src/main/java/org/sopt/and/presentation/ui/my/MyScreen.kt
@@ -2,6 +2,7 @@ package org.sopt.and.presentation.ui.my
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -41,16 +42,13 @@ fun MyScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .background(Gray300)
-                .padding(horizontal = 15.dp, vertical = 20.dp)
+                .padding(horizontal = 15.dp, vertical = 20.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             MyProfile(userEmail = userName)
 
-            Spacer(modifier = Modifier.height(8.dp))
-
             MyPurchaseBox(information = stringResource(R.string.my_purchase_event))
 
-            Spacer(modifier = Modifier.height(8.dp))
-
             MyPurchaseBox(information = stringResource(R.string.my_purchase_ticket))
         }