- Fixes and improvements for iOS app

glushchenko · glushchenko · commit ad6a85722370 · 2022-02-04T21:10:50.000+02:00
diff --git a/FSNotes iOS/EditorViewController.swift b/FSNotes iOS/EditorViewController.swift
@@ -360,6 +360,7 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
             paragraphStyle.alignment = .left
             paragraphStyle.lineSpacing = CGFloat(UserDefaultsManagement.editorLineSpacing)
             editArea.typingAttributes[.paragraphStyle] = paragraphStyle
+            editArea.typingAttributes.removeValue(forKey: .link)
         }
 
         // Tab
@@ -1726,12 +1727,14 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
 
         guard let note = self.note else { return }
 
-        let processed = 0
+        var processed = 0
         var markup = String()
 
         for result in results {
            result.itemProvider.loadObject(ofClass: UIImage.self, completionHandler: { (object, error) in
                guard let photo = object as? UIImage, let imageData = photo.jpgData else { return }
+
+               processed += 1
                let imageExt = "jpg"
 
                if UserDefaultsManagement.liveImagesPreview {
@@ -1741,7 +1744,6 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
 
                    if processed == results.count {
                        note.save(attributed: self.editArea.attributedText)
-
                        UIApplication.getVC().notesTable.reloadRowForce(note: note)
                        return
                    }
diff --git a/FSNotes iOS/View/EditTextView.swift b/FSNotes iOS/View/EditTextView.swift
@@ -45,13 +45,24 @@ class EditTextView: UITextView, UITextViewDelegate {
     }
 
     override func caretRect(for position: UITextPosition) -> CGRect {
-        var superRect = super.caretRect(for: position)
-        guard let font = self.font else { return superRect }
+        var caretRect = super.caretRect(for: position)
+        let characterIndex = offset(from: beginningOfDocument, to: position)
 
-        // "descender" is expressed as a negative value,
-        // so to add its height you must subtract its value
-        superRect.size.height = font.pointSize - font.descender
-        return superRect
+        guard layoutManager.isValidGlyphIndex(characterIndex) else {
+            return caretRect
+        }
+
+        let glyphIndex = layoutManager.glyphIndexForCharacter(at: characterIndex)
+        let usedLineFragment = layoutManager.lineFragmentUsedRect(forGlyphAt: glyphIndex, effectiveRange: nil)
+
+        guard !usedLineFragment.isEmpty else {
+            return caretRect
+        }
+
+        caretRect.origin.y = usedLineFragment.origin.y + textContainerInset.top
+        caretRect.size.height = usedLineFragment.size.height - CGFloat(UserDefaultsManagement.editorLineSpacing) / 2
+
+        return caretRect
     }
 
     override func scrollRectToVisible(_ rect: CGRect, animated: Bool) {
diff --git a/FSNotes iOS/ViewController+More.swift b/FSNotes iOS/ViewController+More.swift
@@ -318,8 +318,14 @@ extension ViewController: UIDocumentPickerDelegate {
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: { (action: UIAlertAction!) in
         }))
 
-        self.dismiss(animated: true, completion: nil)
-        mvc.present(alert, animated: true, completion: nil)
+        if selectedProject.isExternal {
+            let bookmark = SandboxBookmark.sharedInstance()
+            bookmark.remove(url: selectedProject.url)
+
+            mvc.sidebarTableView.removeRows(projects: [selectedProject])
+        } else {
+            mvc.present(alert, animated: true, completion: nil)
+        }
     }
 
     private func renameFolder() {
diff --git a/FSNotes iOS/ViewController.swift b/FSNotes iOS/ViewController.swift
@@ -941,6 +941,9 @@ class ViewController: UIViewController, UISearchBarDelegate, UIGestureRecognizer
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             let evc = UIApplication.getEVC()
+            if UserDefaultsManagement.previewMode {
+                evc.togglePreview()
+            }
             evc.editArea.becomeFirstResponder()
         }
     }
diff --git a/FSNotes iOS/ru.lproj/Localizable.strings b/FSNotes iOS/ru.lproj/Localizable.strings
@@ -200,7 +200,7 @@
 "Rename folder" = "&#1055;&#1077;&#1088;&#1077;&#1080;&#1084;&#1077;&#1085;&#1086;&#1074;&#1072;&#1090;&#1100; &#1087;&#1072;&#1087;&#1082;&#1091;";
 
 /* Popover table */
-"Rename folder:" = "&#1059;&#1076;&#1072;&#1083;&#1080;&#1090;&#1100; &#1087;&#1072;&#1087;&#1082;&#1091;:";
+"Rename folder:" = "&#1055;&#1077;&#1088;&#1077;&#1080;&#1084;&#1077;&#1085;&#1086;&#1074;&#1072;&#1090;&#1100; &#1087;&#1072;&#1087;&#1082;&#1091;:";
 
 /* No comment provided by engineer. */
 "Rename note:" = "&#1055;&#1077;&#1088;&#1077;&#1080;&#1084;&#1077;&#1085;&#1086;&#1074;&#1072;&#1090;&#1100; &#1079;&#1072;&#1084;&#1077;&#1090;&#1082;&#1091;:";
diff --git a/FSNotesCore/Core macOS/Extensions/UserDefaultsManagement+.swift b/FSNotesCore/Core macOS/Extensions/UserDefaultsManagement+.swift
@@ -21,6 +21,9 @@ extension UserDefaultsManagement {
         static let NewNoteKeyCode = "newNoteKeyCode"
         static let SearchNoteKeyCode = "searchNoteKeyCode"
         static let SearchNoteKeyModifier = "searchNoteKeyModifier"
+        static let ProjectsKey = "projects"
+        static let FontColorKey = "fontColorKeyed"
+        static let BgColorKey = "bgColorKeyed"
     }
 
     static var appearanceType: AppearanceType {

Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,9 @@ class ViewController: UIViewController, UISearchBarDelegate, UIGestureRecognizer`
`941`	`941`
`942`	`942`	`DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {`
`943`	`943`	`let evc = UIApplication.getEVC()`
	`944`	`+ if UserDefaultsManagement.previewMode {`
	`945`	`+ evc.togglePreview()`
	`946`	`+ }`
`944`	`947`	`evc.editArea.becomeFirstResponder()`
`945`	`948`	`}`
`946`	`949`	`}`
-Original file line number
+Diff line change
 "Rename folder" = "Переименовать папку";
 /* Popover table */
 -"Rename folder:" = "Удалить папку:";
 +"Rename folder:" = "Переименовать папку:";
 /* No comment provided by engineer. */
 "Rename note:" = "Переименовать заметку:";
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ extension UserDefaultsManagement {`
`21`	`21`	`static let NewNoteKeyCode = "newNoteKeyCode"`
`22`	`22`	`static let SearchNoteKeyCode = "searchNoteKeyCode"`
`23`	`23`	`static let SearchNoteKeyModifier = "searchNoteKeyModifier"`
	`24`	`+ static let ProjectsKey = "projects"`
	`25`	`+ static let FontColorKey = "fontColorKeyed"`
	`26`	`+ static let BgColorKey = "bgColorKeyed"`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`static var appearanceType: AppearanceType {`