[악어] 장바구니 미션 제출합니다.

app/src/main/java/nextstep/shoppingcart/presentation/CartActivity.kt

@@ -15,20 +15,22 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import nextstep.shoppingcart.data.Cart
 import nextstep.shoppingcart.domain.model.CartItem
-import nextstep.shoppingcart.presentation.components.CartLayout
+import nextstep.shoppingcart.presentation.components.screens.CartScreen
 import nextstep.shoppingcart.presentation.ui.theme.AndroidshoppingcartTheme
 
 class CartActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
+            var cart by remember { mutableStateOf(Cart) }
             var cartItems by remember { mutableStateOf(Cart.items) }
             AndroidshoppingcartTheme {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    CartLayout(
+                    CartScreen(
                         navigation = { finish() },
                         modifier = Modifier.padding(innerPadding),
                         cartItems = cartItems,
+                        cart = cart,
                         onIncrease = {
                             onIncrease(it)
                             cartItems = Cart.items

app/src/main/java/nextstep/shoppingcart/presentation/DetailActivity.kt

@@ -9,7 +9,7 @@ import nextstep.shoppingcart.data.CachedProductDataSource
 import nextstep.shoppingcart.data.CachedProductRepository
 import nextstep.shoppingcart.data.Cart
 import nextstep.shoppingcart.domain.model.Product
-import nextstep.shoppingcart.presentation.components.DetailLayout
+import nextstep.shoppingcart.presentation.components.screens.DetailScreen
 import nextstep.shoppingcart.presentation.ui.theme.AndroidshoppingcartTheme
 
 class DetailActivity : ComponentActivity() {
@@ -18,7 +18,7 @@ class DetailActivity : ComponentActivity() {
         val product = fetchProduct()
         setContent {
             AndroidshoppingcartTheme {
-                DetailLayout(
+                DetailScreen(
                     product = product,
                     navigation = { navigateBack() },
                     action = { addToCart(product = product) }

app/src/main/java/nextstep/shoppingcart/presentation/HomeActivity.kt

@@ -5,7 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import nextstep.shoppingcart.data.CachedProductDataSource
 import nextstep.shoppingcart.data.CachedProductRepository
-import nextstep.shoppingcart.presentation.components.ListLayout
+import nextstep.shoppingcart.presentation.components.screens.HomeScreen
 import nextstep.shoppingcart.ui.theme.ShoppingCartTheme
 
 class HomeActivity : ComponentActivity() {
@@ -15,7 +15,7 @@ class HomeActivity : ComponentActivity() {
 
         setContent {
             ShoppingCartTheme {
-                ListLayout(
+                HomeScreen(
                     products = repository.fetchProducts(),
                     action = { navigateToCart() },
                     onItemClick = { productId -> navigateToDetail(productId) }

app/src/main/java/nextstep/shoppingcart/presentation/components/BottomBar.kt

@@ -0,0 +1,41 @@
+package nextstep.shoppingcart.presentation.components
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.sp
+import nextstep.signup.R
+
+@Composable
+fun BottomBar(
+    text: String = stringResource(R.string.add_to_cart),
+    modifier: Modifier = Modifier
+) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = modifier
+    ) {
+        Text(
+            text = text,
+            fontSize = 20.sp,
+            style =
+            TextStyle(
+                color = Color.White,
+                fontWeight = FontWeight.Bold
+            )
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun BottomBarPreview() {
+    BottomBar()
+}

app/src/main/java/nextstep/shoppingcart/presentation/components/CartItemList.kt

@@ -1,13 +1,10 @@
 package nextstep.shoppingcart.presentation.components
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -19,13 +16,11 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -36,76 +31,44 @@ import coil.compose.AsyncImage
 import nextstep.shoppingcart.domain.model.CartItem
 import nextstep.shoppingcart.domain.model.Price
 import nextstep.shoppingcart.domain.model.Product
-import nextstep.signup.R
 
 @Composable
-fun ShoppingCartScreen(
+fun CartItemList(
     items: List<CartItem> = emptyList(),
     onIncrease: (CartItem) -> Unit = {},
     onDecrease: (CartItem) -> Unit = {},
     onClear: (CartItem) -> Unit = {},
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val totalPrice = items.sumOf { it.product.price * it.count }
-
-    Scaffold(
-        bottomBar = {
-            Box(
-                modifier =
-                Modifier
+    LazyColumn(
+        modifier = modifier
+    ) {
+        items(items) { item ->
+            CartItem(
+                item = item,
+                onIncrease = onIncrease,
+                onDecrease = onDecrease,
+                onClear = onClear,
+                modifier = Modifier
                     .fillMaxWidth()
-                    .background(Color(0xFF2196F3))
-                    .padding(16.dp),
-                contentAlignment = Alignment.Center
-            ) {
-                Text(
-                    text = stringResource(R.string.order, Price(totalPrice).format()),
-                    fontSize = 20.sp,
-                    style =
-                    TextStyle(
-                        color = Color.White,
-                        fontWeight = FontWeight.Bold
-                    )
-                )
-            }
-        }
-    ) { innerPadding ->
-        Column(
-            modifier =
-            Modifier
-                .fillMaxSize()
-                .padding(innerPadding)
-        ) {
-            LazyColumn {
-                items(items) { item ->
-                    CartItemView(
-                        item = item,
-                        onIncrease = onIncrease,
-                        onDecrease = onDecrease,
-                        onClear = onClear
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.weight(1f))
+                    .padding(8.dp)
+                    .border(1.dp, Color.Gray, shape = RoundedCornerShape(4.dp)),
+            )
         }
     }
 }
 
+
 @Composable
-fun CartItemView(
+fun CartItem(
     item: CartItem,
     onIncrease: (CartItem) -> Unit = {},
     onDecrease: (CartItem) -> Unit = {},
     onClear: (CartItem) -> Unit = {},
     modifier: Modifier = Modifier
 ) {
     Row(
-        modifier =
-        Modifier
-            .fillMaxWidth()
-            .padding(8.dp)
-            .border(1.dp, Color.Gray, shape = RoundedCornerShape(4.dp)),
+        modifier = modifier,
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
@@ -191,5 +154,5 @@ private fun ShoppingCartPreview() {
                 count = 2
             )
         )
-    ShoppingCartScreen(items)
+    CartItemList(items)
 }

app/src/main/java/nextstep/shoppingcart/presentation/components/CounterForm.kt

@@ -23,7 +23,10 @@ fun CounterForm(
     onDecrease: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+    ) {
         Box(
             modifier =
             Modifier