Edit bookmark location mvp

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/AddEditBookmarkTableViewController.swift

@@ -218,13 +218,32 @@ class AddEditBookmarkTableViewController: UITableViewController {
 
             delegate?.didSelectFolder()
         case .editBookmark(let bookmark):
-            guard let urlString = bookmarkDetailsView.urlTextField?.text else {
+            guard let urlString = bookmarkDetailsView.urlTextField?.text,
+                let url = URL(string: urlString) else {
                     return earlyReturn()
             }
 
-            bookmark.update(customTitle: title, url: urlString)
+            switch location {
+            case .rootLevel:
+                bookmark.updateWithNewLocation(customTitle: title, url: urlString, location: nil)
+            case .favorites:
+                bookmark.delete()
+                Bookmark.addFavorite(url: url, title: title)
+            case .folder(let folder):
+                bookmark.updateWithNewLocation(customTitle: title, url: urlString, location: folder)
+            }
+
         case .editFolder(let folder):
-            folder.update(customTitle: title, url: nil)
+            folder.updateWithNewLocation(customTitle: title, url: nil, location: folder)
+
+            switch location {
+            case .rootLevel:
+                folder.updateWithNewLocation(customTitle: title, url: nil, location: nil)
+            case .favorites:
+                fatalError("Folders can't be saved to favorites")
+            case .folder(let folderSaveLocation):
+                folder.updateWithNewLocation(customTitle: title, url: nil, location: folderSaveLocation)
+            }
         }
 
         if let nc = navigationController, nc.childViewControllers.count > 1 {
@@ -297,7 +316,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
     }
 
     var favoritesCell: IndentedImageTableViewCell {
-        let cell = IndentedImageTableViewCell(image: #imageLiteral(resourceName: "bookmark"))
+        let cell = IndentedImageTableViewCell(image: #imageLiteral(resourceName: "menu-Bookmark"))
         cell.folderName.text = "Favorites"
         cell.tag = Location.favoritesTag
         if case .favorites = location, presentationMode == .folderHierarchy {

Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift

@@ -92,7 +92,7 @@ class MenuViewController: UITableViewController {
         let nc = SettingsNavigationController(rootViewController: vc)
         nc.modalPresentationStyle = .formSheet
 
-        nc.navigationBar.topItem?.leftBarButtonItem =
+        nc.navigationBar.topItem?.rightBarButtonItem =
             UIBarButtonItem(barButtonSystemItem: .done, target: nc, action: #selector(SettingsNavigationController.done))
 
         dismiss(animated: true)
@@ -125,7 +125,7 @@ class MenuViewController: UITableViewController {
         let nc = SettingsNavigationController(rootViewController: vc)
         nc.modalPresentationStyle = .formSheet
 
-        nc.navigationBar.topItem?.leftBarButtonItem =
+        nc.navigationBar.topItem?.rightBarButtonItem =
             UIBarButtonItem(barButtonSystemItem: .done, target: nc, action: #selector(SettingsNavigationController.done))
 
         dismiss(animated: true)
@@ -138,7 +138,7 @@ class MenuViewController: UITableViewController {
         let nc = SettingsNavigationController(rootViewController: vc)
         nc.modalPresentationStyle = .formSheet
 
-        nc.navigationBar.topItem?.leftBarButtonItem =
+        nc.navigationBar.topItem?.rightBarButtonItem =
             UIBarButtonItem(barButtonSystemItem: .done, target: nc, action: #selector(SettingsNavigationController.done))
 
         dismiss(animated: true)

Data/models/Bookmark.swift

@@ -152,6 +152,17 @@ public final class Bookmark: NSManagedObject, WebsitePresentable, Syncable, CRUD
         updateInternal(customTitle: customTitle, url: url)
     }
 
+    enum SaveLocation {
+        case keep
+        case new(location: Bookmark?)
+    }
+
+    public func updateWithNewLocation(customTitle: String?, url: String?, location: Bookmark?) {
+        let isTitleEmpty = customTitle?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true
+        if customTitle == nil || isTitleEmpty { return }
+        updateInternal(customTitle: customTitle, url: url, location: .new(location: location))
+    }
+
     public class func migrateBookmarkOrders() {
         DataController.perform { context in
             migrateOrder(forFavorites: true, context: context)
@@ -331,6 +342,7 @@ extension Bookmark {
 
     private func updateInternal(customTitle: String?, url: String?, newSyncOrder: String? = nil,
                                 save: Bool = true, sendToSync: Bool = true,
+                                location: SaveLocation = .keep,
                                 context: WriteContext = .new) {
 
         DataController.perform(context: context) { context in
@@ -353,14 +365,27 @@ extension Bookmark {
                 }
             }
 
-            // Checking if syncOrder has changed is imporant here for performance reasons.
-            // Currently to do bookmark sorting right, we have to grab all bookmarks in a given directory
-            // and update their order which is a costly operation.
-            if newSyncOrder != nil && bookmarkToUpdate.syncOrder != newSyncOrder {
-                bookmarkToUpdate.syncOrder = newSyncOrder
-                Bookmark.setOrderForAllBookmarksOnGivenLevel(parent: bookmarkToUpdate.parentFolder, forFavorites: bookmarkToUpdate.isFavorite, context: context)
+            switch location {
+            case .keep:
+                // Checking if syncOrder has changed is imporant here for performance reasons.
+                // Currently to do bookmark sorting right, we have to grab all bookmarks in a given directory
+                // and update their order which is a costly operation.
+                if newSyncOrder != nil && bookmarkToUpdate.syncOrder != newSyncOrder {
+                    bookmarkToUpdate.syncOrder = newSyncOrder
+                    Bookmark.setOrderForAllBookmarksOnGivenLevel(parent: bookmarkToUpdate.parentFolder, forFavorites: bookmarkToUpdate.isFavorite, context: context)
+                }
+            case .new(let newParent):
+                var parentOnCorrectContext: Bookmark?
+                if let newParent = newParent {
+                    parentOnCorrectContext = context.object(with: newParent.objectID) as? Bookmark
+                }
+                bookmarkToUpdate.parentFolder = parentOnCorrectContext
+                bookmarkToUpdate.newSyncOrder(forFavorites: bookmarkToUpdate.isFavorite, context: context)
+                Bookmark.setOrderForAllBookmarksOnGivenLevel(parent: bookmarkToUpdate.parentFolder,
+                                                             forFavorites: bookmarkToUpdate.isFavorite,
+                                                             context: context)
             }
-
+             
             if !bookmarkToUpdate.isFavorite && sendToSync {
                 Sync.shared.sendSyncRecords(action: .update, records: [bookmarkToUpdate], context: context)
             }