BookmarksVC cleanup: remove unused code

Client.xcodeproj/project.pbxproj

@@ -60,6 +60,7 @@
 		0A771D35218C8FDC00336E0D /* Bookmark+Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A771D34218C8FDC00336E0D /* Bookmark+Sync.swift */; };
 		0A83D9F121B7FFD200245EF0 /* ABPFilterParserData.dat in Resources */ = {isa = PBXBuildFile; fileRef = 0A83D9E921B7FFD100245EF0 /* ABPFilterParserData.dat */; };
 		0A8C6993225BC7B100988715 /* ToolbarUrlActionsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A8C6992225BC7B100988715 /* ToolbarUrlActionsProtocol.swift */; };
+		0A8C699C225BDDC500988715 /* BookmarkEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A8C699B225BDDC500988715 /* BookmarkEditViewController.swift */; };
 		0AA029F8222E899400D6B535 /* Bookmark+Reorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AA029F7222E899400D6B535 /* Bookmark+Reorder.swift */; };
 		0AA4FC392109D685000B173A /* CRUDProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AA4FC382109D685000B173A /* CRUDProtocols.swift */; };
 		0AAAAC972249174A009A8763 /* SyncAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AAAAC962249174A009A8763 /* SyncAlerts.swift */; };
@@ -1178,6 +1179,7 @@
 		0A771D34218C8FDC00336E0D /* Bookmark+Sync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bookmark+Sync.swift"; sourceTree = "<group>"; };
 		0A83D9E921B7FFD100245EF0 /* ABPFilterParserData.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = ABPFilterParserData.dat; sourceTree = "<group>"; };
 		0A8C6992225BC7B100988715 /* ToolbarUrlActionsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarUrlActionsProtocol.swift; sourceTree = "<group>"; };
+		0A8C699B225BDDC500988715 /* BookmarkEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkEditViewController.swift; sourceTree = "<group>"; };
 		0A9B6A3420E6453400712BC9 /* Model8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model8.xcdatamodel; sourceTree = "<group>"; };
 		0AA029F7222E899400D6B535 /* Bookmark+Reorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bookmark+Reorder.swift"; sourceTree = "<group>"; };
 		0AA4FC382109D685000B173A /* CRUDProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRUDProtocols.swift; sourceTree = "<group>"; };
@@ -3429,6 +3431,7 @@
 		7BC7B4571C903A6A0046E9D2 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
+				0A8C699B225BDDC500988715 /* BookmarkEditViewController.swift */,
 				A1AD4BCE20BF3E8C007A6EA1 /* BookmarksViewController.swift */,
 				A198E75020C701ED00334C11 /* HistoryViewController.swift */,
 				44331DBA22521013007E3E93 /* MenuViewController.swift */,
@@ -5774,6 +5777,7 @@
 				E68E7ACB1CAC1D4500FDCA76 /* PagingPasscodeViewController.swift in Sources */,
 				D04D1B92209790B60074B35F /* Toast.swift in Sources */,
 				D34DC8531A16C40C00D49B7B /* Profile.swift in Sources */,
+				0A8C699C225BDDC500988715 /* BookmarkEditViewController.swift in Sources */,
 				4422D4D821BFFB7600BF1855 /* block.cc in Sources */,
 				E65075541E37F6FC006961AC /* DynamicFontHelper.swift in Sources */,
 				4422D55C21BFFB7F00BF1855 /* perl_groups.cc in Sources */,

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

@@ -0,0 +1,83 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import UIKit
+import Eureka
+import Data
+import Shared
+
+class BookmarkEditViewController: FormViewController {
+    var completionBlock: ((_ controller: BookmarkEditViewController) -> Void)?
+
+    var folders: [Bookmark] = []
+
+    var bookmarksPanel: BookmarksViewController!
+    var bookmark: Bookmark!
+    var bookmarkIndexPath: IndexPath!
+
+    let BOOKMARK_TITLE_ROW_TAG: String = "BOOKMARK_TITLE_ROW_TAG"
+    let BOOKMARK_URL_ROW_TAG: String = "BOOKMARK_URL_ROW_TAG"
+    let BOOKMARK_FOLDER_ROW_TAG: String = "BOOKMARK_FOLDER_ROW_TAG"
+
+    var titleRow: TextRow?
+    var urlRow: URLRow?
+
+    init(bookmarksPanel: BookmarksViewController, indexPath: IndexPath, bookmark: Bookmark) {
+        super.init(nibName: nil, bundle: nil)
+
+        self.bookmark = bookmark
+        self.bookmarksPanel = bookmarksPanel
+        self.bookmarkIndexPath = indexPath
+
+        folders = Bookmark.getTopLevelFolders()
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        //called when we're about to be popped, so use this for callback
+        if let block = self.completionBlock {
+            block(self)
+        }
+
+        self.bookmark.update(customTitle: self.titleRow?.value, url: self.urlRow?.value?.absoluteString)
+    }
+
+    var isEditingFolder: Bool {
+        return bookmark.isFolder
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let firstSectionName = !isEditingFolder ?  Strings.Bookmark_Info : Strings.Bookmark_Folder
+
+        let nameSection = Section(firstSectionName)
+
+        nameSection <<< TextRow() { row in
+            row.tag = BOOKMARK_TITLE_ROW_TAG
+            row.title = Strings.Name
+            row.value = bookmark.displayTitle
+            self.titleRow = row
+        }
+
+        form +++ nameSection
+
+        // Only show URL option for bookmarks, not folders
+        if !isEditingFolder {
+            nameSection <<< URLRow() { row in
+                row.tag = BOOKMARK_URL_ROW_TAG
+                row.title = Strings.URL
+                row.value = URL(string: bookmark.url ?? "")
+                self.urlRow = row
+            }
+        }
+
+        // Currently no way to edit bookmark/folder locations
+        // See de9e1cc for removal of this logic
+    }
+}

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

@@ -5,102 +5,12 @@
 import UIKit
 import CoreData
 import Shared
-import XCGLogger
 import Eureka
-import Storage
 import Data
 import BraveShared
 
 private let log = Logger.browserLogger
 
-// MARK: - UX constants.
-
-struct BookmarksViewControllerUX {
-  fileprivate static let BookmarkFolderHeaderViewChevronInset: CGFloat = 10
-  fileprivate static let BookmarkFolderChevronSize: CGFloat = 20
-  fileprivate static let BookmarkFolderChevronLineWidth: CGFloat = 4.0
-  fileprivate static let BookmarkFolderTextColor = UIColor(red: 92/255, green: 92/255, blue: 92/255, alpha: 1.0)
-  fileprivate static let WelcomeScreenPadding: CGFloat = 15
-  fileprivate static let WelcomeScreenItemTextColor = UIColor.gray
-  fileprivate static let WelcomeScreenItemWidth = 170
-  fileprivate static let SeparatorRowHeight: CGFloat = 0.5
-}
-
-class BookmarkEditingViewController: FormViewController {
-  var completionBlock: ((_ controller: BookmarkEditingViewController) -> Void)?
-
-  var folders: [Bookmark] = []
-
-  var bookmarksPanel: BookmarksViewController!
-  var bookmark: Bookmark!
-  var bookmarkIndexPath: IndexPath!
-
-  let BOOKMARK_TITLE_ROW_TAG: String = "BOOKMARK_TITLE_ROW_TAG"
-  let BOOKMARK_URL_ROW_TAG: String = "BOOKMARK_URL_ROW_TAG"
-  let BOOKMARK_FOLDER_ROW_TAG: String = "BOOKMARK_FOLDER_ROW_TAG"
-
-  var titleRow: TextRow?
-  var urlRow: URLRow?
-
-  init(bookmarksPanel: BookmarksViewController, indexPath: IndexPath, bookmark: Bookmark) {
-    super.init(nibName: nil, bundle: nil)
-
-    self.bookmark = bookmark
-    self.bookmarksPanel = bookmarksPanel
-    self.bookmarkIndexPath = indexPath
-
-    folders = Bookmark.getTopLevelFolders()
-  }
-
-  required init?(coder aDecoder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-    //called when we're about to be popped, so use this for callback
-    if let block = self.completionBlock {
-      block(self)
-    }
-
-    self.bookmark.update(customTitle: self.titleRow?.value, url: self.urlRow?.value?.absoluteString)
-  }
-
-  var isEditingFolder: Bool {
-    return bookmark.isFolder
-  }
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-
-    let firstSectionName = !isEditingFolder ?  Strings.Bookmark_Info : Strings.Bookmark_Folder
-
-    let nameSection = Section(firstSectionName)
-
-    nameSection <<< TextRow() { row in
-      row.tag = BOOKMARK_TITLE_ROW_TAG
-      row.title = Strings.Name
-      row.value = bookmark.displayTitle
-      self.titleRow = row
-    }
-
-    form +++ nameSection
-
-    // Only show URL option for bookmarks, not folders
-    if !isEditingFolder {
-      nameSection <<< URLRow() { row in
-        row.tag = BOOKMARK_URL_ROW_TAG
-        row.title = Strings.URL
-        row.value = URL(string: bookmark.url ?? "")
-        self.urlRow = row
-      }
-    }
-
-    // Currently no way to edit bookmark/folder locations
-    // See de9e1cc for removal of this logic
-  }
-}
-
 class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtocol {
   /// Called when the bookmarks are updated via some user input (i.e. Delete, edit, etc.)
   var bookmarksDidChange: (() -> Void)?
@@ -248,18 +158,6 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
     editBookmarksToolbar.clipsToBounds = true
   }
 
-  func onDeleteBookmarksFolderButton() {
-    guard let currentFolder = currentFolder else {
-      NSLog("Delete folder button pressed but no folder object exists (probably at root), ignoring.")
-      return
-    }
-
-    // TODO: Needs to be recursive
-    currentFolder.delete()
-
-    self.navigationController?.popViewController(animated: true)
-  }
-
   @objc private func onAddBookmarksFolderButton() {
     let alert = UIAlertController.userTextInputAlert(title: Strings.NewFolder, message: Strings.EnterFolderName) {
       input, _ in
@@ -287,28 +185,7 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
   func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
     return true
   }
-
-  func notificationReceived(_ notification: Notification) {
-    switch notification.name {
-    case NSNotification.Name.UITextFieldTextDidChange:
-      if let okAction = addBookmarksFolderOkAction, let textField = notification.object as? UITextField {
-        okAction.isEnabled = (textField.text?.count ?? 0) > 0
-      }
-      break
-    default:
-      // no need to do anything at all
-      log.warning("Received unexpected notification \(notification.name)")
-      break
-    }
-  }
-
-  func currentBookmarksPanel() -> BookmarksViewController {
-    guard let controllers = navigationController?.viewControllers.filter({ $0 as? BookmarksViewController != nil }) else {
-      return self
-    }
-    return controllers.last as? BookmarksViewController ?? self
-  }
-
+
   override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
     return bookmarksFRC?.fetchedObjects?.count ?? 0
   }
@@ -319,11 +196,6 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
     return cell
   }
 
-//  override func getLongPressUrl(forIndexPath indexPath: IndexPath) -> (URL?, [Int]?) {
-//    guard let obj = bookmarksFRC?.object(at: indexPath) as? Bookmark else { return (nil, nil) }
-//    return (obj.url != nil ? URL(string: obj.url!) : nil, obj.isFolder ? obj.syncUUID : nil)
-//  }
-  
   fileprivate func configureCell(_ cell: UITableViewCell, atIndexPath indexPath: IndexPath) {
 
     // Make sure Bookmark at index path exists,
@@ -498,7 +370,7 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
 
   fileprivate func showEditBookmarkController(_ tableView: UITableView, indexPath: IndexPath) {
     guard let item = bookmarksFRC?.object(at: indexPath), !item.isFavorite else { return }
-    let nextController = BookmarkEditingViewController(bookmarksPanel: self, indexPath: indexPath, bookmark: item)
+    let nextController = BookmarkEditViewController(bookmarksPanel: self, indexPath: indexPath, bookmark: item)
 
     nextController.completionBlock = { controller in
       self.isEditingIndividualBookmark = false
@@ -509,95 +381,6 @@ class BookmarksViewController: SiteTableViewController, ToolbarUrlActionsProtoco
 
 }
 
-private protocol BookmarkFolderTableViewHeaderDelegate {
-  func didSelectHeader()
-}
-
-extension BookmarksViewController: BookmarkFolderTableViewHeaderDelegate {
-  fileprivate func didSelectHeader() {
-    self.navigationController?.popViewController(animated: true)
-  }
-}
-
-fileprivate class BookmarkFolderTableViewHeader: UITableViewHeaderFooterView {
-  var delegate: BookmarkFolderTableViewHeaderDelegate?
-
-  lazy var titleLabel: UILabel = {
-    let label = UILabel()
-    label.textColor = UIConstants.HighlightBlue
-    return label
-  }()
-
-  lazy var chevron: ChevronView = {
-    let chevron = ChevronView(direction: .left)
-    chevron.tintColor = UIConstants.HighlightBlue
-    chevron.lineWidth = BookmarksViewControllerUX.BookmarkFolderChevronLineWidth
-    return chevron
-  }()
-
-  lazy var topBorder: UIView = {
-    let view = UIView()
-    view.backgroundColor = SiteTableViewControllerUX.HeaderBorderColor
-    return view
-  }()
-
-  lazy var bottomBorder: UIView = {
-    let view = UIView()
-    view.backgroundColor = SiteTableViewControllerUX.HeaderBorderColor
-    return view
-  }()
-
-  override var textLabel: UILabel? {
-    return titleLabel
-  }
-
-  override init(reuseIdentifier: String?) {
-    super.init(reuseIdentifier: reuseIdentifier)
-
-    isUserInteractionEnabled = true
-
-    let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(BookmarkFolderTableViewHeader.viewWasTapped(_:)))
-    tapGestureRecognizer.numberOfTapsRequired = 1
-    addGestureRecognizer(tapGestureRecognizer)
-
-    addSubview(topBorder)
-    addSubview(bottomBorder)
-    contentView.addSubview(chevron)
-    contentView.addSubview(titleLabel)
-
-    chevron.snp.makeConstraints { make in
-      make.left.equalTo(contentView).offset(BookmarksViewControllerUX.BookmarkFolderHeaderViewChevronInset)
-      make.centerY.equalTo(contentView)
-      make.size.equalTo(BookmarksViewControllerUX.BookmarkFolderChevronSize)
-    }
-
-    titleLabel.snp.makeConstraints { make in
-      make.left.equalTo(chevron.snp.right).offset(BookmarksViewControllerUX.BookmarkFolderHeaderViewChevronInset)
-      make.right.greaterThanOrEqualTo(contentView).offset(-BookmarksViewControllerUX.BookmarkFolderHeaderViewChevronInset)
-      make.centerY.equalTo(contentView)
-    }
-
-    topBorder.snp.makeConstraints { make in
-      make.left.right.equalTo(self)
-      make.top.equalTo(self).offset(-0.5)
-      make.height.equalTo(0.5)
-    }
-
-    bottomBorder.snp.makeConstraints { make in
-      make.left.right.bottom.equalTo(self)
-      make.height.equalTo(0.5)
-    }
-  }
-
-  required init?(coder aDecoder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
-  }
-
-  @objc fileprivate func viewWasTapped(_ gestureRecognizer: UITapGestureRecognizer) {
-    delegate?.didSelectHeader()
-  }
-}
-
 extension BookmarksViewController: NSFetchedResultsControllerDelegate {
   func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
     tableView.beginUpdates()