Merge pull request #494 from Adamant-im/develop

StanislavDevIOS · web-flow · commit 30401281d261 · 2024-06-13T18:38:44.000+03:00
Release 3.6.2
diff --git a/Adamant/Modules/Chat/View/ChatViewController.swift b/Adamant/Modules/Chat/View/ChatViewController.swift
@@ -659,7 +659,9 @@ private extension ChatViewController {
                 animations: {
                     self.messageInputBar.topStackView.addArrangedSubview(self.replyView)
                 })
-            messageInputBar.inputTextView.becomeFirstResponder()
+            if viewAppeared {
+                messageInputBar.inputTextView.becomeFirstResponder()
+            }
         }
         
         replyView.update(with: message)
diff --git a/Adamant/Modules/Chat/View/Managers/FixedTextMessageSizeCalculator.swift b/Adamant/Modules/Chat/View/Managers/FixedTextMessageSizeCalculator.swift
@@ -127,14 +127,15 @@
          let textContainer = NSTextContainer(
             size: CGSize(width: maxWidth, height: .greatestFiniteMagnitude)
          )
+         textContainer.lineFragmentPadding = .zero
+         
          let layoutManager = NSLayoutManager()
          
          layoutManager.addTextContainer(textContainer)
          
          let textStorage = NSTextStorage(attributedString: attributedText)
          textStorage.addLayoutManager(layoutManager)
          
-         let range = NSRange(location: 0, length: attributedText.length)
          let rect = layoutManager.usedRect(for: textContainer)
          
          return rect.integral.size
@@ -170,5 +171,5 @@
  private let messageLabelFont = UIFont.preferredFont(forTextStyle: .body)
 
  /// Additional width to fix incorrect size calculating
- private let additionalWidth: CGFloat = 5
+private let additionalWidth: CGFloat = 5
 private let additionalHeight: CGFloat = 5
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatBaseMessage/ChatMessageCell.swift b/Adamant/Modules/Chat/View/Subviews/ChatBaseMessage/ChatMessageCell.swift
@@ -172,10 +172,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -206,10 +203,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatReply/ChatMessageReplyCell.swift b/Adamant/Modules/Chat/View/Subviews/ChatReply/ChatMessageReplyCell.swift
@@ -250,10 +250,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -284,10 +281,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatTransaction/Container/ChatTransactionContainerView.swift b/Adamant/Modules/Chat/View/Subviews/ChatTransaction/Container/ChatTransactionContainerView.swift
@@ -205,10 +205,7 @@ private extension ChatTransactionContainerView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -239,10 +236,7 @@ private extension ChatTransactionContainerView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/Adamant/Modules/Chat/ViewModel/ChatViewModel.swift b/Adamant/Modules/Chat/ViewModel/ChatViewModel.swift
@@ -191,7 +191,7 @@ final class ChatViewModel: NSObject {
     }
     
     func presentKeyboardOnStartIfNeeded() {
-        guard !inputText.isEmpty && replyMessage == nil else { return }
+        guard !inputText.isEmpty || replyMessage != nil else { return }
         presentKeyboard.send()
     }
     
diff --git a/Adamant/Modules/PartnerQR/PartnerQRView.swift b/Adamant/Modules/PartnerQR/PartnerQRView.swift
@@ -12,33 +12,37 @@ struct PartnerQRView: View {
     @ObservedObject var viewModel: PartnerQRViewModel
     
     var body: some View {
-        Form {
-            infoSection()
-            toggleSection() 
-            buttonSection()
-        }
-        .navigationBarTitleDisplayMode(.inline)
-        .toolbar {
-            ToolbarItem(placement: .principal) {
-                toolbar()
+        GeometryReader { geometry in
+            Form {
+                infoSection()
+                toggleSection()
+                buttonSection()
+            }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .principal) {
+                    toolbar(maxWidth: geometry.size.width)
+                }
             }
         }
     }
 }
 
 private extension PartnerQRView {
-    func toolbar() -> some View {
-        Button(action: {
-            viewModel.renameContact()
-        }) {
+    func toolbar(maxWidth: CGFloat) -> some View {
+        Button(action: viewModel.renameContact) {
             HStack {
                 if let uiImage = viewModel.partnerImage {
                     Image(uiImage: uiImage)
                         .resizable()
                         .frame(squareSize: viewModel.partnerImageSize)
                 }
-                Text(viewModel.partnerName).font(.headline)
+                Text(viewModel.partnerName)
+                    .font(.headline)
+                    .minimumScaleFactor(0.7)
+                    .lineLimit(1)
             }
+            .frame(maxWidth: maxWidth - toolbarSpace, alignment: .center)
         }
     }
     
@@ -101,3 +105,5 @@ private extension PartnerQRView {
         }
     }
 }
+
+private let toolbarSpace: CGFloat = 150
diff --git a/CommonKit/Sources/CommonKit/ExtensionsTools/ExtensionsApi.swift b/CommonKit/Sources/CommonKit/ExtensionsTools/ExtensionsApi.swift
@@ -16,7 +16,7 @@ public final class ExtensionsApi {
     
     public private(set) lazy var nodes: [Node] = {
         let nodes = keychainStore.get(nodesStoreKey) ?? AdamantResources.nodes
-        return nodes.getAllowedNodes(sortedBySpeedDescending: true, needWS: false).reversed()
+        return nodes.filter { $0.isEnabled }.shuffled()
     }()
     
     private var currentNode: Node?
diff --git a/CommonKit/Sources/CommonKit/Helpers/UIHelpers/UIColor+adamant.swift b/CommonKit/Sources/CommonKit/Helpers/UIHelpers/UIColor+adamant.swift
@@ -119,8 +119,8 @@ extension UIColor {
         
         /// Picked reaction background color
         public static var pickedReactionBackground: UIColor {
-            let colorWhiteTheme  = UIColor(red: 0.88, green: 0.88, blue: 0.88, alpha: 1.0)
-            let colorDarkTheme   = UIColor(red: 0.278, green: 0.278, blue: 0.278, alpha: 1.0)
+            let colorWhiteTheme  = UIColor(red: 0.92, green: 0.925, blue: 0.93, alpha: 0.85)
+            let colorDarkTheme   = UIColor(red: 0.329, green: 0.329, blue: 0.329, alpha: 1.0)
             return returnColorByTheme(colorWhiteTheme: colorWhiteTheme, colorDarkTheme: colorDarkTheme)
         }
         
diff --git a/NotificationServiceExtension/NotificationService.swift b/NotificationServiceExtension/NotificationService.swift
@@ -121,10 +121,12 @@ class NotificationService: UNNotificationServiceExtension {
         // MARK: Messages
         case .chatMessage:
             guard let chat = transaction.asset.chat,
-                let message = core.decodeMessage(rawMessage: chat.message,
-                                                 rawNonce: chat.ownMessage,
-                                                 senderPublicKey: partnerPublicKey,
-                                                 privateKey: keypair.privateKey) else {
+                  let message = core.decodeMessage(
+                    rawMessage: chat.message,
+                    rawNonce: chat.ownMessage,
+                    senderPublicKey: partnerPublicKey,
+                    privateKey: keypair.privateKey
+                  ) else {
                 break
             }
             

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {`
`172`	`172`
`173`	`173`	`func updateOwnReaction() {`
`174`	`174`	`ownReactionLabel.text = getReaction(for: model.address)`
`175`		`- ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`176`		`- infusion: .lightGray,`
`177`		`- alpha: 0.15`
`178`		`- )`
	`175`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`179`	`176`	`}`
`180`	`177`
`181`	`178`	`func updateOpponentReaction() {`
`@@ -206,10 +203,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {`
`206`	`203`	`}`
`207`	`204`
`208`	`205`	`opponentReactionLabel.attributedText = fullString`
`209`		`- opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`210`		`- infusion: .lightGray,`
`211`		`- alpha: 0.15`
`212`		`- )`
	`206`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`213`	`207`	`}`
`214`	`208`
`215`	`209`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -250,10 +250,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {`
`250`	`250`
`251`	`251`	`func updateOwnReaction() {`
`252`	`252`	`ownReactionLabel.text = getReaction(for: model.address)`
`253`		`- ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`254`		`- infusion: .lightGray,`
`255`		`- alpha: 0.15`
`256`		`- )`
	`253`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`257`	`254`	`}`
`258`	`255`
`259`	`256`	`func updateOpponentReaction() {`
`@@ -284,10 +281,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {`
`284`	`281`	`}`
`285`	`282`
`286`	`283`	`opponentReactionLabel.attributedText = fullString`
`287`		`- opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`288`		`- infusion: .lightGray,`
`289`		`- alpha: 0.15`
`290`		`- )`
	`284`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`291`	`285`	`}`
`292`	`286`
`293`	`287`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,7 @@ private extension ChatTransactionContainerView {`
`205`	`205`
`206`	`206`	`func updateOwnReaction() {`
`207`	`207`	`ownReactionLabel.text = getReaction(for: model.address)`
`208`		`- ownReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(`
`209`		`- infusion: .lightGray,`
`210`		`- alpha: 0.15`
`211`		`- )`
	`208`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`212`	`209`	`}`
`213`	`210`
`214`	`211`	`func updateOpponentReaction() {`
`@@ -239,10 +236,7 @@ private extension ChatTransactionContainerView {`
`239`	`236`	`}`
`240`	`237`
`241`	`238`	`opponentReactionLabel.attributedText = fullString`
`242`		`- opponentReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(`
`243`		`- infusion: .lightGray,`
`244`		`- alpha: 0.15`
`245`		`- )`
	`239`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`246`	`240`	`}`
`247`	`241`
`248`	`242`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ final class ChatViewModel: NSObject {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`func presentKeyboardOnStartIfNeeded() {`
`194`		`- guard !inputText.isEmpty && replyMessage == nil else { return }`
	`194`	`+ guard !inputText.isEmpty \|\| replyMessage != nil else { return }`
`195`	`195`	`presentKeyboard.send()`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -12,33 +12,37 @@ struct PartnerQRView: View {`
`12`	`12`	`@ObservedObject var viewModel: PartnerQRViewModel`
`13`	`13`
`14`	`14`	`var body: some View {`
`15`		`- Form {`
`16`		`- infoSection()`
`17`		`- toggleSection()`
`18`		`- buttonSection()`
`19`		`- }`
`20`		`- .navigationBarTitleDisplayMode(.inline)`
`21`		`- .toolbar {`
`22`		`- ToolbarItem(placement: .principal) {`
`23`		`- toolbar()`
	`15`	`+ GeometryReader { geometry in`
	`16`	`+ Form {`
	`17`	`+ infoSection()`
	`18`	`+ toggleSection()`
	`19`	`+ buttonSection()`
	`20`	`+ }`
	`21`	`+ .navigationBarTitleDisplayMode(.inline)`
	`22`	`+ .toolbar {`
	`23`	`+ ToolbarItem(placement: .principal) {`
	`24`	`+ toolbar(maxWidth: geometry.size.width)`
	`25`	`+ }`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`private extension PartnerQRView {`
`30`		`- func toolbar() -> some View {`
`31`		`- Button(action: {`
`32`		`- viewModel.renameContact()`
`33`		`- }) {`
	`32`	`+ func toolbar(maxWidth: CGFloat) -> some View {`
	`33`	`+ Button(action: viewModel.renameContact) {`
`34`	`34`	`HStack {`
`35`	`35`	`if let uiImage = viewModel.partnerImage {`
`36`	`36`	`Image(uiImage: uiImage)`
`37`	`37`	`.resizable()`
`38`	`38`	`.frame(squareSize: viewModel.partnerImageSize)`
`39`	`39`	`}`
`40`		`- Text(viewModel.partnerName).font(.headline)`
	`40`	`+ Text(viewModel.partnerName)`
	`41`	`+ .font(.headline)`
	`42`	`+ .minimumScaleFactor(0.7)`
	`43`	`+ .lineLimit(1)`
`41`	`44`	`}`
	`45`	`+ .frame(maxWidth: maxWidth - toolbarSpace, alignment: .center)`
`42`	`46`	`}`
`43`	`47`	`}`
`44`	`48`
`@@ -101,3 +105,5 @@ private extension PartnerQRView {`
`101`	`105`	`}`
`102`	`106`	`}`
`103`	`107`	`}`
	`108`	`+`
	`109`	`+private let toolbarSpace: CGFloat = 150`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ extension UIColor {`
`119`	`119`
`120`	`120`	`/// Picked reaction background color`
`121`	`121`	`public static var pickedReactionBackground: UIColor {`
`122`		`- let colorWhiteTheme = UIColor(red: 0.88, green: 0.88, blue: 0.88, alpha: 1.0)`
`123`		`- let colorDarkTheme = UIColor(red: 0.278, green: 0.278, blue: 0.278, alpha: 1.0)`
	`122`	`+ let colorWhiteTheme = UIColor(red: 0.92, green: 0.925, blue: 0.93, alpha: 0.85)`
	`123`	`+ let colorDarkTheme = UIColor(red: 0.329, green: 0.329, blue: 0.329, alpha: 1.0)`
`124`	`124`	`return returnColorByTheme(colorWhiteTheme: colorWhiteTheme, colorDarkTheme: colorDarkTheme)`
`125`	`125`	`}`
`126`	`126`