Format: Spotless

Author: mlykotom

Fruitties/androidApp/src/main/java/com/example/fruitties/android/MainActivity.kt

@@ -45,7 +45,9 @@ data object ListScreenKey : NavKey
 data object CartScreenKey : NavKey
 
 @Serializable
-data class FruittieScreenKey(val id: Long) : NavKey
+data class FruittieScreenKey(
+    val id: Long,
+) : NavKey
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -106,4 +108,3 @@ fun NavApp() {
         },
     )
 }
-

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt

@@ -67,7 +67,6 @@ import com.example.fruitties.viewmodel.creationExtras
 
 @Composable
 fun CartScreen(onNavBarBack: () -> Unit) {
-
     // Instantiate a ViewModel with a dependency on the AppContainer.
     // To make ViewModel compatible with KMP, the ViewModel factory must
     // create an instance without referencing the Android Application.
@@ -230,7 +229,7 @@ private fun CartScreenPreview() {
                         ),
                         count = 100,
                     ),
-                )
+                ),
             ),
             decreaseCountClick = {},
             increaseCountClick = {},
@@ -252,7 +251,7 @@ private fun CartItemPreview() {
                 count = 4,
             ),
             increaseCountClick = {},
-            decreaseCountClick = {}
+            decreaseCountClick = {},
         )
     }
-}
+}

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt

@@ -37,7 +37,7 @@ import com.example.fruitties.viewmodel.creationExtras
 @Composable
 fun FruittieScreen(
     fruittieId: Long,
-    onNavBarBack: () -> Unit
+    onNavBarBack: () -> Unit,
 ) {
     val app = LocalContext.current.applicationContext as App
 
@@ -53,7 +53,7 @@ fun FruittieScreen(
     FruittieScreen(
         state = state,
         onNavBarBack = onNavBarBack,
-        addToCart = { viewModel.addToCart(it) }
+        addToCart = { viewModel.addToCart(it) },
     )
 }
 
@@ -62,15 +62,15 @@ fun FruittieScreen(
 fun FruittieScreen(
     state: FruittieViewModel.State,
     addToCart: (Fruittie) -> Unit,
-    onNavBarBack: () -> Unit
+    onNavBarBack: () -> Unit,
 ) {
     Scaffold(
         topBar = {
             TopAppBar(
                 title = {
                     Text(
                         (state as? FruittieViewModel.State.Content)?.fruittie?.name
-                            ?: stringResource(R.string.loading)
+                            ?: stringResource(R.string.loading),
                     )
                 },
                 actions = {
@@ -94,29 +94,29 @@ fun FruittieScreen(
 
             FloatingActionButton(
                 shape = MaterialTheme.shapes.extraLarge,
-                onClick = { addToCart(state.fruittie) }
+                onClick = { addToCart(state.fruittie) },
             ) {
                 Row(
                     modifier = Modifier.padding(
-                        horizontal = 16.dp
+                        horizontal = 16.dp,
                     ),
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Icon(
                         Icons.Filled.ShoppingCart,
-                        contentDescription = null
+                        contentDescription = null,
                     )
                     Spacer(Modifier.width(8.dp))
                     Text(text = stringResource(R.string.add_to_cart))
                 }
             }
-        }
+        },
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier
                 .padding(it)
-                .fillMaxSize()
+                .fillMaxSize(),
         ) {
             when (state) {
                 FruittieViewModel.State.Loading -> CircularProgressIndicator()
@@ -127,4 +127,4 @@ fun FruittieScreen(
             }
         }
     }
-}
+}

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt

@@ -82,7 +82,7 @@ fun ListScreen(
                 scrollBehavior = topAppBarScrollBehavior,
                 title = {
                     Text(text = stringResource(R.string.frutties))
-                }
+                },
             )
         },
         floatingActionButton = {
@@ -92,11 +92,11 @@ fun ListScreen(
             ) {
                 Row(
                     modifier = Modifier.padding(horizontal = 16.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Icon(
                         Icons.Filled.ShoppingCart,
-                        contentDescription = null
+                        contentDescription = null,
                     )
                     Spacer(Modifier.width(8.dp))
                     Text(text = stringResource(R.string.view_cart, uiState.cartItemCount))
@@ -135,8 +135,7 @@ fun FruittieItem(
         modifier = modifier
             .clickable {
                 onClick(item)
-            }
-            .padding(16.dp),
+            }.padding(16.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Column(

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/DataRepository.kt

@@ -62,15 +62,12 @@ class DataRepository(
         return loadData()
     }
 
-    suspend fun getFruittie(id: Long): Fruittie? {
-        return database.fruittieDao().getFruittie(id)
-    }
+    suspend fun getFruittie(id: Long): Fruittie? = database.fruittieDao().getFruittie(id)
 
-    fun fruittieInCart(id: Long): Flow<Int> {
-        return cartDataStore.cart.map { cart ->
+    fun fruittieInCart(id: Long): Flow<Int> =
+        cartDataStore.cart.map { cart ->
             cart.items.find { it.id == id }?.count ?: 0
         }
-    }
 
     fun loadData(): Flow<List<Fruittie>> = database.fruittieDao().getAllAsFlow()
 

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/CartViewModel.kt

@@ -31,7 +31,6 @@ import kotlinx.coroutines.launch
 class CartViewModel(
     private val repository: DataRepository,
 ) : ViewModel() {
-
     init {
         Logger.v { "CartViewModel created" }
     }

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/FruittieViewModel.kt

@@ -16,18 +16,18 @@ class FruittieViewModel(
     private val fruittieId: Long,
     private val repository: DataRepository,
 ) : ViewModel() {
-
     sealed class State {
         data object Loading : State()
+
         data class Content(
             val inCart: Int,
-            val fruittie: Fruittie
+            val fruittie: Fruittie,
         ) : State()
     }
 
     val state = combine(
         flow { emit(repository.getFruittie(fruittieId)) }.filterNotNull(),
-        repository.fruittieInCart(fruittieId)
+        repository.fruittieInCart(fruittieId),
     ) { fruittie, inCart ->
         State.Content(inCart, fruittie)
     }.stateIn(
@@ -46,10 +46,10 @@ class FruittieViewModel(
         val Factory = fruittiesViewModelFactory {
             FruittieViewModel(
                 fruittieId = get(FRUITTIE_ID_KEY) ?: error("Expected fruittieId!"),
-                repository = it.dataRepository
+                repository = it.dataRepository,
             )
         }
 
         val FRUITTIE_ID_KEY = CreationExtras.Key<Long>()
     }
-}
+}

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/MainViewModel.kt

@@ -31,7 +31,6 @@ import kotlinx.coroutines.launch
 class MainViewModel(
     private val repository: DataRepository,
 ) : ViewModel() {
-
     init {
         Logger.v { "MainViewModel created" }
     }

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt

@@ -16,19 +16,17 @@ fun creationExtras(appContainer: AppContainer): CreationExtras =
 
 fun creationExtras(
     appContainer: AppContainer,
-    additional: MutableCreationExtras.() -> Unit
+    additional: MutableCreationExtras.() -> Unit,
 ): CreationExtras =
     MutableCreationExtras().apply {
         set(APP_CONTAINER_KEY, appContainer)
         additional()
     }
 
-inline fun <reified T : ViewModel> fruittiesViewModelFactory(
-    crossinline initializer: CreationExtras.(AppContainer) -> T
-) =
+inline fun <reified T : ViewModel> fruittiesViewModelFactory(crossinline initializer: CreationExtras.(AppContainer) -> T) =
     viewModelFactory {
         initializer {
             val appContainer = this[APP_CONTAINER_KEY] as AppContainer
             this.initializer(appContainer)
         }
-    }
+    }

Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/IOSViewModelStoreOwner.kt

@@ -23,4 +23,4 @@ fun ViewModelStore.getViewModel(
         ?: error("modelClass isn't a ViewModel type")
     val provider = ViewModelProvider.create(this, factory, extras)
     return key?.let { provider[key, vmClass] } ?: provider[vmClass]
-}
+}