[Jetsnack] Fix review comments

Author: JolandaVerhoef

Jetsnack/app/build.gradle

@@ -80,6 +80,8 @@ dependencies {
 
     implementation Libs.Kotlin.stdlib
 
+    implementation Libs.Coroutines.core
+
     implementation Libs.AndroidX.coreKtx
 
     implementation Libs.AndroidX.Compose.runtime

Jetsnack/app/src/main/java/com/example/jetsnack/model/SnackCollection.kt

@@ -101,6 +101,7 @@ private val cart = listOf(
     OrderLine(snacks[8], 1)
 )
 
+@Immutable
 data class OrderLine(
     val snack: Snack,
     val count: Int

Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/Cart.kt

@@ -128,8 +128,13 @@ private fun CartContent(
     onSnackClick: (Long) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val snackCountFormattedString = ContextAmbient.current.resources
-        .getQuantityString(R.plurals.cart_order_count, orderLines.size, orderLines.size)
+    val resources = ContextAmbient.current.resources
+    val snackCountFormattedString = remember(orderLines.size, resources) {
+        resources.getQuantityString(
+            R.plurals.cart_order_count,
+            orderLines.size, orderLines.size
+        )
+    }
     LazyColumn(modifier) {
         item {
             Spacer(Modifier.statusBarsHeight(additional = 56.dp))
@@ -220,7 +225,7 @@ fun CartItem(
                 end.linkTo(parent.end)
             }.padding(top = 12.dp)
         ) {
-            Icon(asset = Icons.Filled.Close, tint = JetsnackTheme.colors.brand)
+            Icon(asset = Icons.Filled.Close, tint = JetsnackTheme.colors.iconSecondary)
         }
         Text(
             text = snack.tagline,
@@ -275,7 +280,6 @@ fun CartItem(
     }
 }
 
-// TODO: Hoist state instead of using hard-coded total price
 @Composable
 fun SummaryItem(
     subtotal: Long,
@@ -373,14 +377,28 @@ private fun CheckoutBar(modifier: Modifier = Modifier) {
 @Composable
 fun CartPreview() {
     JetsnackTheme {
-        Cart(onSnackClick = { })
+        Cart(
+            orderLines = SnackRepo.getCart(),
+            removeSnack = {},
+            increaseItemCount = {},
+            decreaseItemCount = {},
+            inspiredByCart = SnackRepo.getInspiredByCart(),
+            onSnackClick = {}
+        )
     }
 }
 
 @Preview("Cart • Dark Theme")
 @Composable
 fun CartDarkPreview() {
     JetsnackTheme(darkTheme = true) {
-        Cart(onSnackClick = { })
+        Cart(
+            orderLines = SnackRepo.getCart(),
+            removeSnack = {},
+            increaseItemCount = {},
+            decreaseItemCount = {},
+            inspiredByCart = SnackRepo.getInspiredByCart(),
+            onSnackClick = { }
+        )
     }
 }

Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/cart/CartViewModel.kt

@@ -22,6 +22,11 @@ import com.example.jetsnack.model.SnackRepo
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
+/**
+ * Holds the contents of the cart and allows changes to it.
+ *
+ * TODO: Move data to Repository so it can be displayed and changed consistently throughout the app.
+ */
 class CartViewModel : ViewModel() {
     private val _orderLines: MutableStateFlow<List<OrderLine>> = MutableStateFlow(SnackRepo.getCart())
     val orderLines: StateFlow<List<OrderLine>> get() = _orderLines

Jetsnack/app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   Copyright 2020 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except

Jetsnack/build.gradle

@@ -56,8 +56,7 @@ subprojects {
             freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
             // Opt-in to experimental compose APIs
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
-
-            // Enable experimental coroutines APIs
+            // Enable experimental coroutines APIs, including collectAsState()
             freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
         }
     }

Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt

@@ -37,7 +37,7 @@ object Libs {
     }
 
     object Coroutines {
-        private const val version = "1.3.9"
+        private const val version = "1.4.0"
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
         const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
         const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"