contactsView to ChatView

- update composable helper
- improve CoreDataClient
- Rename from ConversationView to ConversationsView

Author: saroar

Addame/Addame.swift

@@ -8,7 +8,7 @@
 import ComposableArchitecture
 import SwiftUI
 import EventView
-import ConversationView
+import ConversationsView
 import ProfileView
 import TabsView
 import AuthenticationView

Addame/Addame/Package.swift

@@ -48,7 +48,7 @@ let package = Package(
     // Views
     .library(name: "AuthenticationView", targets: ["AuthenticationView"]),
     .library(name: "ChatView", targets: ["ChatView"]),
-    .library(name: "ConversationView", targets: ["ConversationView"]),
+    .library(name: "ConversationsView", targets: ["ConversationsView"]),
     .library(name: "ContactsView", targets: ["ContactsView"]),
     .library(name: "EventView", targets: ["EventView"]),
     .library(name: "EventForm", targets: ["EventForm"]),
@@ -82,7 +82,7 @@ let package = Package(
         "AuthClient", "AuthClientLive", "AttachmentClient", "ChatClient", "ContactClient",
         "ConversationClient", "EventClient", "UserClient", "WebsocketClient",
 
-        "EventView", "ConversationView", "ProfileView", "TabsView", "AuthenticationView",
+        "EventView", "ConversationsView", "ProfileView", "TabsView", "AuthenticationView",
         "SettingsView",
       ]),
 
@@ -104,7 +104,12 @@ let package = Package(
         "KeychainService", "FoundationExtension"
       ]
     ),
-    .target(name: "CoreDataStore"),
+    .target(
+      name: "CoreDataStore",
+      dependencies: [
+        "SharedModels", "FoundationExtension"
+      ]
+    ),
     .target(name: "FoundationExtension"),
 
     // Client
@@ -224,7 +229,7 @@ let package = Package(
         "AuthClient", "AuthClientLive", "UserClient", "UserClientLive",
         "EventClient", "EventClientLive", "AttachmentClient", "AttachmentClientLive",
         "PathMonitorClient", "PathMonitorClientLive", "ConversationClient", "ConversationClientLive",
-        "EventView", "ConversationView", "ProfileView",
+        "EventView", "ConversationsView", "ProfileView",
         "SwiftUIExtension"
       ]),
 
@@ -241,14 +246,15 @@ let package = Package(
     ),
 
     .target(
-      name: "ConversationView",
+      name: "ConversationsView",
       dependencies: [
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         "SharedModels", "InfoPlist", "KeychainService",
-        "WebsocketClient", "ConversationClient", "ChatClient",
+        "WebsocketClient", "ChatClient", "ChatClientLive",
         "SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
-        "HttpRequest", "ChatClientLive", "ConversationClientLive",
-        "WebsocketClientLive", "ChatView", "ComposableArchitectureHelpers"
+        "HttpRequest", "ConversationClient", "ConversationClientLive",
+        "WebsocketClientLive", "ChatView", "ComposableArchitectureHelpers",
+        "ContactClient", "ContactClientLive", "ContactsView", "CoreDataClient"
       ]
     ),
 
@@ -257,8 +263,10 @@ let package = Package(
       dependencies: [
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         "SharedModels", "AsyncImageLoder", "HttpRequest",
-        "ContactClient", "ContactClientLive",
+        "ContactClient", "ContactClientLive", "WebsocketClient",
+        "WebsocketClientLive", "ChatClient", "ChatClientLive",
         "CoreDataStore", "CoreDataClient",
+        "ChatView", "ComposableArchitectureHelpers"
       ]),
 
     .target(

Addame/Addame/Sources/AppFeature/AppView.swift

@@ -8,7 +8,7 @@
 import ComposableArchitecture
 import SwiftUI
 import EventView
-import ConversationView
+import ConversationsView
 import ProfileView
 import TabsView
 import AuthenticationView
@@ -22,6 +22,11 @@ public struct AppView: View {
   @AppStorage("isAuthorized")
   public var isAuthorized: Bool = false
 
+  static let tabsEnv = TabsEnvironment(
+    backgroundQueue: .main,
+    mainQueue: .main
+  )
+  
   static let tabsState = TabsState(
     selectedTab: .event,
     event: EventsState(),
@@ -32,7 +37,7 @@ public struct AppView: View {
   let tabsStore = Store(
     initialState: tabsState,
     reducer: tabsReducer.debug(),
-    environment: ()
+    environment: tabsEnv
   )
 
   static let environment = AuthenticationEnvironment(

Addame/Addame/Sources/ChatView/ChatView.swift

@@ -67,6 +67,7 @@ public struct ChatView: View {
       .onAppear {
         viewStore.send(.onAppear)
       }
+      .navigationBarTitle(viewStore.state.conversation?.title ?? "", displayMode: .automatic)
     }
     .alert(self.store.scope(state: { $0.alert }), dismiss: .alertDismissed)
   }

Addame/Addame/Sources/ComposableArchitectureHelpers/NavigationLink+Store.swift

@@ -80,27 +80,3 @@ extension View {
     )
   }
 }
-
-/// Converts a closure `(A) -> B?` to a closure that returns last non-`nil` `B` returned by the input closure.
-///
-/// Based on a code from [Thomvis/Construct repository](https://github.com/Thomvis/Construct/blob/f165fd005cd939560c1a4eb8d6ee55075a52685d/Construct/Foundation/Memoize.swift)
-///
-/// - Parameter inputClosure: The input closure.
-/// - Returns: Modified closure.
-func replayNonNil<A, B>(_ inputClosure: @escaping (A) -> B?) -> (A) -> B? {
-  var lastNonNilOutput: B? = nil
-  return { inputValue in
-    guard let outputValue = inputClosure(inputValue) else {
-      return lastNonNilOutput
-    }
-    lastNonNilOutput = outputValue
-    return outputValue
-  }
-}
-
-/// Creates a closure (T?) -> T? that returns last non-`nil` T passed to it.
-///
-/// - Returns: The closure.
-func replayNonNil<T>() -> (T?) -> T? {
-  replayNonNil { $0 }
-}

Addame/Addame/Sources/ComposableArchitectureHelpers/Reducer+CaptureState.swift

@@ -0,0 +1,23 @@
+//
+//  Reducer+CaptureState.swift
+//  
+//
+//  Created by Saroar Khandoker on 13.06.2021.
+//
+
+import ComposableArchitecture
+
+extension Reducer {
+  /// Captures reduced state.
+  ///
+  /// - Parameter capture: A closure called when a state is reduced.
+  /// - Parameter state: The reduced state value.
+  /// - Returns: A reducer that works on `State`, `Action`, `Environment`.
+  func captureState(_ capture: @escaping (_ state: State) -> Void) -> Self {
+    .init { state, action, environment in
+      capture(state)
+      return run(&state, action, environment)
+    }
+  }
+}
+

Addame/Addame/Sources/ComposableArchitectureHelpers/Reducer+Presents.swift

@@ -0,0 +1,53 @@
+//
+//  Reducer+Presents.swift
+//  
+//
+//  Created by Saroar Khandoker on 13.06.2021.
+//
+
+import ComposableArchitecture
+
+extension Reducer {
+  /// Combines the reducer with a reducer that works on optionally presented `LocalState`.
+  ///
+  /// - All effects returned by the local reducer are canceled when `LocalState` is `nil`.
+  /// - If `LocalAction` is sent when `LocalState` is `nil`:
+  ///   - The last non-`nil` state value is passed to the local reducer (if available).
+  ///   - The `LocalState` is unchanged (it stays `nil`).
+  ///   - All effects returned by the local reducer are immediately canceled.
+  ///
+  /// Based on [Reducer.presents function](https://github.com/pointfreeco/swift-composable-architecture/blob/9ec4b71e5a84f448dedb063a21673e4696ce135f/Sources/ComposableArchitecture/Reducer.swift#L549-L572) from `iso` branch of `swift-composable-architecture` repository.
+  ///
+  /// - Parameters:
+  ///   - localReducer: A reducer that works on `LocalState`, `LocalAction`, `LocalEnvironment`.
+  ///   - toLocalState: A key path that can get/set `LocalState?` inside `State`.
+  ///   - toLocalAction: A case path that can extract/embed `LocalAction` from `Action`.
+  ///   - toLocalEnvironment: A function that transforms `Environment` into `LocalEnvironment`.
+  /// - Returns: A reducer that works on `State`, `Action`, `Environment`.
+  public func presents<LocalState, LocalAction, LocalEnvironment>(
+    _ localReducer: Reducer<LocalState, LocalAction, LocalEnvironment>,
+    state toLocalState: WritableKeyPath<State, LocalState?>,
+    action toLocalAction: CasePath<Action, LocalAction>,
+    environment toLocalEnvironment: @escaping (Environment) -> LocalEnvironment
+  ) -> Self {
+    let localEffectsId = UUID()
+    var lastNonNilLocalState: LocalState?
+    return Self { state, action, environment in
+      let localEffects = localReducer
+        .optional()
+        .replaceNilState(with: lastNonNilLocalState)
+        .captureState { lastNonNilLocalState = $0 ?? lastNonNilLocalState }
+        .pullback(state: toLocalState, action: toLocalAction, environment: toLocalEnvironment)
+        .run(&state, action, environment)
+        .cancellable(id: localEffectsId)
+      let globalEffects = run(&state, action, environment)
+      let hasLocalState = state[keyPath: toLocalState] != nil
+      return .merge(
+        localEffects,
+        globalEffects,
+        hasLocalState ? .none : .cancel(id: localEffectsId)
+      )
+    }
+  }
+}
+

Addame/Addame/Sources/ComposableArchitectureHelpers/Reducer+ReplaceNilState.swift

@@ -0,0 +1,30 @@
+//
+//  Reducer+ReplaceNilState.swift
+//  
+//
+//  Created by Saroar Khandoker on 13.06.2021.
+//
+
+import ComposableArchitecture
+
+extension Reducer {
+  /// Replaces `nil` state with provided value.
+  ///
+  /// - If reducer is run with non-`nil` state its behavior is unchanged.
+  /// - If reducer is run with a `nil` state, replacement state is used instead.
+  /// - When replacement state is used, the original state wont be mutated!
+  ///
+  /// - Parameter replacement: The replacement state value.
+  /// - Returns: A reducer that works on `State`, `Action`, `Environment`.
+  func replaceNilState<S>(
+    with replacement: @escaping @autoclosure () -> S?
+  ) -> Self where State == Optional<S> {
+    .init { state, action, environment in
+      guard state != nil else {
+        var replacedState = replacement()
+        return run(&replacedState, action, environment)
+      }
+      return run(&state, action, environment)
+    }
+  }
+}

Addame/Addame/Sources/ComposableArchitectureHelpers/ReplayNonNil.swift

@@ -0,0 +1,31 @@
+//
+//  ReplayNonNil.swift
+//  
+//
+//  Created by Saroar Khandoker on 13.06.2021.
+//
+
+/// Converts a closure `(A) -> B?` to a closure that returns last non-`nil` `B` returned by the input closure.
+///
+/// Based on a code from [Thomvis/Construct repository](https://github.com/Thomvis/Construct/blob/f165fd005cd939560c1a4eb8d6ee55075a52685d/Construct/Foundation/Memoize.swift)
+///
+/// - Parameter inputClosure: The input closure.
+/// - Returns: Modified closure.
+func replayNonNil<A, B>(_ inputClosure: @escaping (A) -> B?) -> (A) -> B? {
+  var lastNonNilOutput: B? = nil
+  return { inputValue in
+    guard let outputValue = inputClosure(inputValue) else {
+      return lastNonNilOutput
+    }
+    lastNonNilOutput = outputValue
+    return outputValue
+  }
+}
+
+/// Creates a closure (T?) -> T? that returns last non-`nil` T passed to it.
+///
+/// - Returns: The closure.
+func replayNonNil<T>() -> (T?) -> T? {
+  replayNonNil { $0 }
+}
+

Addame/Addame/Sources/ContactClientLive/Live.swift

@@ -33,7 +33,9 @@ func token() -> AnyPublisher<String, HTTPError> {
 public struct ContactAPI {
 
   public static let build = Self ()
-  private var baseURL: URL { EnvironmentKeys.rootURL.appendingPathComponent("/contacts/") }
+  private var baseURL: URL {
+    EnvironmentKeys.rootURL.appendingPathComponent("/contacts/")
+  }
 
   private let contactStore = CNContactStore()
   private let phoneNumberKit = PhoneNumberKit()