extend composableArh navigation + implement Conversation list + Move to ChatRoom

Author: saroar

Addame/Addame.swift

@@ -24,7 +24,7 @@ struct AddameApp: App {
   static let tabsState = TabsState(
     selectedTab: .event,
     event: EventsState(),
-    chat: ChatState(),
+    conversations: ConversationsState(),
     profile: ProfileState()
   )
 

Addame/Modules/Core/SwiftUIExtension/Sources/SwiftUIExtension/ActivityIndicator.swift

@@ -0,0 +1,22 @@
+//
+//  ActivityIndicator.swift
+//  
+//
+//  Created by Saroar Khandoker on 21.04.2021.
+//
+
+import SwiftUI
+
+public struct ActivityIndicator: UIViewRepresentable {
+  public init() {}
+  
+  public func makeUIView(context: Context) -> UIActivityIndicatorView {
+    let view = UIActivityIndicatorView(style: .large)
+    view.color = .systemBackground
+    view.startAnimating()
+    return view
+  }
+  
+  public func updateUIView(_ uiView: UIActivityIndicatorView, context: Context) {}
+}
+

…tView/Sources/NavigationLink+Store.swift …ftUIExtension/NavigationLink+Store.swiftAddame/Modules/Views/EventView/Sources/NavigationLink+Store.swift renamed to Addame/Modules/Core/SwiftUIExtension/Sources/SwiftUIExtension/NavigationLink+Store.swift Addame/Modules/Views/EventView/Sources/NavigationLink+Store.swift renamed to Addame/Modules/Core/SwiftUIExtension/Sources/SwiftUIExtension/NavigationLink+Store.swift

@@ -59,7 +59,7 @@ extension View {
   ///   - destinationStore: store with non-optional state
   ///   - onDismiss: closure invoked when link is deactivated
   /// - Returns: view with label-less `NavigationLink` added as a background view
-  func navigate<State, Action, DestinationContent>(
+  public func navigate<State, Action, DestinationContent>(
     using store: Store<State?, Action>,
     destination: @escaping (_ destinationStore: Store<State, Action>) -> DestinationContent,
     onDismiss: @escaping () -> Void

Addame/Modules/Services/ConversationClient/Package.swift

@@ -23,6 +23,7 @@ let package = Package(
       targets: ["ConversationClientLive"]),
   ],
   dependencies: [
+    .package(path: "\(Path.Container.core)/Common"),
     .package(path: "\(Path.Container.core)/FuncNetworking"),
     .package(path: "\(Path.Container.domain)/AddaMeModels"),
     .package(path: "\(Path.Container.core)/FoundationExtension"),
@@ -32,7 +33,7 @@ let package = Package(
   targets: [
     .target(
       name: "ConversationClient",
-      dependencies: ["FoundationExtension","FuncNetworking", "AddaMeModels"]),
+      dependencies: ["Common", "FoundationExtension","FuncNetworking", "AddaMeModels"]),
     .target(
       name: "ConversationClientLive",
       dependencies: ["ConversationClient", "KeychainService", "InfoPlist"]),

Addame/Modules/Services/ConversationClient/Sources/ConversationClientLive/Live.swift

@@ -99,10 +99,7 @@ public struct ConversationAPI {
       .eraseToAnyPublisher()
   }
 
-  public func list(
-    query: QueryItem,
-    path: String
-  ) -> AnyPublisher<ConversationResponse, HTTPError> {
+  public func list(query: QueryItem, path: String ) -> AnyPublisher<ConversationResponse, HTTPError> {
     return tokenHandle(input: query, path: path, method: .get)
       .map { $0 }
       .catch { (error: HTTPError) -> AnyPublisher<ConversationResponse, HTTPError> in
@@ -112,10 +109,8 @@ public struct ConversationAPI {
       .eraseToAnyPublisher()
   }
 
-  public func find(
-    conversationsId: String,
-    path: String
-  ) -> AnyPublisher<ConversationResponse.Item, HTTPError> {
+  
+  public func find(conversationsId: String, path: String ) -> AnyPublisher<ConversationResponse.Item, HTTPError> {
     return tokenHandle(input: conversationsId, path: path, method: .get)
       .map { $0 }
       .catch { (error: HTTPError) -> AnyPublisher<ConversationResponse.Item, HTTPError> in

Addame/Modules/Services/EventClient/Sources/EventClient/Mocks.swift

@@ -45,8 +45,8 @@ extension EventClient {
       .setFailureType(to: HTTPError.self)
       .receive(on: DispatchQueue.main)
       .eraseToAnyPublisher()
-        
     }
+
   )
 
 }

Addame/Modules/Views/ChatView/Package.swift

@@ -3,6 +3,16 @@
 
 import PackageDescription
 
+enum Path {
+  static let modules = "../Modules"
+  enum Container {
+    static let core = "\(Path.modules)/Core"
+    static let domains = "\(Path.modules)/Domains"
+    static let services = "\(Path.modules)/Services"
+    static let views = "\(Path.modules)/Views"
+  }
+}
+
 let package = Package(
   name: "ChatView",
   platforms: [.iOS(.v14)],
@@ -12,12 +22,50 @@ let package = Package(
       targets: ["ChatView"]),
   ],
   dependencies: [
-    .package(path: "../Modules/Core/Common"),
+    // Domains
+    .package(path: "\(Path.Container.domains)/AddaMeModels"),
+    
+    // Core
+    .package(path: "\(Path.Container.core)/Common"),
+    .package(path: "\(Path.Container.core)/AsyncImageLoder"),
+    .package(path: "\(Path.Container.core)/FuncNetworking"),
+    .package(path: "\(Path.Container.core)/InfoPlist"),
+    .package(path: "\(Path.Container.core)/KeychainService"),
+    .package(path: "\(Path.Container.core)/FoundationExtension"),
+    .package(path: "\(Path.Container.core)/SwiftUIExtension"),
+    
+    // Services
+    .package(path: "\(Path.Container.services)/WebsocketClient"),
+    .package(path: "\(Path.Container.services)/ConversationClient"),
+    .package(path: "\(Path.Container.services)/ChatClient")
+    
   ],
   targets: [
     .target(
       name: "ChatView",
-      dependencies: ["Common"],
+      dependencies: [
+      
+        // Domains
+        "AddaMeModels",
+        
+        // Services
+        "InfoPlist", "Common",
+        "WebsocketClient", "ConversationClient", "ChatClient",
+        
+        // Core
+        "SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
+        "FuncNetworking", "KeychainService",
+        
+        // Views
+        
+        
+        // Live
+        .product(name: "ChatClientLive", package: "ChatClient"),
+        .product(name: "ConversationClientLive", package: "ConversationClient"),
+        .product(name: "WebsocketClientLive", package: "WebsocketClient"),
+      
+      ],
+      
       path: "Sources"
     ),
     .testTarget(

Addame/Modules/Views/ChatView/Sources/ChatView/ChatAction.swift

@@ -5,4 +5,25 @@
 //  Created by Saroar Khandoker on 06.04.2021.
 //
 
-public enum ChatAction: Equatable {}
+import AddaMeModels
+
+public enum ChatAction: Equatable {
+  case alertDismissed
+  case conversation(ConversationResponse.Item?)
+}
+
+public extension ChatAction {
+  static func view(_ localAction: ChatView.ViewAction) -> Self {
+    switch localAction {
+      
+    case .alertDismissed:
+      return .alertDismissed
+    case .conversation(let conversation):
+      return .conversation(conversation)
+    }
+  }
+}
+
+
+//public extension ProfileAction {
+//  static func view(_ localAction: ProfileView.ViewAction) -> Self {

Addame/Modules/Views/ChatView/Sources/ChatView/ChatEnvironment.swift

@@ -0,0 +1,57 @@
+//
+//  ChatEnvironment.swift
+//  
+//
+//  Created by Saroar Khandoker on 19.04.2021.
+//
+
+import Combine
+import ComposableArchitecture
+import ChatClient
+import ConversationClient
+import WebsocketClient
+import AddaMeModels
+
+public struct ChatEnvironment {
+  
+  let chatClient: ChatClient
+  public var mainQueue: AnySchedulerOf<DispatchQueue>
+  
+  public init(
+    chatClient: ChatClient,
+    mainQueue: AnySchedulerOf<DispatchQueue>
+  ) {
+    self.chatClient = chatClient
+    self.mainQueue = mainQueue
+  }
+  
+}
+
+public class WebsocketEnvironment {
+    
+  let websocketClient: WebsocketClient
+  public var mainQueue: AnySchedulerOf<DispatchQueue>
+  
+  public init(
+    websocketClient: WebsocketClient,
+    mainQueue: AnySchedulerOf<DispatchQueue>
+  ) {
+    self.websocketClient = websocketClient
+    self.websocketClient.handshake()
+    self.mainQueue = mainQueue
+  }
+  
+  public func send(_ msg: SocketMessage) {
+    self.websocketClient.send(msg.localMsg, msg.remostJSON)
+  }
+    
+}
+
+public struct SocketMessage: Equatable {
+  public var localMsg: ChatMessageResponse.Item
+  public var remostJSON: String
+  
+  public static func ==(lhs: SocketMessage, rhs: SocketMessage) -> Bool {
+      return lhs.localMsg == rhs.localMsg && lhs.remostJSON == rhs.remostJSON
+  }
+}

Addame/Modules/Views/ChatView/Sources/ChatView/ChatReducer.swift

@@ -10,5 +10,12 @@ import ComposableArchitecture
 public let chatReducer = Reducer<ChatState, ChatAction, Void> { state, action, _ in
   switch action {
 
+  case .alertDismissed:
+    state.alert = nil
+    return .none
+  case .conversation(let converstion):
+    state.conversation = converstion
+    return .none
+    
   }
 }