Skip to content

Fixed creation of tableview to allow editing #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carlag wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed creation of tableview to allow editing #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1c5cc
Fixed creation of tableview to allow editing
Sep 3, 2018
cfcb6c5
If tableview is editable, pass it down to other child tableviews
Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion FileBrowser/FileBrowser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ open class FileBrowser: UINavigationController {

let validInitialPath = initialPath ?? FileParser.sharedInstance.documentsURL()

let fileListViewController = FileListViewController(initialPath: validInitialPath, showCancelButton: showCancelButton)
let fileListViewController = FileListViewController(initialPath: validInitialPath,
showCancelButton: showCancelButton,
allowEditing: allowEditing)
fileListViewController.allowEditing = allowEditing
self.init(rootViewController: fileListViewController)
self.view.backgroundColor = UIColor.white
Expand Down
2 changes: 1 addition & 1 deletion FileBrowser/FileListTableView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ extension FileListViewController: UITableViewDataSource, UITableViewDelegate {
let selectedFile = fileForIndexPath(indexPath)
searchController.isActive = false
if selectedFile.isDirectory {
let fileListViewController = FileListViewController(initialPath: selectedFile.filePath)
let fileListViewController = FileListViewController(initialPath: selectedFile.filePath, allowEditing: allowEditing)
fileListViewController.didSelectFile = didSelectFile
self.navigationController?.pushViewController(fileListViewController, animated: true)
}
Expand Down
9 changes: 5 additions & 4 deletions FileBrowser/FileListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,19 @@ class FileListViewController: UIViewController {


//MARK: Lifecycle
convenience init (initialPath: URL) {
self.init(initialPath: initialPath, showCancelButton: true)
convenience init (initialPath: URL, allowEditing: Bool = false) {
self.init(initialPath: initialPath, showCancelButton: true, allowEditing: allowEditing)
}

convenience init (initialPath: URL, showCancelButton: Bool) {
convenience init (initialPath: URL, showCancelButton: Bool, allowEditing: Bool = false) {
self.init(nibName: "FileBrowser", bundle: Bundle(for: FileListViewController.self))
self.edgesForExtendedLayout = UIRectEdge()

// Set initial path
self.initialPath = initialPath
self.title = initialPath.lastPathComponent

self.allowEditing = allowEditing

// Set search controller delegates
searchController.searchResultsUpdater = self
searchController.searchBar.delegate = self
Expand Down