Merge pull request #6 from AND-SOPT-ANDROID/week3

[feat] 3주차 과제
AND-SOPT-ANDROID · Nov 11, 2024 · 41f912f · 41f912f
2 parents fe06e54 + ad7dfa6
commit 41f912f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/app/src/main/java/org/sopt/and/Constraints.kt b/app/src/main/java/org/sopt/and/Constraints.kt
@@ -31,7 +31,6 @@ sealed class Route {
         val email: String
     ) : Route()
 
-
     @Serializable
     data object Search : Route()
 }
diff --git a/app/src/main/java/org/sopt/and/presentation/home/HomeScreen.kt b/app/src/main/java/org/sopt/and/presentation/home/HomeScreen.kt
@@ -76,10 +76,18 @@ fun HomeScreen(
         }
         item {
             BannerViewPager(pagerState = pagerState, images = homeViewModel.bannerImages)
+        }
+        item {
             Spacer(modifier = Modifier.height(20.dp))
+        }
+        item {
             HomeViewContentsTitle(text = stringResource(R.string.home_recommend_title))
             HomeViewLazyRow(images = homeViewModel.recommendImages)
+        }
+        item {
             Spacer(modifier = Modifier.height(20.dp))
+        }
+        item {
             HomeViewContentsTitle(text = stringResource(R.string.home_top20_title), hasIcon = false)
             HomeViewTop20LazyRow(images = homeViewModel.top20Images)
         }

diff --git a/app/src/main/java/org/sopt/and/presentation/home/componenet/CategoryBar.kt b/app/src/main/java/org/sopt/and/presentation/home/componenet/CategoryBar.kt
@@ -12,11 +12,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
+import kotlinx.collections.immutable.persistentListOf
 import org.sopt.and.R
 
 @Composable
 fun CategoryBar(modifier: Modifier = Modifier) {
-    val categories = listOf(
+    val categories = persistentListOf(
         R.string.home_category_classic,
         R.string.home_category_drama,
         R.string.home_category_variety,

diff --git a/app/src/main/java/org/sopt/and/presentation/navigation/BottomNavItem.kt b/app/src/main/java/org/sopt/and/presentation/navigation/BottomNavItem.kt
@@ -9,29 +9,18 @@ import org.sopt.and.Route
 
 
 sealed class BottomNavItem(
-    val name: String,
-    val icon: ImageVector,
-    val route: Any
+    val name: String, val icon: ImageVector, val route: Any
 ) {
-    data object Home :
-        BottomNavItem(
-            "홈",
-            Icons.Default.Home,
-            Route.Home
-        )
+    data object Home : BottomNavItem(
+        name = "홈", icon = Icons.Default.Home, route = Route.Home
+    )
 
-    data object Search :
-        BottomNavItem(
-            "검색",
-            Icons.Default.Search,
-            Route.Search
-        )
+    data object Search : BottomNavItem(
+        name = "검색", icon = Icons.Default.Search, route = Route.Search
+    )
 
 
-    data object MyPage :
-        BottomNavItem(
-            "MY",
-            Icons.Default.Person,
-            Route.MyPage("")
-        )
+    data object MyPage : BottomNavItem(
+        name = "MY", icon = Icons.Default.Person, route = Route.MyPage("")
+    )
 }
diff --git a/app/src/main/java/org/sopt/and/presentation/signin/SignInScreen.kt b/app/src/main/java/org/sopt/and/presentation/signin/SignInScreen.kt
@@ -40,11 +40,11 @@ import org.sopt.and.util.noRippleClickable
 @Composable
 fun SignInScreen(
     signInViewModel: SignInViewModel = viewModel(),
+    modifier: Modifier = Modifier,
     email: String = "",
     password: String = "",
     navigateToSignUp: () -> Unit = {},
     navigateToMyPage: (Any?) -> Unit = {},
-    modifier: Modifier = Modifier
 ) {
 
     val userEmail = remember { mutableStateOf("") }