diff --git a/JSONCreator_iOS/JSONCreator/AppDelegate.swift b/JSONCreator_iOS/JSONCreator/AppDelegate.swift index ee7469b..9591a37 100644 --- a/JSONCreator_iOS/JSONCreator/AppDelegate.swift +++ b/JSONCreator_iOS/JSONCreator/AppDelegate.swift @@ -13,15 +13,6 @@ import MVMCoreUI class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate { var window: UIWindow? - - func itera(_ path: String) { - let fileManager = FileManager.default - let enumerator = fileManager.enumerator(atPath: path)! - for element in enumerator { - //do something - print(element) - } - } func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { // Setup our core object with the default implementation @@ -30,7 +21,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele } func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - itera(Bundle.main.resourcePath! + "/JSON") // Override point for customization after application launch. let splitViewController = window!.rootViewController as! UISplitViewController @@ -65,11 +55,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele // MARK: - Split view - func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool { - guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false } - guard let _ = secondaryAsNavController.topViewController as? DetailViewController else { return false } - return false - } + /*func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool { +// guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false } +// guard let _ = secondaryAsNavController.topViewController as? DetailViewController else { return false } +// return false + return true + }*/ } diff --git a/JSONCreator_iOS/JSONCreator/DetailViewController.swift b/JSONCreator_iOS/JSONCreator/DetailViewController.swift index da7b9a3..09f818b 100644 --- a/JSONCreator_iOS/JSONCreator/DetailViewController.swift +++ b/JSONCreator_iOS/JSONCreator/DetailViewController.swift @@ -20,7 +20,11 @@ class DetailViewController: UIViewController { return } view.addSubview(textView) - textView.font = UIFont.systemFont(ofSize: 40) + if UIDevice.current.userInterfaceIdiom == .pad { + textView.font = UIFont.systemFont(ofSize: 40) + } else { + textView.font = UIFont.systemFont(ofSize: 14) + } textView.translatesAutoresizingMaskIntoConstraints = false textView.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true textView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor).isActive = true diff --git a/JSONCreator_iOS/JSONCreator/Info.plist b/JSONCreator_iOS/JSONCreator/Info.plist index 6873106..879dddf 100644 --- a/JSONCreator_iOS/JSONCreator/Info.plist +++ b/JSONCreator_iOS/JSONCreator/Info.plist @@ -43,6 +43,7 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown UISupportedInterfaceOrientations~ipad diff --git a/JSONCreator_iOS/JSONCreator/MasterViewController.swift b/JSONCreator_iOS/JSONCreator/MasterViewController.swift index b3350e7..082a9db 100644 --- a/JSONCreator_iOS/JSONCreator/MasterViewController.swift +++ b/JSONCreator_iOS/JSONCreator/MasterViewController.swift @@ -11,31 +11,57 @@ import UIKit class MasterViewController: UITableViewController { let folderPath = Bundle.main.resourcePath! + "/JSON" - + var sectionsMap: [AnyHashable: Any] = [:] + override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + + // setup the data + sectionsMap = [:] + let sections = try! FileManager.default.contentsOfDirectory(atPath: folderPath) + for section in sections { + let paths = try! FileManager.default.subpathsOfDirectory(atPath: "\(folderPath)/\(section)") + var array: [String] = [] + for path in paths { + if path.hasSuffix(".json") { + array.append(path) + } + } + sectionsMap[section] = array + } + } + + func getData(for indexPath: IndexPath) -> String? { + let sectionName = self.tableView(tableView, titleForHeaderInSection: indexPath.section) + let array = sectionsMap[sectionName!]! as! Array + let subPath = (array[indexPath.row] as! String) + let path = "\(folderPath)/\(sectionName!)/\(subPath)" + return try! String.init(contentsOfFile: path) } // MARK: - Table View override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - return try! FileManager.default.contentsOfDirectory(atPath: folderPath)[section] + return (((sectionsMap as NSDictionary).allKeys[section]) as! String) } override func numberOfSections(in tableView: UITableView) -> Int { - return try! FileManager.default.contentsOfDirectory(atPath: folderPath).count + return sectionsMap.count } override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return try! FileManager.default.contentsOfDirectory(atPath: folderPath + "/" + FileManager.default.contentsOfDirectory(atPath: folderPath)[section]).count + let sectionName = self.tableView(tableView, titleForHeaderInSection: section) + let array = sectionsMap.arrayForKey(sectionName!) + return array.count } override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) - let name = try! FileManager.default.contentsOfDirectory(atPath: folderPath + "/" + FileManager.default.contentsOfDirectory(atPath: folderPath)[indexPath.section])[indexPath.row] - cell.textLabel?.text = name + let sectionName = self.tableView(tableView, titleForHeaderInSection: indexPath.section) + let array = sectionsMap[sectionName!]! as! Array + cell.textLabel?.text = (array[indexPath.row] as! String) if cell.interactions.first == nil { let dragInteraction = UIDragInteraction(delegate: self) @@ -48,16 +74,34 @@ class MasterViewController: UITableViewController { // Return false if you do not want the specified item to be editable. return true } + + override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + UIPasteboard.general.string = getData(for: indexPath) + + let label = UILabel(frame: .zero) + label.clipsToBounds = true + label.backgroundColor = .gray + label.text = " Copied " + label.font = UIFont.systemFont(ofSize: 40) + label.translatesAutoresizingMaskIntoConstraints = false + label.layer.cornerRadius = 5 + view.superview!.addSubview(label) + label.centerXAnchor.constraint(equalTo: view.superview!.centerXAnchor).isActive = true + label.centerYAnchor.constraint(equalTo: view.superview!.centerYAnchor).isActive = true + UIView.animate(withDuration: 2, animations: { + label.alpha = 0 + }) { (completed) in + label.removeFromSuperview() + } + } } extension MasterViewController: UIDragInteractionDelegate { func dragInteraction(_ interaction: UIDragInteraction, itemsForBeginning session: UIDragSession) -> [UIDragItem] { let location = session.location(in: tableView) let indexPath = tableView.indexPathForRow(at: location) - let sectionName = try! FileManager.default.contentsOfDirectory(atPath: folderPath)[indexPath!.section] - let path = try! folderPath + "/" + sectionName + "/" + FileManager.default.contentsOfDirectory(atPath: folderPath + "/" + sectionName)[indexPath!.row] - let content = try! String.init(contentsOfFile: path) - let provider = NSItemProvider(object: content as NSString) + let content = getData(for: indexPath!) + let provider = NSItemProvider(object: content! as NSString) let item = UIDragItem(itemProvider: provider) return [item] }