Merge branch 'main' into mlykotom/fruittie-screen-and-ios-designs

# Conflicts:
#	Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt

Author: mlykotom

Fruitties/iosApp/iosApp/IOSViewModelStoreOwner.swift

@@ -3,15 +3,16 @@ import shared
 
 /// A ViewModelStoreOwner specifically for iOS.
 /// This is used with from iOS with Kotlin Multiplatform (KMP).
-class IOSViewModelStoreOwner: ObservableObject {
+class IOSViewModelStoreOwner: ObservableObject, SwiftViewModelStoreOwner {
 
-    private let viewModelStore = Lifecycle_viewmodelViewModelStore()
+    var viewModelStore: Lifecycle_viewmodelViewModelStore =
+        Lifecycle_viewmodelViewModelStore()
 
     /// This function allows retrieving the androidx ViewModel from the store.
-    func viewModel<T: AnyObject>(
+    func viewModel<T: Lifecycle_viewmodelViewModel>(
         key: String? = nil,
         factory: Lifecycle_viewmodelViewModelProviderFactory,
-        extras: Lifecycle_viewmodelCreationExtras
+        extras: Lifecycle_viewmodelCreationExtras? = nil
     ) -> T {
         do {
             return try viewModelStore.getViewModel(

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

@@ -32,6 +32,7 @@ class CartViewModel(
     private val repository: DataRepository,
 ) : ViewModel() {
     init {
+        // Leaving the comments here to show when the ViewModel is created.
         Logger.v { "CartViewModel created" }
     }
 

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

@@ -3,24 +3,36 @@ package com.example.fruitties.di.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.viewmodel.CreationExtras
 import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.ObjCClass
 import kotlinx.cinterop.getOriginalKotlinClass
 import kotlin.reflect.KClass
 
+/**
+ * This function allows retrieving any ViewModel from Swift Code with generics.
+ * We only get [ObjCClass] type for the [modelClass], because the interop between Kotlin and Swift
+ * code doesn't preserve the generic class, but we can retrieve the original KClass in Kotlin.
+ */
 @Suppress("unused") // Android Studio is not aware of iOS usage.
 @OptIn(BetaInteropApi::class)
 @Throws(IllegalStateException::class)
 fun ViewModelStore.getViewModel(
     modelClass: ObjCClass,
     factory: ViewModelProvider.Factory,
     key: String?,
-    extras: CreationExtras,
+    extras: CreationExtras? = null,
 ): ViewModel {
     @Suppress("UNCHECKED_CAST")
     val vmClass = getOriginalKotlinClass(modelClass) as? KClass<ViewModel>
         ?: error("modelClass isn't a ViewModel type")
-    val provider = ViewModelProvider.create(this, factory, extras)
+    val provider = ViewModelProvider.create(this, factory, extras ?: CreationExtras.Empty)
     return key?.let { provider[key, vmClass] } ?: provider[vmClass]
 }
+
+/**
+ * The ViewModelStoreOwner isn't used anywhere in the project, therefore it's not visible for Swift by default.
+ */
+@Suppress("unused")
+interface SwiftViewModelStoreOwner : ViewModelStoreOwner