Merge branch 'master' into lp/chat-message-animation

apps/ios/Shared/AppDelegate.swift

@@ -15,31 +15,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
-        if #available(iOS 17.0, *) { trackKeyboard() }
         NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         removePasscodesIfReinstalled()
         prepareForLaunch()
         return true
     }
 
-    @available(iOS 17.0, *)
-    private func trackKeyboard() {
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillShow(_ notification: Notification) {
-        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
-            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
-        }
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillHide(_ notification: Notification) {
-        ChatModel.shared.keyboardHeight = 0
-    }
-
     @objc func pasteboardChanged() {
         ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
     }

apps/ios/Shared/Model/ChatModel.swift

@@ -183,8 +183,6 @@ final class ChatModel: ObservableObject {
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
-    // tracks keyboard height via subscription in AppDelegate
-    @Published var keyboardHeight: CGFloat = 0
     @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
     @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
 

apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift

@@ -294,7 +294,6 @@ struct FramedItemView: View {
         .padding(.horizontal, 12)
         .overlay(DetermineWidth())
         .frame(minWidth: 0, alignment: .leading)
-        .textSelection(.enabled)
 
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -53,7 +53,6 @@ struct ChatView: View {
         if #available(iOS 16.0, *) {
             viewBody
                 .scrollDismissesKeyboard(.immediately)
-                .keyboardPadding()
                 .toolbarBackground(.hidden, for: .navigationBar)
         } else {
             viewBody

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -382,7 +382,11 @@ struct ComposeView: View {
                 }
             }
         }
-        .background(ToolbarMaterial.material(toolbarMaterial))
+        .background {
+            Color.clear
+                .overlay(ToolbarMaterial.material(toolbarMaterial))
+                .ignoresSafeArea(.all, edges: .bottom)
+        }
         .onChange(of: composeState.message) { msg in
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {

apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift

@@ -185,7 +185,6 @@ struct GroupChatInfoView: View {
                 logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
             }
         }
-         .keyboardPadding()
     }
 
     private func groupInfoHeader() -> some View {

apps/ios/Shared/Views/Helpers/KeyboardPadding.swift

@@ -1,21 +0,0 @@
-//
-//  KeyboardPadding.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 10/07/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-extension View {
-    @ViewBuilder func keyboardPadding() -> some View {
-        if #available(iOS 17.0, *) {
-            GeometryReader { g in
-                self.padding(.bottom, max(0, ChatModel.shared.keyboardHeight - g.safeAreaInsets.bottom))
-            }
-        } else {
-            self
-        }
-    }
-}

apps/ios/Shared/Views/NewChat/AddGroupView.swift

@@ -59,7 +59,7 @@ struct AddGroupView: View {
                 .navigationBarTitle("Group link")
             }
         } else {
-            createGroupView().keyboardPadding()
+            createGroupView()
         }
     }
 

apps/ios/Shared/Views/Onboarding/CreateProfile.swift

@@ -77,7 +77,6 @@ struct CreateProfile: View {
                 focusDisplayName = true
             }
         }
-        .keyboardPadding()
     }
 }
 
@@ -128,7 +127,6 @@ struct CreateFirstProfile: View {
         }
         .padding()
         .frame(maxWidth: .infinity, alignment: .leading)
-        .keyboardPadding()
     }
 
     func onboardingButtons() -> some View {