3.2.1 release

Remove swift-version file
Bump to Swift 5.0
2019-09-30 17:13:39 +02:00 · 2019-09-30 17:13:09 +02:00 · 2019-09-30 17:12:28 +02:00 · 2018-12-10 19:49:16 +01:00 · 2018-12-10 19:47:31 +01:00 · 2018-12-10 19:46:24 +01:00
65 changed files with 915 additions and 538 deletions
@@ -1 +0,0 @@
-4.0
@@ -1,6 +1,23 @@
 Changelog
 ==========

+### 3.2.0
+
+- Small refactoring 
+- Add fastlane for pods release 
+
+### 3.1.1
+
+- Fix background color  
+
+### 3.1.0
+
+- Code cleanup 
+
+### 3.0.0
+
+- Swift 4.2
+
 ### 2.1.2

 - Use DispatchGroup for download
@@ -7,22 +7,45 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		7627B06221807C4B0057FFBB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 7627B06121807C4B0057FFBB /* README.md */; };
+		76D7F28121BEB3A0004B74CB /* OpenSourceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F26F21BEB3A0004B74CB /* OpenSourceController.swift */; };
+		76D7F28221BEB3A0004B74CB /* OpenSourceControllerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27021BEB3A0004B74CB /* OpenSourceControllerConfig.swift */; };
+		76D7F28321BEB3A0004B74CB /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27221BEB3A0004B74CB /* Array+Extensions.swift */; };
+		76D7F28421BEB3A0004B74CB /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27321BEB3A0004B74CB /* UIViewController+Extensions.swift */; };
+		76D7F28521BEB3A0004B74CB /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27421BEB3A0004B74CB /* UIView+Extensions.swift */; };
+		76D7F28621BEB3A0004B74CB /* Reusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27521BEB3A0004B74CB /* Reusable.swift */; };
+		76D7F28721BEB3A0004B74CB /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27621BEB3A0004B74CB /* UITableView+Extensions.swift */; };
+		76D7F28821BEB3A0004B74CB /* OpenSourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27821BEB3A0004B74CB /* OpenSourceViewController.swift */; };
+		76D7F28921BEB3A0004B74CB /* LicenceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27921BEB3A0004B74CB /* LicenceListViewController.swift */; };
+		76D7F28A21BEB3A0004B74CB /* OpenSourceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27A21BEB3A0004B74CB /* OpenSourceTableViewCell.swift */; };
+		76D7F28B21BEB3A0004B74CB /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27B21BEB3A0004B74CB /* LoadingViewController.swift */; };
+		76D7F28C21BEB3A0004B74CB /* HTTPDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27D21BEB3A0004B74CB /* HTTPDataLoader.swift */; };
+		76D7F28D21BEB3A0004B74CB /* LicenceFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F27F21BEB3A0004B74CB /* LicenceFile.swift */; };
+		76D7F28E21BEB3A0004B74CB /* LicenceLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F28021BEB3A0004B74CB /* LicenceLoader.swift */; };
 		76EAA8651E93F2CC009A41DA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8641E93F2CC009A41DA /* AppDelegate.swift */; };
 		76EAA8671E93F2CC009A41DA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8661E93F2CC009A41DA /* ViewController.swift */; };
 		76EAA86A1E93F2CC009A41DA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 76EAA8681E93F2CC009A41DA /* Main.storyboard */; };
 		76EAA86C1E93F2CC009A41DA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 76EAA86B1E93F2CC009A41DA /* Assets.xcassets */; };
 		76EAA86F1E93F2CC009A41DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 76EAA86D1E93F2CC009A41DA /* LaunchScreen.storyboard */; };
-		76EAA8881E93F666009A41DA /* OpenSourceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8871E93F666009A41DA /* OpenSourceTableViewCell.swift */; };
-		76EAA88D1E93F675009A41DA /* LicenceDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA88A1E93F675009A41DA /* LicenceDownloader.swift */; };
-		76EAA88E1E93F675009A41DA /* LicenceFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA88B1E93F675009A41DA /* LicenceFile.swift */; };
-		76EAA88F1E93F675009A41DA /* OpenSourceControllerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA88C1E93F675009A41DA /* OpenSourceControllerConfig.swift */; };
-		76EAA8911E93F67B009A41DA /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8901E93F67B009A41DA /* Array+Extensions.swift */; };
-		76EAA8941E93F681009A41DA /* OpenSourceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8921E93F681009A41DA /* OpenSourceController.swift */; };
-		76EAA8951E93F681009A41DA /* OpenSourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8931E93F681009A41DA /* OpenSourceViewController.swift */; };
 		C33E4D96204442AC00142EE6 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = C33E4D95204442AC00142EE6 /* CHANGELOG.md */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
+		7627B06121807C4B0057FFBB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
+		76D7F26F21BEB3A0004B74CB /* OpenSourceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceController.swift; sourceTree = "<group>"; };
+		76D7F27021BEB3A0004B74CB /* OpenSourceControllerConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceControllerConfig.swift; sourceTree = "<group>"; };
+		76D7F27221BEB3A0004B74CB /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F27321BEB3A0004B74CB /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F27421BEB3A0004B74CB /* UIView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F27521BEB3A0004B74CB /* Reusable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reusable.swift; sourceTree = "<group>"; };
+		76D7F27621BEB3A0004B74CB /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F27821BEB3A0004B74CB /* OpenSourceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceViewController.swift; sourceTree = "<group>"; };
+		76D7F27921BEB3A0004B74CB /* LicenceListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LicenceListViewController.swift; sourceTree = "<group>"; };
+		76D7F27A21BEB3A0004B74CB /* OpenSourceTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceTableViewCell.swift; sourceTree = "<group>"; };
+		76D7F27B21BEB3A0004B74CB /* LoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
+		76D7F27D21BEB3A0004B74CB /* HTTPDataLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPDataLoader.swift; sourceTree = "<group>"; };
+		76D7F27F21BEB3A0004B74CB /* LicenceFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LicenceFile.swift; sourceTree = "<group>"; };
+		76D7F28021BEB3A0004B74CB /* LicenceLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LicenceLoader.swift; sourceTree = "<group>"; };
 		76EAA8611E93F2CC009A41DA /* OpenSourceControllerDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenSourceControllerDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		76EAA8641E93F2CC009A41DA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		76EAA8661E93F2CC009A41DA /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -30,13 +53,6 @@
 		76EAA86B1E93F2CC009A41DA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		76EAA86E1E93F2CC009A41DA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		76EAA8701E93F2CC009A41DA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		76EAA8871E93F666009A41DA /* OpenSourceTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceTableViewCell.swift; path = ../../Sources/View/OpenSourceTableViewCell.swift; sourceTree = "<group>"; };
-		76EAA88A1E93F675009A41DA /* LicenceDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceDownloader.swift; path = ../../Sources/Model/LicenceDownloader.swift; sourceTree = "<group>"; };
-		76EAA88B1E93F675009A41DA /* LicenceFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceFile.swift; path = ../../Sources/Model/LicenceFile.swift; sourceTree = "<group>"; };
-		76EAA88C1E93F675009A41DA /* OpenSourceControllerConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceControllerConfig.swift; path = ../../Sources/Model/OpenSourceControllerConfig.swift; sourceTree = "<group>"; };
-		76EAA8901E93F67B009A41DA /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Array+Extensions.swift"; path = "../../Sources/Extensions/Array+Extensions.swift"; sourceTree = "<group>"; };
-		76EAA8921E93F681009A41DA /* OpenSourceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceController.swift; path = ../../Sources/Controller/OpenSourceController.swift; sourceTree = "<group>"; };
-		76EAA8931E93F681009A41DA /* OpenSourceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceViewController.swift; path = ../../Sources/Controller/OpenSourceViewController.swift; sourceTree = "<group>"; };
 		C33E4D95204442AC00142EE6 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -51,11 +67,67 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		76D7F26E21BEB3A0004B74CB /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F26F21BEB3A0004B74CB /* OpenSourceController.swift */,
+				76D7F27021BEB3A0004B74CB /* OpenSourceControllerConfig.swift */,
+				76D7F27121BEB3A0004B74CB /* Utils */,
+				76D7F27721BEB3A0004B74CB /* Controller */,
+				76D7F27C21BEB3A0004B74CB /* Loader */,
+				76D7F27E21BEB3A0004B74CB /* Model */,
+			);
+			name = Sources;
+			path = ../Sources;
+			sourceTree = "<group>";
+		};
+		76D7F27121BEB3A0004B74CB /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F27221BEB3A0004B74CB /* Array+Extensions.swift */,
+				76D7F27321BEB3A0004B74CB /* UIViewController+Extensions.swift */,
+				76D7F27421BEB3A0004B74CB /* UIView+Extensions.swift */,
+				76D7F27521BEB3A0004B74CB /* Reusable.swift */,
+				76D7F27621BEB3A0004B74CB /* UITableView+Extensions.swift */,
+			);
+			path = Utils;
+			sourceTree = "<group>";
+		};
+		76D7F27721BEB3A0004B74CB /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F27821BEB3A0004B74CB /* OpenSourceViewController.swift */,
+				76D7F27921BEB3A0004B74CB /* LicenceListViewController.swift */,
+				76D7F27A21BEB3A0004B74CB /* OpenSourceTableViewCell.swift */,
+				76D7F27B21BEB3A0004B74CB /* LoadingViewController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		76D7F27C21BEB3A0004B74CB /* Loader */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F27D21BEB3A0004B74CB /* HTTPDataLoader.swift */,
+			);
+			path = Loader;
+			sourceTree = "<group>";
+		};
+		76D7F27E21BEB3A0004B74CB /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F27F21BEB3A0004B74CB /* LicenceFile.swift */,
+				76D7F28021BEB3A0004B74CB /* LicenceLoader.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		76EAA8581E93F2CC009A41DA = {
 			isa = PBXGroup;
 			children = (
 				C33E4D95204442AC00142EE6 /* CHANGELOG.md */,
+				7627B06121807C4B0057FFBB /* README.md */,
 				76EAA8631E93F2CC009A41DA /* OpenSourceControllerDemo */,
+				76D7F26E21BEB3A0004B74CB /* Sources */,
 				76EAA8621E93F2CC009A41DA /* Products */,
 			);
 			sourceTree = "<group>";
@@ -73,7 +145,6 @@
 			children = (
 				76EAA8641E93F2CC009A41DA /* AppDelegate.swift */,
 				76EAA8661E93F2CC009A41DA /* ViewController.swift */,
-				76EAA8891E93F66A009A41DA /* Sources */,
 				76EAA8681E93F2CC009A41DA /* Main.storyboard */,
 				76EAA86D1E93F2CC009A41DA /* LaunchScreen.storyboard */,
 				76EAA86B1E93F2CC009A41DA /* Assets.xcassets */,
@@ -82,20 +153,6 @@
 			path = OpenSourceControllerDemo;
 			sourceTree = "<group>";
 		};
-		76EAA8891E93F66A009A41DA /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				76EAA8921E93F681009A41DA /* OpenSourceController.swift */,
-				76EAA8931E93F681009A41DA /* OpenSourceViewController.swift */,
-				76EAA8901E93F67B009A41DA /* Array+Extensions.swift */,
-				76EAA88A1E93F675009A41DA /* LicenceDownloader.swift */,
-				76EAA88B1E93F675009A41DA /* LicenceFile.swift */,
-				76EAA88C1E93F675009A41DA /* OpenSourceControllerConfig.swift */,
-				76EAA8871E93F666009A41DA /* OpenSourceTableViewCell.swift */,
-			);
-			name = Sources;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -123,20 +180,20 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = OpenSourceController;
 				TargetAttributes = {
 					76EAA8601E93F2CC009A41DA = {
 						CreatedOnToolsVersion = 8.3;
-						DevelopmentTeam = 62PP362QNQ;
-						LastSwiftMigration = 0900;
+						DevelopmentTeam = XEHEC9B46E;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 76EAA85C1E93F2CC009A41DA /* Build configuration list for PBXProject "OpenSourceControllerDemo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -159,6 +216,7 @@
 			files = (
 				76EAA86F1E93F2CC009A41DA /* LaunchScreen.storyboard in Resources */,
 				76EAA86C1E93F2CC009A41DA /* Assets.xcassets in Resources */,
+				7627B06221807C4B0057FFBB /* README.md in Resources */,
 				76EAA86A1E93F2CC009A41DA /* Main.storyboard in Resources */,
 				C33E4D96204442AC00142EE6 /* CHANGELOG.md in Resources */,
 			);
@@ -171,15 +229,22 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				76EAA88D1E93F675009A41DA /* LicenceDownloader.swift in Sources */,
-				76EAA88E1E93F675009A41DA /* LicenceFile.swift in Sources */,
-				76EAA8951E93F681009A41DA /* OpenSourceViewController.swift in Sources */,
-				76EAA8881E93F666009A41DA /* OpenSourceTableViewCell.swift in Sources */,
-				76EAA8911E93F67B009A41DA /* Array+Extensions.swift in Sources */,
-				76EAA8941E93F681009A41DA /* OpenSourceController.swift in Sources */,
+				76D7F28721BEB3A0004B74CB /* UITableView+Extensions.swift in Sources */,
+				76D7F28521BEB3A0004B74CB /* UIView+Extensions.swift in Sources */,
+				76D7F28221BEB3A0004B74CB /* OpenSourceControllerConfig.swift in Sources */,
+				76D7F28321BEB3A0004B74CB /* Array+Extensions.swift in Sources */,
 				76EAA8671E93F2CC009A41DA /* ViewController.swift in Sources */,
-				76EAA88F1E93F675009A41DA /* OpenSourceControllerConfig.swift in Sources */,
+				76D7F28921BEB3A0004B74CB /* LicenceListViewController.swift in Sources */,
+				76D7F28C21BEB3A0004B74CB /* HTTPDataLoader.swift in Sources */,
+				76D7F28A21BEB3A0004B74CB /* OpenSourceTableViewCell.swift in Sources */,
+				76D7F28E21BEB3A0004B74CB /* LicenceLoader.swift in Sources */,
+				76D7F28821BEB3A0004B74CB /* OpenSourceViewController.swift in Sources */,
+				76D7F28621BEB3A0004B74CB /* Reusable.swift in Sources */,
 				76EAA8651E93F2CC009A41DA /* AppDelegate.swift in Sources */,
+				76D7F28D21BEB3A0004B74CB /* LicenceFile.swift in Sources */,
+				76D7F28421BEB3A0004B74CB /* UIViewController+Extensions.swift in Sources */,
+				76D7F28B21BEB3A0004B74CB /* LoadingViewController.swift in Sources */,
+				76D7F28121BEB3A0004B74CB /* OpenSourceController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -209,6 +274,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -219,6 +285,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -226,6 +293,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -267,6 +335,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -277,6 +346,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -284,6 +354,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -318,13 +389,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 62PP362QNQ;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				INFOPLIST_FILE = OpenSourceControllerDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -332,13 +402,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 62PP362QNQ;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				INFOPLIST_FILE = OpenSourceControllerDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1100"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,8 +26,16 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "76EAA8601E93F2CC009A41DA"
+            BuildableName = "OpenSourceControllerDemo.app"
+            BlueprintName = "OpenSourceControllerDemo"
+            ReferencedContainer = "container:OpenSourceControllerDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -40,23 +48,11 @@
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "76EAA8601E93F2CC009A41DA"
-            BuildableName = "OpenSourceControllerDemo.app"
-            BlueprintName = "OpenSourceControllerDemo"
-            ReferencedContainer = "container:OpenSourceControllerDemo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -73,8 +69,6 @@
            ReferencedContainer = "container:OpenSourceControllerDemo.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -13,8 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

    var window: UIWindow?

-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }
@@ -40,7 +39,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    func applicationWillTerminate(_ application: UIApplication) {
        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
    }
-
-
 }

@@ -3,61 +3,61 @@
    {
      "size" : "20x20",
      "idiom" : "iphone",
-      "filename" : "logo 8-1.png",
+      "filename" : "logo 7-3 2 2-2.png",
      "scale" : "2x"
    },
    {
      "size" : "20x20",
      "idiom" : "iphone",
-      "filename" : "logo 8.png",
+      "filename" : "logo 7-3 2 2-1.png",
      "scale" : "3x"
    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
-      "filename" : "logo 9-1.png",
+      "filename" : "logo 7-3 2 2.png",
      "scale" : "2x"
    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
-      "filename" : "logo 9.png",
+      "filename" : "logo 7-3 2-4.png",
      "scale" : "3x"
    },
    {
      "size" : "40x40",
      "idiom" : "iphone",
-      "filename" : "logo 10-3.png",
+      "filename" : "logo 7-3 2-3.png",
      "scale" : "2x"
    },
    {
      "size" : "40x40",
      "idiom" : "iphone",
-      "filename" : "logo 10-2.png",
+      "filename" : "logo 7-3 2-2.png",
      "scale" : "3x"
    },
    {
      "size" : "60x60",
      "idiom" : "iphone",
-      "filename" : "logo 10-1.png",
+      "filename" : "logo 7-3 2-1.png",
      "scale" : "2x"
    },
    {
      "size" : "60x60",
      "idiom" : "iphone",
-      "filename" : "logo 10.png",
+      "filename" : "logo 7-3 2.png",
      "scale" : "3x"
    },
    {
      "size" : "20x20",
      "idiom" : "ipad",
-      "filename" : "logo 4-1.png",
+      "filename" : "logo 7-5.png",
      "scale" : "1x"
    },
    {
      "size" : "20x20",
      "idiom" : "ipad",
-      "filename" : "logo 4.png",
+      "filename" : "logo 7-4.png",
      "scale" : "2x"
    },
    {
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "logo 7-3 2 2 2-2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logo 7-3 2 2 2-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logo 7-3 2 2 2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -16,7 +20,20 @@
                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="AmH-DA-KFE">
+                                <rect key="frame" x="87.5" y="233.5" width="200" height="200"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="200" id="TkH-v5-gZa"/>
+                                    <constraint firstAttribute="width" constant="200" id="b8V-t1-IPP"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="AmH-DA-KFE" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="K8c-8t-pu8"/>
+                            <constraint firstItem="AmH-DA-KFE" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="dMd-Ag-82A"/>
+                        </constraints>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -24,4 +41,7 @@
            <point key="canvasLocation" x="53" y="375"/>
        </scene>
    </scenes>
+    <resources>
+        <image name="Logo" width="1024" height="1024"/>
+    </resources>
 </document>
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fdz-at-fDg">
    <device id="retina4_7" orientation="portrait">
        <adaptation id="fullscreen"/>
    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
-        <!--View Controller-->
+        <!--Demo-->
        <scene sceneID="tne-QT-ifu">
            <objects>
                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="OpenSourceControllerDemo" customModuleProvider="target" sceneMemberID="viewController">
@@ -23,24 +22,60 @@
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LI4-fC-2Ry">
-                                <rect key="frame" x="23" y="318" width="328" height="30"/>
-                                <state key="normal" title="Show me"/>
+                                <rect key="frame" x="23" y="318.5" width="329" height="30"/>
+                                <state key="normal" title="Show me (push)">
+                                    <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                                </state>
                                <connections>
-                                    <action selector="showOpenSource:" destination="BYZ-38-t0r" eventType="touchUpInside" id="vmT-jj-Xvr"/>
+                                    <action selector="pushOpenSourceController:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Exu-2l-lfA"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wfq-WN-CRo">
+                                <rect key="frame" x="23" y="356" width="329" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="LLB-12-8xE"/>
+                                </constraints>
+                                <state key="normal" title="Show me (present)">
+                                    <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                                </state>
+                                <connections>
+                                    <action selector="presentOpenSourceController:" destination="BYZ-38-t0r" eventType="touchUpInside" id="SoS-HF-0LZ"/>
                                </connections>
                            </button>
                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="tintColor" red="0.0" green="0.58980089430000004" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
+                            <constraint firstItem="wfq-WN-CRo" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="7" id="7s5-n0-5gS"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="wfq-WN-CRo" secondAttribute="trailing" constant="7" id="Qvn-Hu-Pci"/>
                            <constraint firstItem="LI4-fC-2Ry" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="jXk-ZK-0PF"/>
+                            <constraint firstItem="wfq-WN-CRo" firstAttribute="top" secondItem="LI4-fC-2Ry" secondAttribute="bottom" constant="7.5" id="ncu-07-cO6"/>
                            <constraint firstItem="LI4-fC-2Ry" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="7" id="q0g-Cs-CVt"/>
                            <constraint firstItem="LI4-fC-2Ry" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="wVV-oT-zRH"/>
                        </constraints>
                    </view>
-                    <navigationItem key="navigationItem" id="0ga-4U-IeA"/>
+                    <navigationItem key="navigationItem" title="Demo" id="0ga-4U-IeA"/>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
            </objects>
+            <point key="canvasLocation" x="1754.4000000000001" y="138.98050974512745"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="mMO-Hp-rx0">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="fdz-at-fDg" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="gcV-6a-gYe">
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="v9Q-2O-OOv"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="sjw-k6-nEt" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
            <point key="canvasLocation" x="815.20000000000005" y="138.98050974512745"/>
        </scene>
    </scenes>
@@ -16,17 +16,15 @@ class ViewController: UIViewController {
        super.viewDidLoad()
    }

-    // MARK: - Action 
+    // MARK: - Action
    
-    /// Handle button click & show the controller with licences 
-    @IBAction func showOpenSource(_ sender: Any) {
-        // Create controller 
+    private func buildOpenSourceController() -> OpenSourceController {
        let openSourceVC = OpenSourceController()
        
-        // Apply some customisation if you want 
-        //self.controllerCustomUI(openSourceVC: openSourceVC)
+        // Apply some customisation if you want
+        //self.applyCustomUI(openSourceVC: openSourceVC)
        
-        // Init with LicenceFile object 
+        // Init with LicenceFile object
        openSourceVC.licences = [LicenceFile(title: "FacebookImagePicker",
                                             url: "https://raw.githubusercontent.com/terflogag/FacebookImagePicker/master/LICENSE"),
                                 LicenceFile(title: "JSQMessagesViewController",
@@ -37,40 +35,49 @@ class ViewController: UIViewController {
                                             url: "https://raw.githubusercontent.com/nickoneill/PermissionScope/master/LICENSE"),
                                 LicenceFile(title: "EasyTipView",
                                             url: "https://raw.githubusercontent.com/teodorpatras/EasyTipView/master/LICENSE"),
-                                 LicenceFile(title: "ReachabilitySwift",
-                                             url: "https://raw.githubusercontent.com/ashleymills/Reachability.swift/master/LICENSE"),
+                                 LicenceFile(title: "FakeAdress",
+                                             url: "https://fake.com/fake/LICENCE"),
                                 LicenceFile(title: "KeychainAccess",
                                             url: "https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/LICENSE")]
        
-        // Present controller 
+        return openSourceVC
+    }
+    
+    @IBAction func pushOpenSourceController(_ sender: Any) {
+        let openSourceVC = self.buildOpenSourceController()
+        openSourceVC.pushOpenSourceController(from: self)
+    }
+    
+    @IBAction func presentOpenSourceController(_ sender: Any) {
+        let openSourceVC = self.buildOpenSourceController()
        openSourceVC.presentOpenSourceController(from: self)
    }
    
    // MARK: - Customization 
    
-    fileprivate func controllerCustomUI(openSourceVC: OpenSourceController) {
-        // Navigation bar title 
+    fileprivate func applyCustomUI(openSourceVC: OpenSourceController) {
+        // Navigation bar title
        openSourceVC.config.title = "MyCustomTitle"
-        
+
        // Navigation bar tint color
        openSourceVC.config.uiConfig.barTintColor = UIColor.red
-        
-        // Close button color 
-        openSourceVC.config.uiConfig.closeButtonColor = UIColor.white
-        
-        // BackgroundColor 
+
+        // Close button color
+        openSourceVC.config.uiConfig.closeButtonColor = UIColor.green
+
+        // BackgroundColor
        openSourceVC.config.uiConfig.backgroundColor = UIColor.red.withAlphaComponent(0.6)
-        
-        // Licence text color  
-        openSourceVC.config.uiConfig.licenceTextColor = UIColor.white
-        
+
+        // Licence text color
+        openSourceVC.config.uiConfig.licenceTextColor = UIColor.green
+
        // Navigation bar title color
-        openSourceVC.config.uiConfig.titleColor = UIColor.white
-        
-        // Licence cell background color 
+        openSourceVC.config.uiConfig.titleColor = UIColor.green
+
+        // Licence cell background color
        openSourceVC.config.uiConfig.licenceBackgroundColor = UIColor.red
-        
-        // Verbose mode 
+
+        // Verbose mode
        openSourceVC.config.verbose = true
    }
 }
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "cocoapods"
+gem "fastlane"
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = 'OpenSourceController'
-s.version          = '2.1.2'
+s.version          = '3.2.1'
 s.summary          = 'Display all the librarys licence used in your application. Enjoy !'
 s.description      = 'Display a screen with all licence used in your apply can be painful to maintain. OpenSourceController was built to respond to this problem. OpenSourceController is a simple parser to display the licences which are used in your application.'
 s.homepage         = 'https://github.com/floriangbh/OpenSourceController'
@@ -9,4 +9,5 @@ s.author           = { 'Florian Gabach' => 'florian.gabach@gmail.com' }
 s.source           = { :git => 'https://github.com/floriangbh/OpenSourceController.git', :tag => s.version.to_s }
 s.ios.deployment_target = '9.0'
 s.source_files = 'Sources/**/*'
+s.swift_versions = ['5.0']
 end
@@ -8,13 +8,20 @@

 /* Begin PBXBuildFile section */
 		52D6D9871BEFF229002C0205 /* OpenSourceController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* OpenSourceController.framework */; };
-		76EAA8441E93EDA5009A41DA /* OpenSourceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8421E93EDA5009A41DA /* OpenSourceController.swift */; };
-		76EAA8451E93EDA5009A41DA /* OpenSourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8431E93EDA5009A41DA /* OpenSourceViewController.swift */; };
-		76EAA8481E93EDB3009A41DA /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8471E93EDB3009A41DA /* Array+Extensions.swift */; };
-		76EAA84E1E93EDCD009A41DA /* LicenceDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA84B1E93EDCD009A41DA /* LicenceDownloader.swift */; };
+		76229B722180AD8400A61697 /* LicenceLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B712180AD8400A61697 /* LicenceLoader.swift */; };
+		76229B7D2180AD9F00A61697 /* HTTPDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */; };
+		76229B802180ADA800A61697 /* OpenSourceControllerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7E2180ADA800A61697 /* OpenSourceControllerConfig.swift */; };
+		76229B812180ADA800A61697 /* OpenSourceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76229B7F2180ADA800A61697 /* OpenSourceController.swift */; };
+		769FD9D121871DEC00FB5A53 /* OpenSourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9CD21871DEC00FB5A53 /* OpenSourceViewController.swift */; };
+		769FD9D221871DEC00FB5A53 /* LicenceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9CE21871DEC00FB5A53 /* LicenceListViewController.swift */; };
+		769FD9D321871DEC00FB5A53 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9CF21871DEC00FB5A53 /* LoadingViewController.swift */; };
+		769FD9D421871DEC00FB5A53 /* OpenSourceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769FD9D021871DEC00FB5A53 /* OpenSourceTableViewCell.swift */; };
+		76D7F24521BEB18A004B74CB /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */; };
+		76D7F24621BEB18A004B74CB /* Reusable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24121BEB18A004B74CB /* Reusable.swift */; };
+		76D7F24721BEB18A004B74CB /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */; };
+		76D7F24821BEB18A004B74CB /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24321BEB18A004B74CB /* Array+Extensions.swift */; };
+		76D7F24921BEB18A004B74CB /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D7F24421BEB18A004B74CB /* UIView+Extensions.swift */; };
 		76EAA84F1E93EDCD009A41DA /* LicenceFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA84C1E93EDCD009A41DA /* LicenceFile.swift */; };
-		76EAA8501E93EDCD009A41DA /* OpenSourceControllerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA84D1E93EDCD009A41DA /* OpenSourceControllerConfig.swift */; };
-		76EAA8531E93EDF0009A41DA /* OpenSourceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76EAA8521E93EDF0009A41DA /* OpenSourceTableViewCell.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -30,13 +37,20 @@
 /* Begin PBXFileReference section */
 		52D6D97C1BEFF229002C0205 /* OpenSourceController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenSourceController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		52D6D9861BEFF229002C0205 /* OpenSourceController-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenSourceController-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		76EAA8421E93EDA5009A41DA /* OpenSourceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceController.swift; path = Sources/Controller/OpenSourceController.swift; sourceTree = "<group>"; };
-		76EAA8431E93EDA5009A41DA /* OpenSourceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceViewController.swift; path = Sources/Controller/OpenSourceViewController.swift; sourceTree = "<group>"; };
-		76EAA8471E93EDB3009A41DA /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Array+Extensions.swift"; path = "Sources/Extensions/Array+Extensions.swift"; sourceTree = "<group>"; };
-		76EAA84B1E93EDCD009A41DA /* LicenceDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceDownloader.swift; path = Sources/Model/LicenceDownloader.swift; sourceTree = "<group>"; };
+		76229B712180AD8400A61697 /* LicenceLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceLoader.swift; path = Sources/Model/LicenceLoader.swift; sourceTree = "<group>"; };
+		76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPDataLoader.swift; path = Sources/Loader/HTTPDataLoader.swift; sourceTree = "<group>"; };
+		76229B7E2180ADA800A61697 /* OpenSourceControllerConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceControllerConfig.swift; path = Sources/OpenSourceControllerConfig.swift; sourceTree = "<group>"; };
+		76229B7F2180ADA800A61697 /* OpenSourceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceController.swift; path = Sources/OpenSourceController.swift; sourceTree = "<group>"; };
+		769FD9CD21871DEC00FB5A53 /* OpenSourceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceViewController.swift; path = Sources/Controller/OpenSourceViewController.swift; sourceTree = "<group>"; };
+		769FD9CE21871DEC00FB5A53 /* LicenceListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceListViewController.swift; path = Sources/Controller/LicenceListViewController.swift; sourceTree = "<group>"; };
+		769FD9CF21871DEC00FB5A53 /* LoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadingViewController.swift; path = Sources/Controller/LoadingViewController.swift; sourceTree = "<group>"; };
+		769FD9D021871DEC00FB5A53 /* OpenSourceTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceTableViewCell.swift; path = Sources/Controller/OpenSourceTableViewCell.swift; sourceTree = "<group>"; };
+		76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UITableView+Extensions.swift"; path = "Sources/Utils/UITableView+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F24121BEB18A004B74CB /* Reusable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Reusable.swift; path = Sources/Utils/Reusable.swift; sourceTree = "<group>"; };
+		76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIViewController+Extensions.swift"; path = "Sources/Utils/UIViewController+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F24321BEB18A004B74CB /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Array+Extensions.swift"; path = "Sources/Utils/Array+Extensions.swift"; sourceTree = "<group>"; };
+		76D7F24421BEB18A004B74CB /* UIView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+Extensions.swift"; path = "Sources/Utils/UIView+Extensions.swift"; sourceTree = "<group>"; };
 		76EAA84C1E93EDCD009A41DA /* LicenceFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LicenceFile.swift; path = Sources/Model/LicenceFile.swift; sourceTree = "<group>"; };
-		76EAA84D1E93EDCD009A41DA /* OpenSourceControllerConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceControllerConfig.swift; path = Sources/Model/OpenSourceControllerConfig.swift; sourceTree = "<group>"; };
-		76EAA8521E93EDF0009A41DA /* OpenSourceTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OpenSourceTableViewCell.swift; path = Sources/View/OpenSourceTableViewCell.swift; sourceTree = "<group>"; };
 		AD2FAA261CD0B6D800659CF4 /* OpenSourceController.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OpenSourceController.plist; sourceTree = "<group>"; };
 		AD2FAA281CD0B6E100659CF4 /* OpenSourceControllerTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OpenSourceControllerTests.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -87,50 +101,57 @@
 			path = Configs;
 			sourceTree = "<group>";
 		};
-		76EAA8461E93EDA9009A41DA /* Controller */ = {
+		76229B702180AD7700A61697 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				76EAA8421E93EDA5009A41DA /* OpenSourceController.swift */,
-				76EAA8431E93EDA5009A41DA /* OpenSourceViewController.swift */,
+				76229B712180AD8400A61697 /* LicenceLoader.swift */,
+				76EAA84C1E93EDCD009A41DA /* LicenceFile.swift */,
 			);
-			name = Controller;
+			name = Model;
 			sourceTree = "<group>";
 		};
-		76EAA8491E93EDBB009A41DA /* Extensions */ = {
+		76229B7B2180AD8E00A61697 /* Loader */ = {
 			isa = PBXGroup;
 			children = (
-				76EAA8471E93EDB3009A41DA /* Array+Extensions.swift */,
+				76229B7C2180AD9F00A61697 /* HTTPDataLoader.swift */,
 			);
-			name = Extensions;
+			name = Loader;
+			sourceTree = "<group>";
+		};
+		76EAA8491E93EDBB009A41DA /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				76D7F24321BEB18A004B74CB /* Array+Extensions.swift */,
+				76D7F24121BEB18A004B74CB /* Reusable.swift */,
+				76D7F24021BEB18A004B74CB /* UITableView+Extensions.swift */,
+				76D7F24421BEB18A004B74CB /* UIView+Extensions.swift */,
+				76D7F24221BEB18A004B74CB /* UIViewController+Extensions.swift */,
+			);
+			name = Utils;
 			sourceTree = "<group>";
 		};
 		76EAA84A1E93EDC0009A41DA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				76EAA8511E93EDD2009A41DA /* Model */,
-				76EAA8541E93EDF3009A41DA /* View */,
-				76EAA8461E93EDA9009A41DA /* Controller */,
-				76EAA8491E93EDBB009A41DA /* Extensions */,
+				76229B7F2180ADA800A61697 /* OpenSourceController.swift */,
+				76229B7E2180ADA800A61697 /* OpenSourceControllerConfig.swift */,
+				76229B7B2180AD8E00A61697 /* Loader */,
+				76229B702180AD7700A61697 /* Model */,
+				76EAA8511E93EDD2009A41DA /* Controller */,
+				76EAA8491E93EDBB009A41DA /* Utils */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
 		};
-		76EAA8511E93EDD2009A41DA /* Model */ = {
+		76EAA8511E93EDD2009A41DA /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				76EAA84B1E93EDCD009A41DA /* LicenceDownloader.swift */,
-				76EAA84C1E93EDCD009A41DA /* LicenceFile.swift */,
-				76EAA84D1E93EDCD009A41DA /* OpenSourceControllerConfig.swift */,
+				769FD9CE21871DEC00FB5A53 /* LicenceListViewController.swift */,
+				769FD9CF21871DEC00FB5A53 /* LoadingViewController.swift */,
+				769FD9D021871DEC00FB5A53 /* OpenSourceTableViewCell.swift */,
+				769FD9CD21871DEC00FB5A53 /* OpenSourceViewController.swift */,
 			);
-			name = Model;
-			sourceTree = "<group>";
-		};
-		76EAA8541E93EDF3009A41DA /* View */ = {
-			isa = PBXGroup;
-			children = (
-				76EAA8521E93EDF0009A41DA /* OpenSourceTableViewCell.swift */,
-			);
-			name = View;
+			name = Controller;
 			sourceTree = "<group>";
 		};
 		DD7502721C68FC1B006590AF /* Frameworks */ = {
@@ -205,25 +226,29 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = OpenSourceController;
 				TargetAttributes = {
 					52D6D97B1BEFF229002C0205 = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 0830;
+						DevelopmentTeam = XEHEC9B46E;
+						LastSwiftMigration = 1100;
+						ProvisioningStyle = Automatic;
 					};
 					52D6D9851BEFF229002C0205 = {
 						CreatedOnToolsVersion = 7.1;
+						DevelopmentTeam = XEHEC9B46E;
 						LastSwiftMigration = "";
 					};
 				};
 			};
 			buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "OpenSourceController" */;
 			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 52D6D9721BEFF229002C0205;
 			productRefGroup = 52D6D97D1BEFF229002C0205 /* Products */;
@@ -258,13 +283,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				76EAA84E1E93EDCD009A41DA /* LicenceDownloader.swift in Sources */,
+				76D7F24921BEB18A004B74CB /* UIView+Extensions.swift in Sources */,
+				76229B7D2180AD9F00A61697 /* HTTPDataLoader.swift in Sources */,
+				76D7F24621BEB18A004B74CB /* Reusable.swift in Sources */,
+				769FD9D221871DEC00FB5A53 /* LicenceListViewController.swift in Sources */,
+				769FD9D121871DEC00FB5A53 /* OpenSourceViewController.swift in Sources */,
+				76D7F24721BEB18A004B74CB /* UIViewController+Extensions.swift in Sources */,
 				76EAA84F1E93EDCD009A41DA /* LicenceFile.swift in Sources */,
-				76EAA8441E93EDA5009A41DA /* OpenSourceController.swift in Sources */,
-				76EAA8481E93EDB3009A41DA /* Array+Extensions.swift in Sources */,
-				76EAA8531E93EDF0009A41DA /* OpenSourceTableViewCell.swift in Sources */,
-				76EAA8501E93EDCD009A41DA /* OpenSourceControllerConfig.swift in Sources */,
-				76EAA8451E93EDA5009A41DA /* OpenSourceViewController.swift in Sources */,
+				76229B722180AD8400A61697 /* LicenceLoader.swift in Sources */,
+				76D7F24521BEB18A004B74CB /* UITableView+Extensions.swift in Sources */,
+				769FD9D421871DEC00FB5A53 /* OpenSourceTableViewCell.swift in Sources */,
+				76D7F24821BEB18A004B74CB /* Array+Extensions.swift in Sources */,
+				76229B812180ADA800A61697 /* OpenSourceController.swift in Sources */,
+				769FD9D321871DEC00FB5A53 /* LoadingViewController.swift in Sources */,
+				76229B802180ADA800A61697 /* OpenSourceControllerConfig.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -290,6 +322,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -298,12 +331,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -347,6 +382,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -355,12 +391,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -398,8 +436,11 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -410,9 +451,10 @@
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS";
 				PRODUCT_NAME = OpenSourceController;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -421,8 +463,11 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -432,9 +477,10 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS";
 				PRODUCT_NAME = OpenSourceController;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -443,6 +489,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				INFOPLIST_FILE = Configs/OpenSourceControllerTests.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS-Tests";
@@ -457,6 +504,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
+				DEVELOPMENT_TEAM = XEHEC9B46E;
 				INFOPLIST_FILE = Configs/OpenSourceControllerTests.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS-Tests";
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1100"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
+            BuildableName = "OpenSourceController.framework"
+            BlueprintName = "OpenSourceController-iOS"
+            ReferencedContainer = "container:OpenSourceController.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -41,23 +49,11 @@
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
-            BuildableName = "OpenSourceController.framework"
-            BlueprintName = "OpenSourceController-iOS"
-            ReferencedContainer = "container:OpenSourceController.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -73,8 +69,6 @@
            ReferencedContainer = "container:OpenSourceController.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1100"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
+            BuildableName = "OpenSourceController.framework"
+            BlueprintName = "OpenSourceController-macOS"
+            ReferencedContainer = "container:OpenSourceController.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -41,23 +49,11 @@
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
-            BuildableName = "OpenSourceController.framework"
-            BlueprintName = "OpenSourceController-macOS"
-            ReferencedContainer = "container:OpenSourceController.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -73,8 +69,6 @@
            ReferencedContainer = "container:OpenSourceController.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1100"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,9 +26,17 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
+            BuildableName = "OpenSourceController.framework"
+            BlueprintName = "OpenSourceController-tvOS"
+            ReferencedContainer = "container:OpenSourceController.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -41,23 +49,11 @@
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
-            BuildableName = "OpenSourceController.framework"
-            BlueprintName = "OpenSourceController-tvOS"
-            ReferencedContainer = "container:OpenSourceController.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -73,8 +69,6 @@
            ReferencedContainer = "container:OpenSourceController.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1100"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,19 +26,15 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES"
      codeCoverageEnabled = "YES">
      <Testables>
      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -54,8 +50,6 @@
            ReferencedContainer = "container:OpenSourceController.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Release"
@@ -33,20 +33,21 @@ Display a screen with all licences used in your application can be painful to ma
 - [ ] Download licence from Podfile (https://github.com/terflogag/OpenSourceController/issues/1)
 - [ ] Download licence from Cartfile (https://github.com/terflogag/OpenSourceController/issues/2)
 - [ ] Download licence from local file
- [ ] Unit & UI Test 

 ## Requirements

 * Xcode 9
 * iOS 9.0+ target deployment
-* Swift 3 or Swift 4 project
+* Swift 3, Swift 4 or Swift 4.2 project

 ## Installation

 - To integrate OpenSourceController into your Xcode project using [CocoaPods](http://cocoapods.org), specify it in your Podfile :

 ```ruby
-pod "OpenSourceController", '~> 2.0' 
+pod "OpenSourceController", '~> 3.0.0' # Swift 4.2 Version
+
+pod "OpenSourceController", '~> 2.0' # Swift 4.0 Version 

 pod "OpenSourceController", '~> 1.0.8' # Swift 3.1 version
 ```
@@ -54,7 +55,9 @@ pod "OpenSourceController", '~> 1.0.8' # Swift 3.1 version
 - To integrate OpenSourceController into your Xcode project using [Carthage](https://github.com/Carthage/Carthage), specify it in your Cartfile :

 ```ruby
-github "floriangbh/OpenSourceController" ~> 2.0
+github "floriangbh/OpenSourceController" ~> 3.0.0 # Swift 4.2 version
+
+github "floriangbh/OpenSourceController" ~> 2.0 # Swift 4.0 version

 github "floriangbh/OpenSourceController" ~> 1.0.8 # Swift 3.1 version
 ```
@@ -75,9 +78,9 @@ let openSourceVC = OpenSourceController()

 // Init with LicenceFile object 
 openSourceVC.licences = [LicenceFile(title: "FacebookImagePicker", 
-url: "https://raw.githubusercontent.com/terflogag/FacebookImagePicker/master/LICENSE"),
-LicenceFile(title: "JSQMessagesViewController", 
-url: "https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/LICENSE")]
+                        url: "https://raw.githubusercontent.com/terflogag/FacebookImagePicker/master/LICENSE"),
+                        LicenceFile(title: "JSQMessagesViewController", 
+                        url: "https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/LICENSE")]

 // Present controller 
 openSourceVC.presentOpenSourceController(from: self)
@@ -0,0 +1,71 @@
+//
+//  LicenceListViewController.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 23/10/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import UIKit
+
+final class LicenceListViewController: UITableViewController {
+    
+    // MARK: - Var
+    
+    fileprivate var config: OpenSourceControllerConfig
+
+    fileprivate var downloadedLicence: [LicenceFile]
+    
+    // MARK: - Lifecyle
+    
+    init(downloadedLicence: [LicenceFile], config: OpenSourceControllerConfig) {
+        self.config = config
+        self.downloadedLicence = downloadedLicence
+        super.init(style: .plain)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.prepareTableView()
+    }
+    
+    // MARK: - Prepare
+    
+    fileprivate func prepareTableView() {
+        self.tableView.tableFooterView = UIView()
+        self.tableView.register(cellType: OpenSourceTableViewCell.self)
+        self.tableView.dataSource = self
+        self.tableView.delegate = self
+        self.tableView.separatorStyle = .singleLine
+        self.tableView.backgroundColor = self.config.uiConfig.backgroundColor
+    }
+}
+    
+extension LicenceListViewController {
+    
+    // MARK: - Table View Data Source
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.downloadedLicence.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell: OpenSourceTableViewCell = tableView.dequeueReusableCell(for: indexPath)
+        guard let licence = self.downloadedLicence.get(at: indexPath.row) else { return cell }
+        cell.configure(licence: licence, config: self.config)
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+}
@@ -0,0 +1,42 @@
+//
+//  LoadingViewController.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 23/10/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import UIKit
+
+final class LoadingViewController: UIViewController {
+    
+    // MARK: - Var
+    
+    fileprivate lazy var activityIndicator: UIActivityIndicatorView = {
+        let activityIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
+        activityIndicator.startAnimating()
+        return activityIndicator
+    }()
+    
+    fileprivate var config: OpenSourceControllerConfig
+    
+    // MARK: - Lifecycle
+    
+    init(configuration: OpenSourceControllerConfig) {
+        self.config = configuration
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.view.backgroundColor = self.config.uiConfig.backgroundColor
+        
+        self.view.addSubview(self.activityIndicator)
+        self.activityIndicator.pinCenter(to: self.view)
+    }
+}
@@ -1,58 +0,0 @@
-//
-//  OpenSourceController.swift
-//  Pods
-//
-//  Created by Florian Gabach on 05/02/2017.
-
-import UIKit
-
-public class OpenSourceController: NSObject { 
-
-    // Contains list of licence object 
-    open var licences: [LicenceFile]?
-
-    // Configuration
-    open var config = OpenSourceControllerConfig()
-
-    /// Present OpenSourceViewController embbeded in navigation controller
-    ///
-    /// - Parameter from: the source controller 
-    open func presentOpenSourceController(from: UIViewController) {
-        // Create open source controller
-        let licenceController = OpenSourceViewController()
-
-        // Init licence 
-        licenceController.licences = self.licences
-
-        // Init config
-        licenceController.config = self.config
-
-        // Embed in navigation controller
-        let navController = UINavigationController(rootViewController: licenceController)
-
-        // Present controller 
-        from.present(navController, animated: true)
-    }
-    
-    /// Push OpenSourceViewController from navigation controller 
-    ///
-    /// - Parameter from: the source controller
-    open func pushOpenSourceController(from: UIViewController) {
-        // Create open source controller
-        let licenceController = OpenSourceViewController()
-        licenceController.showCloseButton = false // Don't show close button
-        
-        // Init licence
-        licenceController.licences = self.licences
-        
-        // Init config
-        licenceController.config = self.config
-        
-        // Push controller
-        guard let navigationController = from.navigationController else {
-            print("Source controller isn't embeded in navigation controller. Can't push.")
-            return
-        }
-        navigationController.pushViewController(licenceController, animated: true)
-    }
-}
@@ -0,0 +1,40 @@
+//
+//  OpenSourceTableViewCell.swift
+//  Pods
+//
+//  Created by Florian Gabach on 05/02/2017.
+
+import UIKit
+
+final class OpenSourceTableViewCell: UITableViewCell, Reusable {
+
+    // MARK: - Lifecycle
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: .default, reuseIdentifier: reuseIdentifier)
+        self.prepareCellComponent()
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+
+    // MARK: - Prepare
+
+    func prepareCellComponent() {
+        self.textLabel?.numberOfLines = 0
+        self.accessoryType = .none
+        self.selectionStyle = .none
+    }
+
+    // MARK: - Configure
+
+    func configure(licence: LicenceFile, config: OpenSourceControllerConfig) {
+        self.textLabel?.attributedText = licence.attributedContent
+        self.textLabel?.textColor = config.uiConfig.licenceTextColor
+
+        if let backgroundColor = config.uiConfig.licenceBackgroundColor {
+            self.backgroundColor = backgroundColor
+        }
+    }
+}
@@ -6,207 +6,87 @@

 import UIKit

-class OpenSourceViewController: UITableViewController {
+final class OpenSourceViewController: UIViewController {
    
    // MARK: - Var
    
-    /// Loading indicator 
-    fileprivate lazy var indicator: UIActivityIndicatorView = {
-        let indicator = UIActivityIndicatorView(frame:CGRect(x: 0,
-                                                             y: 0,
-                                                             width: 40,
-                                                             height: 40) )
-        indicator.activityIndicatorViewStyle = UIActivityIndicatorViewStyle.gray
-        indicator.hidesWhenStopped = true
-        indicator.backgroundColor = UIColor.clear
-        indicator.color = UIColor.black
-        return indicator
+    fileprivate var showCloseButton: Bool
+
+    fileprivate var licences: [LicenceFile]
+    
+    fileprivate var licenceLoader: LicenceLoader
+    
+    fileprivate var config: OpenSourceControllerConfig
+    
+    fileprivate lazy var loadingController = {
+       return LoadingViewController(configuration: config)
    }()
    
-    /// TableViewCell identifier
-    private let reuseIdentifier = "openSourceCell"
-    
-    /// Contains all licence object before downloaded 
-    internal var licences: [LicenceFile]?
-    
-    /// Controller configuration for customization
-    internal var config = OpenSourceControllerConfig()
-    
-    /// Do we need to show the close button ? (disable if push the controller)
-    internal var showCloseButton: Bool = true
-    
-    /// Contains all licences object after downloaded
-    fileprivate var downloadedLicence: [LicenceFile]? {
-        didSet {
-            // Update UI 
-            DispatchQueue.main.async { [weak self] in 
-                self?.stopLoading()
-                self?.tableView.reloadData()
-            }
-        }
-    }
+    fileprivate lazy var closeButton: UIBarButtonItem = {
+        let closeButton = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(self.closePicker))
+        closeButton.tintColor = self.config.uiConfig.closeButtonColor ?? UIColor.black
+        return closeButton
+    }()
    
    // MARK: - Lifecyle
    
+    init(licences: [LicenceFile], showCloseButton: Bool, configuration: OpenSourceControllerConfig, licenceLoader: LicenceLoader) {
+        self.licenceLoader = licenceLoader
+        self.licences = licences
+        self.showCloseButton = showCloseButton
+        self.config = configuration
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
    override func viewDidLoad() {
        super.viewDidLoad()
        
-        // Prepare controller
-        self.prepare()
+        self.title = self.config.title
+        
+        self.view.backgroundColor = self.config.uiConfig.backgroundColor
+        
+        self.prepareCloseButton()
+        self.prepareStyle()
+        
+        self.add(self.loadingController)
+        self.prepareLicences()
    }
    
    // MARK: - Prepare
    
-    /// Prepare controller
-    fileprivate func prepare() {
-        self.prepareTableView()
-        self.prepareActivityIndicator()
-        
-        if showCloseButton {
-            self.prepareCloseButton()
-        }
-        
-        self.prepareStyle()
-        self.prepareLicences()
-    }
-    
-    /// Download licences 
-    fileprivate func prepareLicences() {
-        self.startLoading()
-        
-        // Retrieve licence
-        guard let licences = self.licences else {
-            print("No licences found.")
-            return
-        }
-        
-        // Download licence
-        LicenceDownloader.downloadLicences(licences: licences,
-                                           config: self.config) { () in
-                                            // Update licences
-                                            self.downloadedLicence = self.licences
-        }
-    }
-    
-    /// Init tableView dataSource, delegate, bar button & title
-    fileprivate func prepareTableView() {
-        // Common init
-        self.tableView.tableFooterView = UIView()
-        self.tableView.register(OpenSourceTableViewCell.self, forCellReuseIdentifier: self.reuseIdentifier)
-        self.title = self.config.title
-        self.tableView.register(OpenSourceTableViewCell.self,
-                                forCellReuseIdentifier: self.reuseIdentifier)
-        self.tableView.dataSource = self
-        self.tableView.delegate = self
-        self.tableView.separatorStyle = .singleLine
-        
-        // Apply background color from configuration if needed
-        if let backgroundColor = self.config.uiConfig.backgroundColor {
-            self.tableView.backgroundColor = backgroundColor
-        }
-    }
-    
-    /// Prepare controller style
    fileprivate func prepareStyle() {
-        // Apply navigation bar tint color if needed
        if let tintColor = self.config.uiConfig.barTintColor {
            self.navigationController?.navigationBar.barTintColor = tintColor
        }
        
-        // Applu navigation bar text color if needed
        if let textColor = self.config.uiConfig.titleColor {
-            let attribut = [NSAttributedStringKey.foregroundColor: textColor]
+            let attribut = [NSAttributedString.Key.foregroundColor: textColor]
            self.navigationController?.navigationBar.titleTextAttributes = attribut
        }
    }
    
-    /// Prepare close button on navigation bar 
+    fileprivate func prepareLicences() {
+        self.licenceLoader.downloadLicences(licences: licences, config: config) { [weak self] in
+            guard let strongSelf = self else { return }
+            let listController = LicenceListViewController(downloadedLicence: strongSelf.licences, config: strongSelf.config)
+            strongSelf.loadingController.remove()
+            strongSelf.add(listController)
+        }
+    }
+    
    fileprivate func prepareCloseButton() {
-        // Close button (on the right corner of navigation bar)
-        let closeButton = UIBarButtonItem(barButtonSystemItem: .stop,
-                                          target: self,
-                                          action: #selector(self.closePicker))
-        closeButton.tintColor = config.uiConfig.closeButtonColor ?? UIColor.black
-        self.navigationItem.rightBarButtonItem = closeButton
-    }
-    
-    // MARK: - Loading indicator
-    
-    /// Prepare UIActivityIndicatorView and display it at the center of the view
-    fileprivate func prepareActivityIndicator() {
-        // Add to view
-        self.view.addSubview(indicator)
-        
-        // Apply constraint
-        self.indicator.translatesAutoresizingMaskIntoConstraints = false
-        self.indicator.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
-        let topConstraint = self.navigationController?.navigationBar.frame.size.height ?? 0.0
-        self.indicator.bottomAnchor.constraint(equalTo: view.topAnchor, constant: topConstraint).isActive=true
-    }
-    
-    /// Start loading : start the loader animation 
-    fileprivate func startLoading() {
-        self.indicator.startAnimating()
-        self.indicator.isHidden = false
-        
-        // Disable scroll 
-        self.tableView.isScrollEnabled = false
-    }
-    
-    /// Stop loading : stop and hide the loader
-    fileprivate func stopLoading() {
-        self.indicator.stopAnimating()
-        self.indicator.isHidden = true
-        
-        // Enable scroll 
-        self.tableView.isScrollEnabled = true
-    }
-    
-    // MARK: - Table View Data Source
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-    
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.downloadedLicence?.count ?? 0
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        var cell = tableView.dequeueReusableCell(withIdentifier: self.reuseIdentifier,
-                                                 for: indexPath) as? OpenSourceTableViewCell
-        // Init cell
-        if cell == nil {
-            cell = OpenSourceTableViewCell(style: UITableViewCellStyle.default,
-                                           reuseIdentifier: self.reuseIdentifier)
+        if showCloseButton {
+            self.navigationItem.rightBarButtonItem = closeButton
        }
-        
-        // Configure the cell with licence 
-        if let licence = self.downloadedLicence?.get(at: indexPath.row) {
-            cell?.configure(licence: licence, config: self.config)
-        }
-        
-        return cell!
-    }
-    
-    override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-        // Automatic dimension 
-        return UITableViewAutomaticDimension
    }
    
    // MARK: - Action
    
-    /// Handler for click on close button
    @objc fileprivate func closePicker() {
-        self.dismissController()
-    }
-    
-    // MARK: - Navigation
-    
-    /// Dismiss the OpenSourceController
-    func dismissController() {
-        DispatchQueue.main.async { [weak self] in 
-            self?.dismiss(animated: true, completion: nil)
-        }
+        self.dismiss(animated: true, completion: nil)
    }
 }
@@ -0,0 +1,23 @@
+//
+//  LicenceHTTPLoader.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 24/10/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import Foundation
+
+final class HTTPDataLoader {
+    func loadData(fromUrl url: String, completion: @escaping (Data?) -> Void) {
+        if let url = URL(string: url) {
+            let task = URLSession.shared.dataTask(with: url) { (data, _, error) in
+                if error != nil {
+                    print("OpenSourceController error : \(error?.localizedDescription ?? "") from url : \(url)")
+                }
+                completion(data)
+            }
+            task.resume()
+        }
+    }
+}
@@ -6,7 +6,7 @@

 import UIKit

-public class LicenceFile: NSObject {
+public final class LicenceFile {

    // MARK- Var 

@@ -18,6 +18,16 @@ public class LicenceFile: NSObject {

    /// Library's licence
    var detail: String?
+    
+    /// Build attributed text
+    lazy var attributedContent: NSAttributedString = {
+        let libraryTitleAttribut = [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)]
+        let libraryLicenceAttribut = [NSAttributedString.Key.font: UIFont.systemFont(ofSize: UIFont.systemFontSize)]
+        let libraryTitle = NSMutableAttributedString(string: self.title ?? "", attributes: libraryTitleAttribut)
+        libraryTitle.append(NSAttributedString(string: "\n\n"))
+        libraryTitle.append(NSAttributedString(string: self.detail ?? "", attributes: libraryLicenceAttribut))
+        return libraryTitle
+    }()

    // MARK- Init

@@ -29,8 +39,7 @@ public class LicenceFile: NSObject {
    public init(title: String, url: String) {
        self.title = title
        self.url = url
-        self.detail = NSLocalizedString("Unable to load this licence file.",
-                                        comment: "")
+        self.detail = NSLocalizedString("Unable to load this licence file.", comment: "")
    }

    /// Download licence detail
@@ -38,22 +47,12 @@ public class LicenceFile: NSObject {
    /// - Parameter completion: end of download handler
    func downloadLicenceDetail(config: OpenSourceControllerConfig,
                               completion: @escaping () -> Void) {
-        if let url = URL(string: self.url) {
-            let task = URLSession.shared.dataTask(with: url) { (data, _, _) in
-                if let data = data,
-                    let html = String(data: data, encoding: String.Encoding.utf8) {
-
-                    // Update licence model 
-                    self.detail = html
-
-                    // Log 
-                    if config.verbose {
-                        print("Licence for \(self.title ?? "") downloaded with success.")
-                    }
-                }
-                completion()
+        let licenceHTTPLoader = HTTPDataLoader()
+        licenceHTTPLoader.loadData(fromUrl: self.url) { (data) in
+            if let data = data, let html = String(data: data, encoding: String.Encoding.utf8) {
+                self.detail = html
            }
-            task.resume()
+            completion()
        }
    }
 }
@@ -6,14 +6,14 @@

 import UIKit

-class LicenceDownloader: NSObject {
+final class LicenceLoader {

    /// Download every licence 
    ///
    /// - Parameters:
    ///   - licences: array which contains licence model model 
    ///   - completion: end downloading completion
-    class func downloadLicences(licences: [LicenceFile],
+    func downloadLicences(licences: [LicenceFile],
                                config: OpenSourceControllerConfig,
                                completion: @escaping () -> Void) {
        let licenceGroupe = DispatchGroup()
@@ -0,0 +1,45 @@
+//
+//  OpenSourceController.swift
+//  Pods
+//
+//  Created by Florian Gabach on 05/02/2017.
+
+import UIKit
+
+open class OpenSourceController: NSObject { 
+
+    // Contains list of licence object 
+    open var licences: [LicenceFile] = []
+
+    // Open source controller Configuration object
+    open var config = OpenSourceControllerConfig()
+
+    /// Present OpenSourceViewController embbeded in navigation controller
+    ///
+    /// - Parameter from: the source controller 
+    open func presentOpenSourceController(from: UIViewController) {
+        let loader: LicenceLoader = LicenceLoader()
+        let licenceController = OpenSourceViewController(licences: licences,
+                                                         showCloseButton: true,
+                                                         configuration: config,
+                                                         licenceLoader: loader)
+        let navController = UINavigationController(rootViewController: licenceController)
+        from.present(navController, animated: true)
+    }
+    
+    /// Push OpenSourceViewController from navigation controller 
+    ///
+    /// - Parameter from: the source controller
+    open func pushOpenSourceController(from: UIViewController) {
+        let loader: LicenceLoader = LicenceLoader()
+        let licenceController = OpenSourceViewController(licences: licences,
+                                                         showCloseButton: false,
+                                                         configuration: config,
+                                                         licenceLoader: loader)
+        guard let navigationController = from.navigationController else {
+            assertionFailure("Source controller isn't embeded in navigation controller. Can't push.")
+            return
+        }
+        navigationController.pushViewController(licenceController, animated: true)
+    }
+}
@@ -15,7 +15,7 @@ public struct OpenSourceControllerConfig {
        public var barTintColor: UIColor?

        /// Will be applied to the navigation bar 
-        public var backgroundColor: UIColor?
+        public var backgroundColor: UIColor = .white

        /// Will be applied to licence text
        public var licenceBackgroundColor: UIColor?
@@ -7,13 +7,14 @@
 import Foundation

 extension Array {
-    /// Get an index safely 
+    
+    // MARK: - Helper
+    
    func get(at index: Int) -> Element? {
        guard index >= 0
            && index < count else {
                return nil
        }
-
        return self[index]
    }
 }
@@ -0,0 +1,19 @@
+//
+//  Reusable.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 10/12/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import Foundation
+
+public protocol Reusable: class {
+    static var reuseIdentifier: String { get }
+}
+
+public extension Reusable {
+    static var reuseIdentifier: String {
+        return String(describing: self)
+    }
+}
@@ -0,0 +1,28 @@
+//
+//  UITableView+Extensions.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 10/12/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import UIKit
+
+extension UITableView {
+    final func register<T: UITableViewCell>(cellType: T.Type)
+        where T: Reusable {
+            self.register(cellType.self, forCellReuseIdentifier: cellType.reuseIdentifier)
+    }
+    
+    final func dequeueReusableCell<T: UITableViewCell>(for indexPath: IndexPath, cellType: T.Type = T.self) -> T
+        where T: Reusable {
+            guard let cell = self.dequeueReusableCell(withIdentifier: cellType.reuseIdentifier, for: indexPath) as? T else {
+                fatalError(
+                    "Failed to dequeue a cell with identifier \(cellType.reuseIdentifier) matching type \(cellType.self). "
+                        + "Check that the reuseIdentifier is set properly in your XIB/Storyboard "
+                        + "and that you registered the cell beforehand"
+                )
+            }
+            return cell
+    }
+}
@@ -0,0 +1,28 @@
+//
+//  File.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 23/10/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import UIKit
+
+extension UIView {
+    
+    // MARK: - Layout
+    
+    func pinEdges(to other: UIView, withBorderSize size: CGFloat = 0.0) {
+        self.translatesAutoresizingMaskIntoConstraints = false
+        self.leadingAnchor.constraint(equalTo: other.leadingAnchor, constant: size).isActive = true
+        self.trailingAnchor.constraint(equalTo: other.trailingAnchor, constant: size).isActive = true
+        self.topAnchor.constraint(equalTo: other.topAnchor, constant: size).isActive = true
+        self.bottomAnchor.constraint(equalTo: other.bottomAnchor, constant: -size).isActive = true
+    }
+    
+    func pinCenter(to other: UIView) {
+        self.translatesAutoresizingMaskIntoConstraints = false
+        self.centerXAnchor.constraint(equalTo: other.centerXAnchor).isActive = true
+        self.centerYAnchor.constraint(equalTo: other.centerYAnchor).isActive = true
+    }
+}
@@ -0,0 +1,29 @@
+//
+//  UIViewController+Extensions.swift
+//  OpenSourceControllerDemo
+//
+//  Created by Florian Gabach on 23/10/2018.
+//  Copyright © 2018 OpenSourceController. All rights reserved.
+//
+
+import UIKit
+
+extension UIViewController {
+    
+    // MARK: - Child
+    
+    func add(_ child: UIViewController) {
+        self.addChild(child)
+        self.view.addSubview(child.view)
+        child.didMove(toParent: self)
+    }
+    
+    func remove() {
+        guard parent != nil else {
+            return
+        }
+        self.willMove(toParent: nil)
+        self.removeFromParent()
+        self.view.removeFromSuperview()
+    }
+}
@@ -1,61 +0,0 @@
-//
-//  OpenSourceTableViewCell.swift
-//  Pods
-//
-//  Created by Florian Gabach on 05/02/2017.
-
-import UIKit
-
-class OpenSourceTableViewCell: UITableViewCell {
-
-    // MARK: - Lifecycle
-
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
-        super.init(style: .default,
-                   reuseIdentifier: reuseIdentifier)
-
-        // Prepare cell
-        self.prepareCellComponent()
-    }
-
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-
-    // MARK: - Prepare
-
-    func prepareCellComponent() {
-        // Text
-        self.textLabel?.numberOfLines = 0
-
-        // Common init
-        self.accessoryType = .none
-        self.selectionStyle = .none
-    }
-
-    // MARK: - Configure
-
-    /// Initialize the cell content with Licence model 
-    ///
-    /// - Parameter licence: the licence model 
-    func configure(licence: LicenceFile, config: OpenSourceControllerConfig) {
-
-        // Build attributed text 
-        let libraryTitleAttribut = [NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)]
-        let libraryLicenceAttribut = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: UIFont.systemFontSize)]
-        let libraryTitle = NSMutableAttributedString(string: licence.title ?? "",
-                                                     attributes: libraryTitleAttribut)
-        libraryTitle.append(NSAttributedString(string: "\n\n"))
-        libraryTitle.append(NSAttributedString(string: licence.detail ?? "",
-                                               attributes: libraryLicenceAttribut))
-
-        // Set text 
-        self.textLabel?.attributedText = libraryTitle
-        self.textLabel?.textColor = config.uiConfig.licenceTextColor
-
-        // Background 
-        if let backgroundColor = config.uiConfig.licenceBackgroundColor {
-            self.backgroundColor = backgroundColor
-        }
-    }
-}
@@ -0,0 +1,6 @@
+# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app
+# apple_id("[[APPLE_ID]]") # Your Apple email address
+
+
+# For more information about the Appfile, see:
+#     https://docs.fastlane.tools/advanced/#appfile
@@ -0,0 +1,31 @@
+# Usage : bundle exec fastlane ios (patch | minor | major)
+
+default_platform(:ios)
+
+platform :ios do
+  desc "Release a new version with a patch bump_type"
+  lane :patch do
+    release("patch")
+  end
+
+  desc "Release a new version with a minor bump_type"
+  lane :minor do
+    release("minor")
+  end
+
+  desc "Release a new version with a major bump_type"
+  lane :major do
+    release("major")
+  end
+
+  def release(type)
+    podspec_name = "OpenSourceController.podspec" 
+    pod_lib_lint(use_bundle_exec: false)
+    version = version_bump_podspec(path: podspec_name, bump_type: type)
+    git_add(path: podspec_name)
+    git_commit(path: [podspec_name], message: "#{version} release")
+    add_git_tag(tag: "#{version}")
+    push_to_git_remote
+    pod_push(use_bundle_exec: false)
+  end
+end
@@ -0,0 +1,39 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
+
+# Available Actions
+## iOS
+### ios patch
+```
+fastlane ios patch
+```
+Release a new version with a patch bump_type
+### ios minor
+```
+fastlane ios minor
+```
+Release a new version with a minor bump_type
+### ios major
+```
+fastlane ios major
+```
+Release a new version with a major bump_type
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
Author	SHA1	Message	Date
Florian Gabach	f5d6b49efe	3.2.1 release	2019-09-30 17:13:39 +02:00
Florian Gabach	81d14e0abf	Remove swift-version file	2019-09-30 17:13:09 +02:00
Florian Gabach	443b32f5fe	Bump to Swift 5.0	2019-09-30 17:12:28 +02:00
Florian Gabach	27ed32b7e1	Fix fastfile variable	2018-12-10 19:49:16 +01:00
Florian Gabach	5da43391f5	3.2.0 release	2018-12-10 19:47:31 +01:00
Florian Gabach	ee9f7efe68	Update fastlane file	2018-12-10 19:46:24 +01:00
Florian Gabach	0dbf658de9	Small code refactoring	2018-12-10 17:22:28 +01:00
Florian Gabach	016099a7c3	Add fastlane automation	2018-12-10 17:22:05 +01:00
Florian Gabach	db3f5b2062	Improve exemple project	2018-12-10 17:21:54 +01:00
Florian Gabach	24c47fbcab	Folder organisation	2018-10-29 11:52:43 +01:00
Florian Gabach	11f73c553a	Clean & fix background color	2018-10-29 11:51:56 +01:00
Florian Gabach	a778f03d8f	Code refactoring	2018-10-24 18:44:12 +02:00
Florian Gabach	7dd51b88b8	Bump Swift version	2018-09-29 09:52:32 +02:00
Florian Gabach	fe086e3d34	Bump to 3.0.0	2018-09-29 09:48:07 +02:00
Florian Gabach	c5947fa41b	Swift 4.2	2018-09-29 09:47:21 +02:00