Support editing modes in AddEditBookmarkVC

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

@@ -13,17 +13,10 @@ protocol AddEditBookmarkDelegate: class {
 class AddEditBookmarkTableViewController: UITableViewController {
 
     enum Mode {
-        case addBookmark(title: String, url: URL)
-        case addFolder(title: String)
-        case editBookmark(bookmark: Bookmark)
-        case editFolder(folder: Bookmark)
-    }
-
-    enum Action { case add, edit }
-
-    enum BookmarkType {
-        case bookmark(title: String, url: URL)
-        case folder(title: String)
+        case newBookmark(title: String, url: String)
+        case newFolder(title: String)
+        case editBookmark(_ bookmark: Bookmark)
+        case editFolder(_ folder: Bookmark)
     }
 
     enum Location {
@@ -61,8 +54,10 @@ class AddEditBookmarkTableViewController: UITableViewController {
 
     let frc: NSFetchedResultsController<Bookmark>
 
-    let action: AddEditBookmarkTableViewController.Action
-    let type: AddEditBookmarkTableViewController.BookmarkType
+    //let action: AddEditBookmarkTableViewController.Action
+    //let type: AddEditBookmarkTableViewController.BookmarkType
+    
+    let mode: AddEditBookmarkTableViewController.Mode
 
     lazy var saveButton: UIBarButtonItem = {
         let button = UIBarButtonItem()
@@ -76,22 +71,24 @@ class AddEditBookmarkTableViewController: UITableViewController {
     var location: Location
 
     lazy var bookmarkDetailsView: BookmarkFormFieldsProtocol = {
-        switch type {
-        case .bookmark(let title, let url):
+        switch mode {
+        case .newBookmark(let title, let url):
             return BookmarkDetailsView(title: title, url: url)
-        case .folder(let title):
+        case .newFolder(let title):
             return FolderDetailsViewTableViewCell(title: title)
+        case .editBookmark(let bookmark):
+            return BookmarkDetailsView(title: bookmark.displayTitle ?? "", url: bookmark.url ?? "")
+        case .editFolder(let folder):
+            return FolderDetailsViewTableViewCell(title: folder.displayTitle ?? "")
         }
     }()
 
     private var presentationMode: DataSourcePresentationMode
 
     weak var delegate: AddEditBookmarkDelegate?
 
-    init(action: AddEditBookmarkTableViewController.Action,
-         type: AddEditBookmarkTableViewController.BookmarkType) {
-        self.action = action
-        self.type = type
+    init(mode: AddEditBookmarkTableViewController.Mode) {
+        self.mode = mode
 
         frc = Bookmark.foldersFrc()
         location = .rootLevel
@@ -171,8 +168,8 @@ class AddEditBookmarkTableViewController: UITableViewController {
 
         guard let title = bookmarkDetailsView.titleTextField.text else { return earlyReturn() }
 
-        switch type {
-        case .bookmark(_, _):
+        switch mode {
+        case .newBookmark(_, _), .editBookmark(_):
             guard let urlString = bookmarkDetailsView.urlTextField?.text,
                 let url = URL(string: urlString) else {
                     return earlyReturn()
@@ -186,7 +183,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
             case .folder(let folder):
                 Bookmark.add(url: url, title: title, parentFolder: folder)
             }
-        case .folder(_):
+        case .newFolder(_), .editFolder(_):
             switch location {
             case .rootLevel:
                 Bookmark.addFolder(title: title)
@@ -209,9 +206,9 @@ class AddEditBookmarkTableViewController: UITableViewController {
     var totalCount: Int { return sortedFolders.count + 3 }
 
     var specialButtonsCount: Int {
-        switch type {
-        case .folder(_): return 1
-        case .bookmark(_): return 3
+        switch mode {
+        case .newFolder(_), .editFolder(_): return 1
+        case .newBookmark(_, _), .editBookmark(_): return 3
         }
     }
 
@@ -251,7 +248,7 @@ class AddEditBookmarkTableViewController: UITableViewController {
     }
 
     func showNewFolderVC() {
-        let vc = AddEditBookmarkTableViewController(action: .add, type: .folder(title: "New folder"))
+        let vc = AddEditBookmarkTableViewController(mode: .newFolder(title: "New folder"))
         vc.delegate = self
         navigationController?.pushViewController(vc, animated: true)
     }
@@ -295,12 +292,12 @@ class AddEditBookmarkTableViewController: UITableViewController {
         case .folderHierarchy:
             let row = indexPath.row
 
-            switch type {
-            case .folder(_):
+            switch mode {
+            case .newFolder(_), .editFolder(_):
                 if row == 0 {
                     return rootLevelFolderCell
                 }
-            case .bookmark(_):
+            case .newBookmark(_), .editBookmark(_):
                 if row == 0 {
                     let cell = IndentedImageTableViewCell(image: #imageLiteral(resourceName: "add_tab"))
                     cell.folderName.text = "New Folder"

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

@@ -63,7 +63,7 @@ class BookmarkDetailsView: UIView, BookmarkFormFieldsProtocol {
 
     weak var delegate: BookmarkDetailsViewDelegate?
 
-    convenience init(title: String, url: URL) {
+    convenience init(title: String, url: String) {
         self.init(frame: .zero)
 
         guard let urlTextField = urlTextField else { fatalError() }
@@ -82,7 +82,7 @@ class BookmarkDetailsView: UIView, BookmarkFormFieldsProtocol {
         faviconImageView.setContentHuggingPriority(.defaultHigh, for: .horizontal)
 
         titleTextField.text = title
-        urlTextField.text = url.absoluteString
+        urlTextField.text = url
 
         mainStackView.snp.makeConstraints {
             $0.edges.equalTo(self)

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

@@ -101,12 +101,11 @@ class MenuViewController: UITableViewController {
 
     func openAddBookmark() {
 
-        let action = AddEditBookmarkTableViewController.Action.add
-        guard let title = tab?.displayTitle, let url = tab?.url else { return }
+        guard let title = tab?.displayTitle, let url = tab?.url?.absoluteString else { return }
 
-        let type = AddEditBookmarkTableViewController.BookmarkType.bookmark(title: title, url: url)
+        let mode = AddEditBookmarkTableViewController.Mode.newBookmark(title: title, url: url)
 
-        let vc = AddEditBookmarkTableViewController(action: action, type: type)
+        let vc = AddEditBookmarkTableViewController(mode: mode)
         //vc.toolbarUrlActionsDelegate = bvc
         
         let nc = SettingsNavigationController(rootViewController: vc)