Add back view model in DI for iOS

Author: yschimke

common/src/iosMain/kotlin/dev/johnoreilly/common/di/IosApplicationComponent.kt

@@ -4,6 +4,9 @@ import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import dev.johnoreilly.common.database.AppDatabase
 import dev.johnoreilly.common.database.dbFileName
+import dev.johnoreilly.common.viewmodel.CountriesViewModelShared
+import dev.johnoreilly.common.viewmodel.NetworksViewModelShared
+import dev.johnoreilly.common.viewmodel.StationsViewModelShared
 import io.ktor.client.engine.darwin.Darwin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -20,6 +23,10 @@ import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 @SingleIn(AppScope::class)
 abstract class IosApplicationComponent: SharedApplicationComponent {
 
+    abstract val countriesViewModel: CountriesViewModelShared
+    abstract val networksViewModel: NetworksViewModelShared
+    abstract val stationsViewModel: StationsViewModelShared
+
     override fun httpClientEngine() = Darwin.create()
 
     override fun appDatabase() = createRoomDatabase()

ios/BikeShare/BikeShare/ContentView.swift

@@ -6,21 +6,21 @@ import KMPObservableViewModelSwiftUI
 
 
 struct ContentView : View {
-    let applicationCompoonent: IosApplicationComponent
+    let applicationComponent: IosApplicationComponent
 
     @ObservedViewModel var viewModel: CountriesViewModelShared
     @State var query: String = ""
 
-    init(applicationCompoonent: IosApplicationComponent) {
-        self.applicationCompoonent = applicationCompoonent
-        self.viewModel = applicationCompoonent.countriesViewModel
+    init(applicationComponent: IosApplicationComponent) {
+        self.applicationComponent = applicationComponent
+        self.viewModel = applicationComponent.countriesViewModel
     }
 
     var body: some View {
         NavigationView {
             List {
                 ForEach(viewModel.countryList.filter { query.isEmpty ||  $0.displayName.contains(query)}, id: \.self) { country in
-                    NavigationLink(destination: NetworkListView(applicationCompoonent: applicationCompoonent, countryCode: country.code)) {
+                    NavigationLink(destination: NetworkListView(applicationComponent: applicationComponent, countryCode: country.code)) {
                         HStack {
                             Text(countryFlag(from: country.code))
                             Text(country.displayName).font(.headline)
@@ -37,20 +37,20 @@ struct ContentView : View {
 
 
 struct NetworkListView: View {
-    let applicationCompoonent: IosApplicationComponent
+    let applicationComponent: IosApplicationComponent
     let countryCode: String
 
     @ObservedViewModel var viewModel: NetworksViewModelShared
 
-    init(applicationCompoonent: IosApplicationComponent, countryCode: String) {
-        self.applicationCompoonent = applicationCompoonent
+    init(applicationComponent: IosApplicationComponent, countryCode: String) {
+        self.applicationComponent = applicationComponent
         self.countryCode = countryCode
-        self.viewModel = applicationCompoonent.networksViewModel
+        self.viewModel = applicationComponent.networksViewModel
     }
 
     var body: some View {
         List(viewModel.networkList) { network in
-            NavigationLink(destination: StationListTabView(applicationCompoonent: applicationCompoonent, network: network)) {
+            NavigationLink(destination: StationListTabView(applicationComponent: applicationComponent, network: network)) {
                 Text("\(network.name) (\(network.city))").font(.subheadline)
             }
         }
@@ -63,15 +63,15 @@ struct NetworkListView: View {
 
 
 struct StationListTabView: View {
-    let applicationCompoonent: IosApplicationComponent
+    let applicationComponent: IosApplicationComponent
     var network: Network
 
     @ObservedViewModel var viewModel: StationsViewModelShared
 
-    init(applicationCompoonent: IosApplicationComponent, network: Network) {
-        self.applicationCompoonent = applicationCompoonent
+    init(applicationComponent: IosApplicationComponent, network: Network) {
+        self.applicationComponent = applicationComponent
         self.network = network
-        self.viewModel = applicationCompoonent.stationsViewModel
+        self.viewModel = applicationComponent.stationsViewModel
     }
 
     var body: some View {

ios/BikeShare/BikeShare/SceneDelegate.swift

@@ -20,10 +20,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
         // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
 
-        let applicationCompoonent = IosApplicationComponentCreateComponentKt.create()
+        let applicationComponent = IosApplicationComponentCreateComponentKt.create()
 
         // Create the SwiftUI view that provides the window contents.
-        let contentView = ContentView(applicationCompoonent: applicationCompoonent)
+        let contentView = ContentView(applicationComponent: applicationComponent)
 
         // Use a UIHostingController as window root view controller.
         if let windowScene = scene as? UIWindowScene {