From ea1d7e4f891a058bc475d6c445c18b1faeb32e56 Mon Sep 17 00:00:00 2001
From: Roy Marmelstein <marmelroy@gmail.com>
Date: Sun, 23 Jul 2017 12:48:11 +0200
Subject: [PATCH] Consolidate initialisers

---
 .gitignore                                    |  3 ++
 .../xcschemes/FileBrowser.xcscheme            |  2 +-
 .../xcschemes/FileBrowserTests.xcscheme       |  2 +-
 FileBrowser/FileBrowser.swift                 | 34 ++++++-------------
 .../contents.xcworkspacedata                  | 10 ------
 .../Sample/Sample.xcodeproj/project.pbxproj   | 19 +++++++----
 .../xcshareddata/xcschemes/Sample.xcscheme    |  2 +-
 7 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 FileBrowserWorkspace.xcworkspace/contents.xcworkspacedata

diff --git a/.gitignore b/.gitignore
index 5e5d5ce..4eec927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,6 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/screenshots
+.DS_Store
+examples/.DS_Store
+examples/Sample/.DS_Store
diff --git a/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowser.xcscheme b/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowser.xcscheme
index 88866a2..8180ba4 100644
--- a/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowser.xcscheme
+++ b/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowser.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowserTests.xcscheme b/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowserTests.xcscheme
index 1054a51..09ee617 100644
--- a/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowserTests.xcscheme
+++ b/FileBrowser.xcodeproj/xcshareddata/xcschemes/FileBrowserTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FileBrowser/FileBrowser.swift b/FileBrowser/FileBrowser.swift
index 052c364..a424d92 100644
--- a/FileBrowser/FileBrowser.swift
+++ b/FileBrowser/FileBrowser.swift
@@ -35,34 +35,20 @@ open class FileBrowser: UINavigationController {
             fileList?.didSelectFile = didSelectFile
         }
     }
-    
-    /**
-     Init to documents folder.
-     
-     - returns: File browser view controller.
-     */
+
     public convenience init() {
         let parser = FileParser.sharedInstance
         let path = parser.documentsURL()
-        self.init(initialPath: path as URL)
+        self.init(initialPath: path, allowEditing: true)
     }
-    
-    /**
-     Init to a custom directory path.
-     
-     - parameter initialPath: NSURL filepath to containing directory.
-     
-     - returns: File browser view controller.
-     */
-    public convenience init(initialPath: URL) {
-        self.init(initialPath: initialPath, allowEditing: false)
-    }
-    
-    public convenience init(initialPath: URL, allowEditing: Bool) {
-        self.init(initialPath: initialPath, allowEditing: allowEditing, showCancelButton: true)
-    }
-    
-    public convenience init(initialPath: URL, allowEditing: Bool, showCancelButton: Bool) {
+
+    /// Initialise file browser.
+    ///
+    /// - Parameters:
+    ///   - initialPath: NSURL filepath to containing directory.
+    ///   - allowEditing: Whether to allow editing.
+    ///   - showCancelButton: Whether to show the cancel button.
+    public convenience init(initialPath: URL = FileParser.sharedInstance.documentsURL(), allowEditing: Bool = false, showCancelButton: Bool = true) {
         let fileListViewController = FileListViewController(initialPath: initialPath, showCancelButton: showCancelButton)
         fileListViewController.allowEditing = allowEditing
         self.init(rootViewController: fileListViewController)
diff --git a/FileBrowserWorkspace.xcworkspace/contents.xcworkspacedata b/FileBrowserWorkspace.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 877319b..0000000
--- a/FileBrowserWorkspace.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:examples/Sample/Sample.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:FileBrowser.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/examples/Sample/Sample.xcodeproj/project.pbxproj b/examples/Sample/Sample.xcodeproj/project.pbxproj
index 2ef86d5..d9aacbf 100644
--- a/examples/Sample/Sample.xcodeproj/project.pbxproj
+++ b/examples/Sample/Sample.xcodeproj/project.pbxproj
@@ -153,14 +153,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Mihail Șalari";
 				TargetAttributes = {
 					48A199AC1D8C53AC00C443D3 = {
 						CreatedOnToolsVersion = 8.0;
-						DevelopmentTeam = U82TG7992X;
 						LastSwiftMigration = 0800;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 					};
 				};
 			};
@@ -249,6 +248,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -299,6 +299,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -327,14 +328,16 @@
 		48A199C01D8C53AC00C443D3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = U82TG7992X;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Sample/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mihailsalari.Sample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 			};
@@ -343,14 +346,16 @@
 		48A199C11D8C53AC00C443D3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = U82TG7992X;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Sample/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mihailsalari.Sample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
diff --git a/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
index e8a4bce..b61189c 100644
--- a/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
+++ b/examples/Sample/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"