Merge pull request #947 from yimajo/add_kmpclient_live

Extract `KMPClientLive` target from `KMPClient` target

app-ios/App/App.swift

@@ -2,6 +2,7 @@ import App
 import ComposableArchitecture
 import SwiftUI
 import Theme
+import KMPClientLive
 
 final class AppDelegate: NSObject, UIApplicationDelegate {
     let store = Store(

app-ios/Package.swift

@@ -73,6 +73,7 @@ let package = Package(
                 .eventMapFeature,
                 .tca,
                 .kmpClient,
+                .KMPClientLive,
                 .licenseList,
             ]
         ),
@@ -85,14 +86,20 @@ let package = Package(
             name: "KMPClient",
             dependencies: [
                 .kmpModule,
-                .firebaseAuth,
-                .firebaseRemoteConfig,
                 .tca,
                 .model,
-                .licenseList,
             ]
         ),
-
+
+        .target(
+            name: "KMPClientLive",
+            dependencies: [
+                .kmpClient,
+                .firebaseAuth,
+                .firebaseRemoteConfig,
+            ]
+        ),
+
         .target(
             name: "EventKitClient",
             dependencies: [
@@ -289,6 +296,7 @@ extension Target.Dependency {
     static let profileCardFeature: Target.Dependency = "ProfileCardFeature"
     static let kmpModule: Target.Dependency = "KmpModule"
     static let kmpClient: Target.Dependency = "KMPClient"
+    static let KMPClientLive: Target.Dependency = "KMPClientLive"
     static let eventKitClient: Target.Dependency = "EventKitClient"
     static let theme: Target.Dependency = "Theme"
     static let commonComponents: Target.Dependency = "CommonComponents"

app-ios/Sources/App/AppDelegate.swift

@@ -3,6 +3,7 @@ import KMPClient
 
 @Reducer
 public struct AppDelegateReducer {
+    @Dependency(\.firebaseAppClient) var firebaseAppClient
     public struct State: Equatable {
       public init() {}
     }
@@ -15,7 +16,7 @@ public struct AppDelegateReducer {
         Reduce { state, action in
             switch action {
             case .didFinishLaunching:
-                prepareFirebase()
+                firebaseAppClient.prepareFirebase()
 
                 return .none
             }

app-ios/Sources/KMPClient/Views/KmpAppComposeViewControllerWrapper.swift → app-ios/Sources/App/Views/KmpAppComposeViewControllerWrapper.swift

@@ -1,24 +1,26 @@
 import SwiftUI
 import LicenseList
-@preconcurrency import shared
+import shared
+import ComposableArchitecture
 
-public struct KmpAppComposeViewControllerWrapper: UIViewControllerRepresentable {
-    public init() {}
+@MainActor
+struct KmpAppComposeViewControllerWrapper: UIViewControllerRepresentable {
+    @Dependency(\.containerClient) var containerClient
 
-    public func makeUIViewController(context: Context) -> UIViewController {
-        let container = Container.shared
-        let repositories: any Repositories = container.get(type: (any Repositories).self)
-        return IosComposeKaigiAppKt.kaigiAppController(
-            repositories: repositories,
+    init() {}
+
+    func makeUIViewController(context: Context) -> UIViewController {
+        IosComposeKaigiAppKt.kaigiAppController(
+            repositories: containerClient.repositories(),
             onLicenseScreenRequest: {
                 openLicenseScreen()
             }
         )
     }
 
-    public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
     }
-    
+
     private func openLicenseScreen() {
         if let windowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
             if let rootViewController = windowScene.windows.first?.rootViewController {

app-ios/Sources/KMPClient/Views/KmpProfileCardComposeViewControllerWrapper.swift → app-ios/Sources/App/Views/KmpProfileCardComposeViewControllerWrapper.swift

@@ -1,25 +1,28 @@
 import SwiftUI
 import shared
+import ComposableArchitecture
 
-public struct KmpProfileCardComposeViewControllerWrapper: UIViewControllerRepresentable {
-    public init() {}
-
-    public func makeUIViewController(context: Context) -> UIViewController {
+struct KmpProfileCardComposeViewControllerWrapper: UIViewControllerRepresentable {
+    @Dependency(\.containerClient) var containerClient
+
+    init() {}
+
+    func makeUIViewController(context: Context) -> UIViewController {
         profileCardViewController(
-            repositories: Container.shared.get(type: (any Repositories).self),
+            repositories: containerClient.repositories(),
             onClickShareProfileCard: { image, text in
                 let activityViewController = UIActivityViewController(activityItems: [text, image], applicationActivities: nil)
                 if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-                let keyWindow = windowScene.windows.first(where: { $0.isKeyWindow }),
-                let rootViewController = keyWindow.rootViewController {
+                   let keyWindow = windowScene.windows.first(where: { $0.isKeyWindow }),
+                   let rootViewController = keyWindow.rootViewController {
                     rootViewController.present(activityViewController, animated: true, completion: nil)
                 } else {
                     print("Unable to find the root view controller.")
                 }
             }
         )
     }
-    
-    public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
     }
 }

app-ios/Sources/ContributorFeature/KmpContributorComposeViewControllerWrapper.swift

@@ -0,0 +1,27 @@
+import SwiftUI
+import shared
+import ComposableArchitecture
+
+struct KmpContributorComposeViewControllerWrapper: UIViewControllerRepresentable {
+    public typealias URLString = String
+
+    let repositories: any Repositories
+    private let onContributorsItemClick: (URLString) -> Void
+
+    init(onContributorsItemClick: @escaping (URLString) -> Void) {
+        @Dependency(\.containerClient) var containerClient
+
+        self.repositories = containerClient.repositories()
+        self.onContributorsItemClick = onContributorsItemClick
+    }
+
+    func makeUIViewController(context: Context) -> UIViewController {
+        return contributorsViewController(
+            repositories: repositories,
+            onContributorsItemClick: onContributorsItemClick
+        )
+    }
+
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+    }
+}

app-ios/Sources/ContributorFeature/KmpPresenterContributorView.swift

@@ -4,6 +4,7 @@ import Model
 import SwiftUI
 @preconcurrency import shared
 import Theme
+import ComposableArchitecture
 
 struct KmpPresenterContributorView: View {
     private let repositories: any Repositories
@@ -12,8 +13,9 @@ struct KmpPresenterContributorView: View {
     @State private var currentState: ContributorsUiState? = nil
 
     init(onContributorButtonTapped: @escaping (URL) -> Void) {
-        self.repositories = Container.shared.get(type: (any Repositories).self)
+        @Dependency(\.containerClient) var containerClient
 
+        self.repositories = containerClient.repositories()
         self.events = SkieKotlinSharedFlowFactory<any ContributorsScreenEvent>()
             .createSkieKotlinSharedFlow(replay: 0, extraBufferCapacity: 0)
         self.onContributorButtonTapped = onContributorButtonTapped

app-ios/Sources/KMPClient/Client.swift

@@ -4,6 +4,16 @@ import shared
 import Model
 
 extension DependencyValues {
+    public var firebaseAppClient: FirebaseAppClient {
+        get { self[FirebaseAppClient.self] }
+        set { self[FirebaseAppClient.self] = newValue }
+    }
+
+    public var containerClient: ContainerClient {
+        get { self[ContainerClient.self] }
+        set { self[ContainerClient.self] = newValue }
+    }
+
     public var timetableClient: TimetableClient {
         get { self[TimetableClient.self] }
         set { self[TimetableClient.self] = newValue }
@@ -35,6 +45,22 @@ extension DependencyValues {
     }
 }
 
+@DependencyClient
+public struct FirebaseAppClient: Sendable {
+    public var prepareFirebase: @Sendable () -> ()
+}
+
+@DependencyClient
+public struct ContainerClient: Sendable {
+    private class DefaultRepositories: Repositories {
+        var map = [AnyHashable: Any]()
+    }
+
+    public var repositories: @Sendable () -> any Repositories = {
+        DefaultRepositories()
+    }
+}
+
 @DependencyClient
 public struct TimetableClient: Sendable {
     public var streamTimetable: @Sendable () throws -> AsyncThrowingStream<Timetable, any Error>

app-ios/Sources/KMPClient/TestKey.swift

@@ -1,5 +1,15 @@
 import Dependencies
 
+extension FirebaseAppClient: TestDependencyKey {
+    public static let previewValue: Self = Self()
+    public static let testValue: Self = Self()
+}
+
+extension ContainerClient: TestDependencyKey {
+    public static let previewValue: Self = Self()
+    public static let testValue: Self = Self()
+}
+
 extension TimetableClient: TestDependencyKey {
     public static let previewValue: Self = Self()
 

app-ios/Sources/KMPClient/Helpers/Container.swift → app-ios/Sources/KMPClientLive/Helpers/Container.swift

@@ -2,10 +2,6 @@ import Firebase
 import ObjectiveC
 @preconcurrency import shared
 
-public func prepareFirebase() {
-    FirebaseApp.configure()
-}
-
 public struct Container: Sendable {
     public static let shared: Container = .init()
 
@@ -19,9 +15,9 @@ public struct Container: Sendable {
     }
 
     public func get<TypeProtocol, ReturnType>(type: TypeProtocol) -> ReturnType where TypeProtocol: Protocol {
-            guard let object = entryPoint.get(objCProtocol: type) as? ReturnType else {
-                fatalError("Not found instance for \(type)")
-            }
-            return object
+        guard let object = entryPoint.get(objCProtocol: type) as? ReturnType else {
+            fatalError("Not found instance for \(type)")
         }
+        return object
+    }
 }

app-ios/Sources/KMPClient/LiveKey.swift → app-ios/Sources/KMPClientLive/LiveKey.swift

@@ -2,6 +2,8 @@ import Dependencies
 import shared
 import Model
 import Foundation
+import Firebase
+import KMPClient
 
 private var sessionsRepository: any SessionsRepository {
     Container.shared.get(type: (any SessionsRepository).self)
@@ -27,6 +29,26 @@ private var profileCardRepository: any ProfileCardRepository {
     Container.shared.get(type: (any ProfileCardRepository).self)
 }
 
+extension FirebaseAppClient: DependencyKey {
+    public static var liveValue: Self {
+        Self(
+            prepareFirebase: {
+                FirebaseApp.configure()
+            }
+        )
+    }
+}
+
+extension ContainerClient: DependencyKey {
+    public static var liveValue: Self {
+        Self(
+            repositories: {
+                Container.shared.get(type: (any Repositories).self)
+            }
+        )
+    }
+}
+
 extension TimetableClient: DependencyKey {
     public static let liveValue: TimetableClient = .init(
         streamTimetable: {