Use StateObject for IOSViewModelSToreOwner directly

Author: mlykotom

Fruitties/iosApp/iosApp/IOSViewModelStoreOwner.swift

@@ -1,8 +1,7 @@
 import SwiftUI
 import shared
 
-/// A ViewModelStoreOwner specifically for iOS.
-/// This is used with from iOS with Kotlin Multiplatform (KMP).
+/// A ViewModelStoreOwner specifically for iOS to be an ObservableObject.
 class IOSViewModelStoreOwner: ObservableObject, ViewModelStoreOwner {
 
     var viewModelStore = ViewModelStore()
@@ -25,7 +24,13 @@ class IOSViewModelStoreOwner: ObservableObject, ViewModelStoreOwner {
         }
     }
 
+    /// This can be called from outside when using the `ViewModelStoreOwnerProvider`
     func clear() {
         viewModelStore.clear()
     }
+
+    /// This is called when this class is used as a `@StateObject`
+    deinit {
+        viewModelStore.clear()
+    }
 }

Fruitties/iosApp/iosApp/ui/CartView.swift

@@ -20,7 +20,7 @@ import shared
 
 struct CartView: View {
     /// Injects the `IOSViewModelStoreOwner` from the environment, which manages the lifecycle of `ViewModel` instances.
-    @EnvironmentObject var viewModelStoreOwner: IOSViewModelStoreOwner
+    @StateObject var viewModelStoreOwner = IOSViewModelStoreOwner()
 
     /// Injects the `AppContainer` from the environment, providing access to application-wide dependencies.
     @EnvironmentObject var appContainer: ObservableValueWrapper<AppContainer>

Fruitties/iosApp/iosApp/ui/ContentView.swift

@@ -39,9 +39,7 @@ struct ContentView: View {
                         value in
                         HStack {
                             NavigationLink {
-                                ViewModelStoreOwnerProvider {
-                                    FruittieScreen(fruittie: value)
-                                }
+                                FruittieScreen(fruittie: value)
                             } label: {
                                 FruittieView(fruittie: value)
                             }
@@ -62,9 +60,7 @@ struct ContentView: View {
             .toolbar {
                 ToolbarItem(placement: .navigationBarTrailing) {
                     NavigationLink {
-                        ViewModelStoreOwnerProvider {
-                            CartView()
-                        }
+                        CartView()
                     } label: {
                         Observing(mainViewModel.homeUiState) { homeUIState in
                             let total = homeUIState.cartItemCount

Fruitties/iosApp/iosApp/ui/FruittieScreen.swift

@@ -19,7 +19,7 @@ import SwiftUI
 import shared
 
 struct FruittieScreen: View {
-    @EnvironmentObject var viewModelStoreOwner: IOSViewModelStoreOwner
+    @StateObject var viewModelStoreOwner = IOSViewModelStoreOwner()
     @EnvironmentObject var appContainer: ObservableValueWrapper<AppContainer>
     let fruittie: Fruittie