feat: Update toolbar behavior

Infomaniak · Jul 12, 2024 · c9ae7e9 · c9ae7e9
1 parent 269fa4d
commit c9ae7e9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/Mail/Views/Alerts/AddLinkView.swift b/Mail/Views/Alerts/AddLinkView.swift
@@ -33,7 +33,7 @@ struct AddLinkView: View {
     @LazyInjectService private var snackbarPresenter: SnackBarPresentable
     @LazyInjectService private var matomo: MatomoUtils
 
-    var actionHandler: ((String, URL) -> Void)?
+    var actionHandler: ((URL, String) -> Void)?
 
     private var textPlaceholder: String {
         if url.isEmpty {
@@ -87,7 +87,7 @@ struct AddLinkView: View {
             return
         }
 
-        actionHandler?(text, url)
+        actionHandler?(url, text)
     }
 }
 

diff --git a/Mail/Views/New Message/ComposeEditor/ComposeEditor.swift b/Mail/Views/New Message/ComposeEditor/ComposeEditor.swift
@@ -30,6 +30,7 @@ struct ComposeEditor: View {
     @State private var toolbar = EditorToolbarView()
     @StateObject private var textAttributes = TextAttributes()
 
+    @ModalState(context: ContextKeys.compose) var isShowingLinkAlert = false
     @ModalState(context: ContextKeys.compose) var isShowingFileSelection = false
     @ModalState(context: ContextKeys.compose) var isShowingPhotoLibrary = false
     @ModalState(context: ContextKeys.compose) var isShowingCamera = false
@@ -44,12 +45,9 @@ struct ComposeEditor: View {
             .editorInputAccessoryView(toolbar)
             .editorCSS(Self.customCSS)
             .onAppear(perform: configureToolbar)
-//            .customAlert(item: .constant(nil)) { alert in
-//                switch alert.type {
-//                case .link(let handler):
-//                    AddLinkView(actionHandler: handler)
-//                }
-//            }
+            .customAlert(isPresented: $isShowingLinkAlert) {
+                AddLinkView(actionHandler: didCreateLink)
+            }
             .sheet(isPresented: $isShowingFileSelection) {
                 DocumentPicker(pickerType: .selectContent([.item], didPickDocument))
                     .ignoresSafeArea()
@@ -71,21 +69,28 @@ struct ComposeEditor: View {
 
     private func didTapMainToolbarButton(_ action: EditorToolbarAction) {
         switch action {
+        case .link:
+            isShowingLinkAlert = true
         case .ai:
+            // TODO: Show AI
             break
         case .addFile:
-            isShowingFileSelection.toggle()
+            isShowingFileSelection = true
         case .addPhoto:
-            isShowingPhotoLibrary.toggle()
+            isShowingPhotoLibrary = true
         case .takePhoto:
-            isShowingCamera.toggle()
+            isShowingCamera = true
         case .programMessage:
             showWorkInProgressSnackBar()
         default:
             print("Action not handled.")
         }
     }
 
+    private func didCreateLink(url: URL, text: String) {
+        textAttributes.addLink(url: url, text: text)
+    }
+
     private func didPickDocument(_ urls: [URL]) {
         attachmentsManager.importAttachments(
             attachments: urls,

diff --git a/Mail/Views/New Message/ComposeEditor/EditorToolbar.swift b/Mail/Views/New Message/ComposeEditor/EditorToolbar.swift
@@ -21,22 +21,8 @@ import InfomaniakRichEditor
 import MailCore
 import MailCoreUI
 import MailResources
-import SwiftModalPresentation
 import UIKit
 
-struct ToolbarAlert: Identifiable, Equatable {
-    let id = UUID()
-    let type: ToolbarAlertType
-
-    static func == (lhs: ToolbarAlert, rhs: ToolbarAlert) -> Bool {
-        return lhs.id == rhs.id
-    }
-}
-
-enum ToolbarAlertType {
-    case link(handler: (String, URL) -> Void)
-}
-
 enum EditorToolbarStyle {
     case main
     case textEdition
@@ -170,15 +156,15 @@ enum EditorToolbarAction: Int {
         case .bold:
             return textAttributes.hasBold
         case .italic:
-            return textAttributes.italic
+            return textAttributes.hasItalic
         case .underline:
-            return textAttributes.underline
+            return textAttributes.hasUnderline
         case .strikeThrough:
-            return textAttributes.strikethrough
+            return textAttributes.hasStrikethrough
         case .unorderedList:
-            return textAttributes.unorderedList
+            return textAttributes.hasUnorderedList
         case .link:
-            return textAttributes.link
+            return textAttributes.hasLink
         case .editText, .ai, .addFile, .addPhoto, .takePhoto, .programMessage:
             return false
         }

diff --git a/Mail/Views/New Message/ComposeEditor/EditorToolbarView.swift b/Mail/Views/New Message/ComposeEditor/EditorToolbarView.swift
@@ -91,15 +91,20 @@ final class EditorToolbarView: UIToolbar {
         case .bold:
             textAttributes?.bold()
         case .italic:
-            break
+            textAttributes?.italic()
         case .underline:
-            break
+            textAttributes?.underline()
         case .strikeThrough:
-            break
+            textAttributes?.strikethrough()
         case .unorderedList:
-            break
+            textAttributes?.unorderedList()
         case .link:
-            break
+            guard let textAttributes else { return }
+            if textAttributes.hasLink {
+                textAttributes.unlink()
+            } else {
+                mainButtonItemsHandler?(action)
+            }
         case .ai, .addFile, .addPhoto, .takePhoto, .programMessage:
             mainButtonItemsHandler?(action)
         }