#1777

Author: glushchenko

FSNotes iOS/AppDelegate.swift

@@ -21,6 +21,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     public static var gitVC = [String: GitViewController]()
     public static var gitProgress: GitProgress?
+    
+    // MARK: Static Properties
+    static let applicationShortcutUserInfoIconKey = "applicationShortcutUserInfoIconKey"
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         var shouldPerformAdditionalDelegateHandling = true
@@ -108,16 +111,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
     }
-
-    func applicationDidBecomeActive(_ application: UIApplication) {        
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-        
-        guard let shortcut = launchedShortcutItem else { return }
-        _ = handleShortCutItem(shortcut)
-        
-        // Reset which shortcut was chosen for next time.
-        launchedShortcutItem = nil
-    }
 
     func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         if let iCloudDocumentsURL = FileManager.default.url(forUbiquityContainerIdentifier: nil)?.appendingPathComponent("Documents").standardized,
@@ -134,43 +127,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
-        let handledShortCutItem = handleShortCutItem(shortcutItem)
-        completionHandler(handledShortCutItem)
-    }
-
-    // MARK: Static Properties
-    static let applicationShortcutUserInfoIconKey = "applicationShortcutUserInfoIconKey"
-    
-    func handleShortCutItem(_ shortcutItem: UIApplicationShortcutItem) -> Bool {
-        var handled = false
-        guard ShortcutIdentifier(fullType: shortcutItem.type) != nil else { return false }
-        guard let shortCutType = shortcutItem.type as String? else { return false }
-
-        let vc = UIApplication.getVC()
-
-        switch shortCutType {
-        case ShortcutIdentifier.makeNew.type:
-            vc.createNote()
-
-            handled = true
-            break
-        case ShortcutIdentifier.clipboard.type:
-            vc.createNote(pasteboard: true)
-
-            handled = true
-            break
-        case ShortcutIdentifier.search.type:
-            vc.loadViewIfNeeded()
-            vc.popViewController()
-            vc.loadSearchController()
-            handled = true
-            break
-        default:
-            
-            break
+        
+        if ShortcutIdentifier(fullType: shortcutItem.type) == .search {
+            UIApplication.getVC().enableSearchFocus()
         }
-
-        return handled
+        
+        UIApplication.getVC().handleShortCutItem(shortcutItem)
+        completionHandler(true)
     }
 
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
@@ -191,6 +154,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 note = storage.getBy(title: id)
                 if !vc.isLoadedDB, note == nil {
                     vc.restoreFindID = id
+                    return true
                 }
             }
         }

FSNotes iOS/EditorViewController.swift

@@ -196,8 +196,6 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
 
     public func fill(note: Note, selectedRange: NSRange? = nil, clearPreview: Bool = false, enableHandoff: Bool = true, completion: (() -> ())? = nil) {
 
-        UserDefaultsManagement.lastSelectedURL = note.url
-        
         if enableHandoff {
             registerHandoff(for: note)
         }
@@ -1446,8 +1444,10 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
     }
 
     @objc public func togglePreview() {
-        guard let note = editArea.note else { return }
-
+        guard let unwrappedNote = self.note, let note = Storage.shared().getBy(url: unwrappedNote.url) else { return }
+        
+        note.loadPreviewState()
+        
         if note.previewState {
             note.previewState = false
             getPreviewView()?.removeFromSuperview()
@@ -1581,12 +1581,17 @@ class EditorViewController: UIViewController, UITextViewDelegate, UIDocumentPick
     override func restoreUserActivityState(_ activity: NSUserActivity) {
         if let id = activity.userInfo?["kCSSearchableItemActivityIdentifier"] as? String {
             let url = URL(fileURLWithPath: id)
-            if let note = Storage.shared().getBy(url: url) {
+            
+            var note = Storage.shared().getBy(url: url)
+            if nil === note {
+                note = Storage.shared().addNote(url: url)
+            }
+            
+            if let note = note {
                 load(note: note)
-                return
-            } else {
-                UIApplication.getVC().restoreActivity = url
             }
+            
+            return
         }
 
         guard let name = activity.userInfo?["note-file-name"] as? String,

FSNotes iOS/Extensions/UIApplication+.swift

@@ -24,4 +24,8 @@ extension UIApplication {
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         return appDelegate.mainController
     }
+    
+    static func getDelegate() -> AppDelegate {
+        return UIApplication.shared.delegate as! AppDelegate
+    }
 }

FSNotes iOS/View/NotesTableView.swift

@@ -81,7 +81,7 @@ class NotesTableView: UITableView,
         let note = self.notes[indexPath.row]
 
         if !note.isLoaded && !note.isLoadedFromCache {
-            note.load()
+            note.uiLoad()
         }
 
         cell.configure(note: note)
@@ -103,9 +103,10 @@ class NotesTableView: UITableView,
 
         guard !self.isEditing, notes.indices.contains(indexPath.row) else { return }
 
-        let note = notes[indexPath.row]
+        var note = notes[indexPath.row]
+        note.loadPreviewState()
+        
         let evc = UIApplication.getEVC()
-
         if let editArea = evc.editArea, let u = editArea.undoManager {
             u.removeAllActions()
         }

FSNotes iOS/View/SidebarTableView.swift

@@ -133,7 +133,9 @@ class SidebarTableView: UITableView,
         vc.buildSearchQuery()
         vc.reloadNotesTable() {
             DispatchQueue.main.async {
+                vc.notesTable.hideLoader()
                 vc.setNavTitle(folder: name)
+                vc.isLoadedSidebar = true
 
                 guard vc.notesTable.notes.count > 0 else {
                     self.unloadAllTags()
@@ -147,13 +149,6 @@ class SidebarTableView: UITableView,
                     self.loadAllTags()
                     vc.resizeSidebar(withAnimation: true)
                 }
-
-                if let url = UserDefaultsManagement.lastSelectedURL,
-                   let note = Storage.shared().getBy(url: url) {
-                    UserDefaultsManagement.lastSelectedURL = nil
-                    
-                    UIApplication.getEVC().load(note: note)
-                }
             }
         }
     }
@@ -730,6 +725,8 @@ class SidebarTableView: UITableView,
         }
 
         tableView(self, didSelectRowAt: indexPath)
+        
+        viewController?.resizeSidebar(withAnimation: true)
     }
 
     public func reload(indexPath: IndexPath) {