Merge branch 'mlykotom/ios-viewmodel-scoping' into kermit

mlykotom · web-flow · commit e2156c60c5ce · 2025-06-25T23:27:06.000+02:00
diff --git a/Fruitties/iosApp/iosApp.xcodeproj/project.pbxproj b/Fruitties/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 70;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -12,8 +12,7 @@
 		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
 		2DBC08C52E0C3291000309C8 /* ViewModelStoreProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBC08C42E0C3291000309C8 /* ViewModelStoreProvider.swift */; };
 		2DBC08C72E0C32CE000309C8 /* ObservableValueWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBC08C62E0C32CE000309C8 /* ObservableValueWrapper.swift */; };
-		2E8773602BC85C2400BF7C40 /* CartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E87735F2BC85C2400BF7C40 /* CartView.swift */; };
-		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
+		2DBC08C92E0C96A4000309C8 /* IOSViewModelStoreOwner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBC08C82E0C96A4000309C8 /* IOSViewModelStoreOwner.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -35,12 +34,15 @@
 		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
 		2DBC08C42E0C3291000309C8 /* ViewModelStoreProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelStoreProvider.swift; sourceTree = "<group>"; };
 		2DBC08C62E0C32CE000309C8 /* ObservableValueWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservableValueWrapper.swift; sourceTree = "<group>"; };
-		2E87735F2BC85C2400BF7C40 /* CartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartView.swift; sourceTree = "<group>"; };
+		2DBC08C82E0C96A4000309C8 /* IOSViewModelStoreOwner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IOSViewModelStoreOwner.swift; sourceTree = "<group>"; };
 		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		2DBC08CA2E0CA0A9000309C8 /* ui */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = ui; sourceTree = "<group>"; };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
 /* Begin PBXFrameworksBuildPhase section */
 		7555FF78242A565900829871 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
@@ -80,13 +82,13 @@
 		7555FF7D242A565900829871 /* iosApp */ = {
 			isa = PBXGroup;
 			children = (
+				2DBC08CA2E0CA0A9000309C8 /* ui */,
 				058557BA273AAA24004C7B11 /* Assets.xcassets */,
-				7555FF82242A565900829871 /* ContentView.swift */,
 				7555FF8C242A565B00829871 /* Info.plist */,
 				2152FB032600AC8F00CF470E /* iOSApp.swift */,
 				058557D7273AAEEB004C7B11 /* Preview Content */,
-				2E87735F2BC85C2400BF7C40 /* CartView.swift */,
 				2DBC08C42E0C3291000309C8 /* ViewModelStoreProvider.swift */,
+				2DBC08C82E0C96A4000309C8 /* IOSViewModelStoreOwner.swift */,
 				2DBC08C62E0C32CE000309C8 /* ObservableValueWrapper.swift */,
 			);
 			path = iosApp;
@@ -116,6 +118,9 @@
 			);
 			dependencies = (
 			);
+			fileSystemSynchronizedGroups = (
+				2DBC08CA2E0CA0A9000309C8 /* ui */,
+			);
 			name = iosApp;
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
@@ -193,9 +198,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2E8773602BC85C2400BF7C40 /* CartView.swift in Sources */,
 				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
-				7555FF83242A565900829871 /* ContentView.swift in Sources */,
+				2DBC08C92E0C96A4000309C8 /* IOSViewModelStoreOwner.swift in Sources */,
 				2DBC08C72E0C32CE000309C8 /* ObservableValueWrapper.swift in Sources */,
 				2DBC08C52E0C3291000309C8 /* ViewModelStoreProvider.swift in Sources */,
 			);
diff --git a/Fruitties/iosApp/iosApp/IOSViewModelStoreOwner.swift b/Fruitties/iosApp/iosApp/IOSViewModelStoreOwner.swift
@@ -0,0 +1,30 @@
+import SwiftUI
+import shared
+
+/// A ViewModelStoreOwner specifically for iOS.
+/// This is used with from iOS with Kotlin Multiplatform (KMP).
+class IOSViewModelStoreOwner: ObservableObject {
+
+    private let viewModelStore = Lifecycle_viewmodelViewModelStore()
+
+    /// This function allows retrieving the androidx ViewModel from the store.
+    func viewModel<T: AnyObject>(
+        key: String? = nil,
+        factory: Lifecycle_viewmodelViewModelProviderFactory,
+        extras: Lifecycle_viewmodelCreationExtras,
+    ) -> T {
+        let vm =
+            viewModelStore.getViewModel(
+                modelClass: T.self,
+                factory: factory,
+                key: key,
+                extras: extras
+            ) as! T
+
+        return vm
+    }
+
+    func clear() {
+        viewModelStore.clear()
+    }
+}
diff --git a/Fruitties/iosApp/iosApp/ViewModelStoreProvider.swift b/Fruitties/iosApp/iosApp/ViewModelStoreProvider.swift
@@ -6,14 +6,12 @@ import shared
 /// Manages the lifecycle of `ViewModel` instances, scoping them to this view hierarchy.
 /// Clears the associated `ViewModelStore` when the provider disappears.
 struct ViewModelStoreOwnerProvider<Content: View>: View {
-    @StateObject private var viewModelStoreOwner: IOSViewModelStoreOwner =
-        IOSViewModelStoreOwner()
+    @StateObject private var viewModelStoreOwner = IOSViewModelStoreOwner()
     
     private let content: Content
 
     /// Initializes the provider with its content, creating a new `IOSViewModelStoreOwner`.
     init(@ViewBuilder content: () -> Content) {
-
         self.content = content()
     }
 
@@ -26,28 +24,4 @@ struct ViewModelStoreOwnerProvider<Content: View>: View {
     }
 }
 
-/// A ViewModelStoreOwner specifically for iOS.
-/// This is used with from iOS with Kotlin Multiplatform (KMP).
-class IOSViewModelStoreOwner: ObservableObject {
-
-    var viewModelStore: Lifecycle_viewmodelViewModelStore =
-        Lifecycle_viewmodelViewModelStore()
 
-    func viewModel<T: AnyObject>(
-        factory: Lifecycle_viewmodelViewModelProviderFactory,
-        extras: Lifecycle_viewmodelCreationExtras,
-    ) -> T {
-        let vm =
-            viewModelStore.getViewModel(
-                modelClass: T.self,
-                factory: factory,
-                extras: extras
-            ) as! T
-
-        return vm
-    }
-
-    func clear() {
-        viewModelStore.clear()
-    }
-}
diff --git a/Fruitties/iosApp/iosApp/ui/CartView.swift b/Fruitties/iosApp/iosApp/ui/CartView.swift
diff --git a/Fruitties/iosApp/iosApp/ui/ContentView.swift b/Fruitties/iosApp/iosApp/ui/ContentView.swift
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import Foundation
 import SwiftUI
 import shared
-import Foundation
 
 struct ContentView: View {
     /// Injects the `IOSViewModelStoreOwner` from the environment, which manages the lifecycle of `ViewModel` instances.
@@ -37,7 +37,7 @@ struct ContentView: View {
             VStack {
                 Text("Fruitties").font(.largeTitle).fontWeight(.bold)
                 NavigationLink {
-                    ViewModelStoreOwnerProvider{
+                    ViewModelStoreOwnerProvider {
                         CartView()
                     }
                 } label: {
@@ -49,12 +49,18 @@ struct ContentView: View {
                 Observing(mainViewModel.homeUiState) { homeUIState in
                     ScrollView {
                         LazyVStack {
-                            ForEach(homeUIState.fruitties, id: \.self) { value in
-                                FruittieView(fruittie: value, addToCart: { fruittie in
-                                    Task {
-                                        mainViewModel.addItemToCart(fruittie: fruittie)
+                            ForEach(homeUIState.fruitties, id: \.self) {
+                                value in
+                                FruittieView(
+                                    fruittie: value,
+                                    addToCart: { fruittie in
+                                        Task {
+                                            mainViewModel.addItemToCart(
+                                                fruittie: fruittie
+                                            )
+                                        }
                                     }
-                                })
+                                )
                             }
                         }
                     }
@@ -70,7 +76,9 @@ struct FruittieView: View {
     var body: some View {
         HStack(alignment: .firstTextBaseline) {
             ZStack {
-                RoundedRectangle(cornerRadius: 15).fill(Color(red: 0.8, green: 0.8, blue: 1.0))
+                RoundedRectangle(cornerRadius: 15).fill(
+                    Color(red: 0.8, green: 0.8, blue: 1.0)
+                )
                 VStack {
                     Text("\(fruittie.name)")
                         .fontWeight(.bold)
@@ -79,9 +87,12 @@ struct FruittieView: View {
                         .frame(maxWidth: .infinity, alignment: .leading)
                 }.padding()
                 Spacer()
-                Button(action: { addToCart(fruittie) }, label: {
-                    Text("Add")
-                }).padding().frame(maxWidth: .infinity, alignment: .trailing)
+                Button(
+                    action: { addToCart(fruittie) },
+                    label: {
+                        Text("Add")
+                    }
+                ).padding().frame(maxWidth: .infinity, alignment: .trailing)
             }.padding([.leading, .trailing])
         }
     }
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/CartViewModel.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/CartViewModel.kt
@@ -31,6 +31,7 @@ class CartViewModel(
     private val repository: DataRepository,
 ) : ViewModel() {
 
+<<<<<<< kermit
     init {
         Logger.i { "CartViewModel created" }
     }
@@ -40,6 +41,8 @@ class CartViewModel(
         Logger.i { "CartViewModel cleared" }
     }
 
+=======
+>>>>>>> mlykotom/ios-viewmodel-scoping
     val cartUiState: StateFlow<CartUiState> =
         repository.cartDetails
             .map { details ->
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt
@@ -25,6 +25,15 @@ fun creationExtras(appContainer: AppContainer): CreationExtras =
         set(APP_CONTAINER_KEY, appContainer)
     }
 
+fun creationExtras(
+    appContainer: AppContainer,
+    additional: MutableCreationExtras.() -> Unit
+): CreationExtras =
+    MutableCreationExtras().apply {
+        set(APP_CONTAINER_KEY, appContainer)
+        additional()
+    }
+
 inline fun <reified T : ViewModel> vmFactory(
     crossinline initializer: CreationExtras.(AppContainer) -> T
 ) =
diff --git a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/IOSViewModelStoreOwner.kt b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/IOSViewModelStoreOwner.kt
@@ -14,11 +14,12 @@ import kotlin.reflect.KClass
 fun ViewModelStore.getViewModel(
     modelClass: ObjCClass,
     factory: ViewModelProvider.Factory,
+    key: String?,
     extras: CreationExtras,
 ): ViewModel {
     @Suppress("UNCHECKED_CAST")
-    val vmClass = (getOriginalKotlinClass(modelClass) as? KClass<ViewModel>)
+    val vmClass = getOriginalKotlinClass(modelClass) as? KClass<ViewModel>
         ?: error("modelClass isn't a ViewModel type")
     val provider = ViewModelProvider.create(this, factory, extras)
-    return provider[vmClass]
-}
+    return key?.let { provider[key, vmClass] } ?: provider[vmClass]
+}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class CartViewModel(`
`31`	`31`	`private val repository: DataRepository,`
`32`	`32`	`) : ViewModel() {`
`33`	`33`
	`34`	`+<<<<<<< kermit`
`34`	`35`	`init {`
`35`	`36`	`Logger.i { "CartViewModel created" }`
`36`	`37`	`}`
`@@ -40,6 +41,8 @@ class CartViewModel(`
`40`	`41`	`Logger.i { "CartViewModel cleared" }`
`41`	`42`	`}`
`42`	`43`
	`44`	`+=======`
	`45`	`+>>>>>>> mlykotom/ios-viewmodel-scoping`
`43`	`46`	`val cartUiState: StateFlow<CartUiState> =`
`44`	`47`	`repository.cartDetails`
`45`	`48`	`.map { details ->`