update packages and update event from view and fixed app extension (#11)

Author: saroar

Addame.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -71,7 +71,7 @@ let package = Package(
   dependencies: [
     .package(name: "AWSSDKSwift", url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.9.0"),
     .package(url: "https://github.com/marmelroy/PhoneNumberKit", .upToNextMajor(from: "3.3.3")),
-    .package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "0.20.0"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "0.21.0"),
     .package(url: "https://github.com/pointfreeco/composable-core-location", from: "0.1.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.1.0"),
     .package(url: "https://github.com/AddaMeSPB/CombineContacts.git", from: "1.0.0"),
@@ -306,10 +306,10 @@ let package = Package(
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposableCoreLocation", package: "composable-core-location"),
         "SharedModels", "EventClient", "InfoPlist",
-        "PathMonitorClient", "ConversationClient",
+        "PathMonitorClient", "ConversationClient", "ComposableArchitectureHelpers",
         "SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
-        "HttpRequest", "KeychainService", "ChatClient",
-        "PathMonitorClientLive", "ComposableArchitectureHelpers"
+        "HttpRequest", "KeychainService", "ChatClient", "EventClient", "EventClientLive",
+        "PathMonitorClientLive", "ComposableArchitectureHelpers", "MapView", "HttpRequest"
       ]
     ),
 
@@ -345,11 +345,20 @@ let package = Package(
       dependencies: [
         "UIApplicationClient", "UserDefaultsClient",
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
+        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        "UserNotificationClient"
       ]
     ),
 
-    .target(name: "MapView"),
+    .target(
+      name: "MapView",
+      dependencies: [
+        .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+        .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        "SwiftUIExtension", "SharedModels", "ComposableArchitectureHelpers"
+      ]
+    ),
 
     // Helpers
     .target(

Addame/Addame/Package.resolved

@@ -21,7 +21,12 @@ public struct AsyncImage<Placeholder: View>: View {
   ) {
     self.placeholder = placeholder()
     self.image = image
-    _loader = StateObject(wrappedValue: ImageLoader(url: url, cache: Environment(\.imageCache).wrappedValue))
+    _loader = StateObject(
+      wrappedValue: ImageLoader(
+        url: url,
+        cache: Environment(\.imageCache).wrappedValue
+      )
+    )
   }
 
   public init(

Addame/Addame/Package.swift

@@ -17,8 +17,9 @@ public enum ChatAction: Equatable {
   case alertDismissed
   case conversation(ConversationResponse.Item?)
   case messages(Result<ChatMessageResponse, HTTPError>)
-  case fetchMoreMessagIfNeeded(currentItem: ChatMessageResponse.Item?)
-  case message(index: String?, action: MessageAction)
+  case fetchMoreMessageIfNeeded(currentItem: ChatMessageResponse.Item?)
+  case fetchMoreMessage(currentItem: ChatMessageResponse.Item)
+  case message(index: ChatMessageResponse.Item.ID, action: MessageAction)
   case sendResponse(NSError?)
   case webSocket(WebSocketClient.Action)
   case pingResponse(NSError?)
@@ -39,8 +40,10 @@ public extension ChatAction {
       return .conversation(conversation)
     case .messages(let messages):
       return .messages(messages)
-    case .fetchMoreMessagIfNeeded(currentItem: let currentItem):
-      return .fetchMoreMessagIfNeeded(currentItem: currentItem)
+    case let .fetchMoreMessageIfNeeded(currentItem: currentItem):
+      return .fetchMoreMessageIfNeeded(currentItem: currentItem)
+    case let .fetchMoreMessage(currentItem: item):
+      return .fetchMoreMessage(currentItem: item)
     case let .message(index, action):
       return .message(index: index, action: action)
     case .sendResponse(let error):

Addame/Addame/Sources/AsyncImageLoder/AsyncImage.swift

@@ -25,7 +25,7 @@ struct ChatListView: View {
         WithViewStore(chatStore) { messageViewStore in
           ChatRowView(store: chatStore)
             .onAppear {
-              viewStore.send(.fetchMoreMessagIfNeeded(currentItem: messageViewStore.state) )
+              viewStore.send(.fetchMoreMessageIfNeeded(currentItem: messageViewStore.state) )
             }
             .scaleEffect(x: 1, y: -1, anchor: .center)
         }

Addame/Addame/Sources/ChatView/ChatAction.swift

@@ -24,9 +24,9 @@ public let chatReducer = Reducer<ChatState, ChatAction, ChatEnvironment> { state
 
     return environment.chatClient
       .messages(query, conversationsID, "/by/conversations/\(conversationsID)")
-      .subscribe(on: environment.backgroundQueue)
       .retry(3)
-      .receive(on: environment.mainQueue.animation(.default))
+      .subscribe(on: environment.backgroundQueue)
+      .receive(on: environment.mainQueue)
       .catchToEffect()
       .map(ChatAction.messages)
   }
@@ -71,28 +71,37 @@ public let chatReducer = Reducer<ChatState, ChatAction, ChatEnvironment> { state
     state.isLoadingPage = false
     state.currentPage += 1
 
-   print(#line, "currentPage: \(state.currentPage) response: \(response.items.map { $0.messageBody })")
     let combineMessageResults = (response.items + state.messages).uniqElemets().sorted()
-    state.messages = .init(combineMessageResults)
-//    self.messageSubject.send(combineMessageResults)
+    state.messages = .init(uniqueElements: combineMessageResults)
+
+// wrong not working here
+//    if !state.messages.elementsEqual(response.items) {
+//      state.messages = .init(uniqueElements: response.items)
+//    }
 
     return .none
 
   case .messages(.failure(let error)):
     state.alert = .init(title: TextState("\(error.description)") )
     return .none
 
-  case let .fetchMoreMessagIfNeeded(currentItem: currentItem):
+  case let .fetchMoreMessageIfNeeded(currentItem: currentItem):
+    guard let item = currentItem, state.messages.count > 5 else {
+      return fetchMoreMessages
+    }
 
-    guard let item = currentItem, state.messages.count > 7 else {
+    let threshouldIndex = state.messages.index(state.messages.endIndex, offsetBy: -5) - 3
+    if state.messages.firstIndex(where: { $0.id == item.id }) == threshouldIndex {
       return fetchMoreMessages
     }
+    return .none
+
+  case let .fetchMoreMessage(currentItem: item):
 
     let threshouldIndex = state.messages.index(state.messages.endIndex, offsetBy: -7)
     if state.messages.firstIndex(where: { $0.id == item.id }) == threshouldIndex {
       return fetchMoreMessages
     }
-
     return .none
 
   case let .sendResponse(error):