Merge branch 'release/3.11.0'

Author: Lainaaa

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -164,10 +164,8 @@ final class ChatViewController: MessagesViewController {
         super.viewDidAppear(animated)
         defer {
             state.isFirstTimeViewAppeared = true
-            if state.isViewDissappeared == true {
-                state.isViewDissappeared.toggle()
-                updateUnreadMessages()
-            }
+            state.isViewDissappeared = false
+            updateUnreadMessages()
         }
         inputBar.isUserInteractionEnabled = true
         chatMessagesCollectionView.fixedBottomOffset = nil
@@ -836,12 +834,16 @@ extension ChatViewController {
     fileprivate func updateScrollDownButtonVisibility() {
         let topCount = viewModel.unreadMessagesIds?.count ?? 0
         self.scrollDownButton.updateCounter(topCount)
-        guard state.isScrollDownButtonHidden != state.isScrollPositionNearlyTheBottom else { return }
-        state.isScrollDownButtonHidden = state.isScrollPositionNearlyTheBottom
+
+        let shouldShowButton = (topCount > 0) || !state.isScrollPositionNearlyTheBottom
+        guard state.isScrollDownButtonHidden != !shouldShowButton else { return }
+
+        state.isScrollDownButtonHidden = !shouldShowButton
         let buttonUpdate = {
-            self.scrollDownButton.alpha = self.state.isScrollPositionNearlyTheBottom ? 0 : 1
+            self.scrollDownButton.alpha = shouldShowButton ? 1 : 0
             self.updateScrollToUnreadButtonPosition()
         }
+
         if state.isAnimationAllowed {
             UIView.animate(withDuration: 0.3, delay: 0, options: .curveEaseInOut) {
                 buttonUpdate()
@@ -913,15 +915,7 @@ extension ChatViewController {
         let button = ChatScrollButton(position: .down)
         button.action = { [weak self] in
             guard let self else { return }
-            if viewModel.shouldScrollToBottom {
-                state.isScrollingToBottom = true
-                markMessagesFromCurrentToBottomAsRead()
-                self.messagesCollectionView.scrollToBottom(animated: true)
-            } else if let id = viewModel.unreadMessagesIds?.first {
-                viewModel.animationType = MessageAnimationType.none
-                self.scrollToPosition(.messageId(id), animated: true)
-                viewModel.shouldScrollToBottom = true
-            }
+            scrollButtonAction()
         }
         button.alpha = 0
         return button
@@ -958,6 +952,53 @@ extension ChatViewController {
         )
         return collection
     }
+    
+    fileprivate func scrollButtonAction() {
+        if viewModel.shouldScrollToBottom {
+            scrollToBottom()
+            return
+        }
+
+        guard let firstUnreadId = viewModel.unreadMessagesIds?.first,
+              let unreadIndex = viewModel.messages.firstIndex(where: { $0.messageId == firstUnreadId }) else {
+            scrollToBottom()
+            return
+        }
+
+        let visibleBounds = messagesCollectionView.bounds
+        let restrictedVisibleRect = visibleBounds.insetBy(dx: 0, dy: 100)
+
+        let visibleSections: Set<Int> = Set(
+            messagesCollectionView.indexPathsForVisibleItems.compactMap {
+                guard let frame = messagesCollectionView.layoutAttributesForItem(at: $0)?.frame,
+                      restrictedVisibleRect.intersects(frame) else { return nil }
+                return $0.section
+            }
+        )
+
+        if visibleSections.contains(unreadIndex) {
+            scrollToBottom()
+            return
+        }
+
+        if let separatorIndex = viewModel.separatorState.separatorIndex,
+           unreadIndex == separatorIndex + 1 {
+            viewModel.animationType = .none
+            scrollToPosition(.messageId(firstUnreadId), animated: false, setExtraOffset: true, scrollAt: .top)
+            viewModel.shouldScrollToBottom = true
+            return
+        }
+
+        viewModel.animationType = .none
+        scrollToPosition(.messageId(firstUnreadId), animated: true, scrollAt: .top)
+        viewModel.shouldScrollToBottom = true
+    }
+    
+    fileprivate func scrollToBottom() {
+        state.isScrollingToBottom = true
+        markMessagesFromCurrentToBottomAsRead()
+        messagesCollectionView.scrollToBottom(animated: true)
+    }
 }
 
 // MARK: Other
@@ -1395,4 +1436,11 @@ private let messagePadding: CGFloat = 12
 private let filesToolbarViewHeight: CGFloat = 140
 private let targetYOffset: CGFloat = 20
 private let scrollButtonHeight: CGFloat = 30
-private let hiddenScrollViewPartHeight: CGFloat = 94
+//not a real height just for reading messages
+private var hiddenScrollViewPartHeight: CGFloat {
+    if isMacOS {
+        return 93
+    } else {
+        return 85
+    }
+}

Adamant/Modules/Chat/View/Subviews/ChatMedia/Container/ChatMediaContainerView.swift

@@ -184,7 +184,12 @@ extension ChatMediaContainerView {
 
         reactionsStack.insertSubview(progressRingHostingView, aboveSubview: statusButton)
         progressRingHostingView.snp.makeConstraints { make in
-            make.center.equalTo(statusButton)
+            if isMacOS {
+                make.centerX.equalTo(statusButton).offset(-1)
+            } else {
+                make.centerX.equalTo(statusButton)
+            }
+            make.centerY.equalTo(statusButton)
             make.size.equalTo(29)
         }
     }
@@ -206,29 +211,33 @@ extension ChatMediaContainerView {
         statusButton.isHidden = status == .success
     }
 
-    func averageUploadProgress() -> Double {
+    func totalUploadProgress() -> Double {
         let files = model.content.fileModel.files
-        
-        let progresses = files
-            .compactMap { $0.progress }
-        
-        guard !progresses.isEmpty else {
+
+        let totalBytes = files.map { $0.file.size }.reduce(0, +)
+
+        let uploadedBytes: Int64 = files.reduce(0) { result, file in
+            let progress = Double(file.progress ?? 0) / 100.0
+            return result + Int64(Double(file.file.size) * progress)
+        }
+
+        guard totalBytes > 0 else {
             return 0.0
         }
-        
-        let totalProgress = progresses.reduce(0, +)
-        return Double(totalProgress) / Double(progresses.count)
+
+        return Double(uploadedBytes) / Double(totalBytes) * 100.0
     }
 
     func updateProgressRing() {
-        let averageProgress = averageUploadProgress()
+        let averageProgress = totalUploadProgress()
 
         if averageProgress == 0 {
             statusProgressState.backgroundGradient = LinearGradient(
                 gradient: Gradient(colors: [.white, Color(.adamant.sendingFileAnimationGrayColor)]),
                 startPoint: .topLeading,
                 endPoint: .bottomTrailing
-        )} else {
+            )
+        } else {
             statusProgressState.backgroundGradient = nil
         }
         statusProgressState.progress = averageProgress / 100

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -308,7 +308,6 @@ final class ChatViewModel: NSObject {
     fileprivate func setUpMessagetoShow(messageId: String?) {
         if let messageId {
             self.messageIdToShow = messageId
-            separatorState.shouldScrollToNewMessagesOrSavedPosition = false
         }
     }
 
@@ -556,9 +555,6 @@ final class ChatViewModel: NSObject {
                         recipient: partnerAddress
                     )
                 }
-                if let chatroom {
-                    await chatsProvider.markMessageAsRead(chatroom: chatroom, message: messageId)
-                }
 
                 await waitForMessage(withId: messageId)
                 scrollToId = messageId

Adamant/Modules/Chat/ViewModel/Models/NewMessageSeparatorState.swift

@@ -14,5 +14,4 @@ struct NewMessageSeparatorState {
     var isFirstUpdate: Bool = true
     var didAddSeparator: Bool = false
     var isScrollPositionNearlyTheBottom = true
-    var shouldScrollToNewMessagesOrSavedPosition = true
 }

CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Buttons/Arrow_innactive.imageset/Arrow_innactive.png

@@ -337,9 +337,11 @@ class NotificationService: UNNotificationServiceExtension {
         var badgeValue = (Int(SecureStore.get(StoreKey.notificationsService.customBadgeNumber) ?? "0") ?? 0)
         if !shouldIgnoreNotification {
             badgeValue += 1
-            bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
+        } else {
+            bestAttemptContent.body = ""
         }
 
+        bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
         bestAttemptContent.badge = NSNumber(value: badgeValue)
         SecureStore.set(String(badgeValue), for: StoreKey.notificationsService.customBadgeNumber)