Bump to 2.0.1

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ==========
 
+### 2.0.1
+
+- Clean code and move loader position 
+
 ### 2.0
 
 - Swift 4 version 

Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -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>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>

Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/florian.gabach.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,18 @@
+<?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>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>EnabledFullIndexStoreVisibility</key>
+	<false/>
+	<key>IssueFilterStyle</key>
+	<string>ShowActiveSchemeOnly</string>
+	<key>LiveSourceIssuesEnabled</key>
+	<true/>
+</dict>
+</plist>

Exemple/OpenSourceControllerDemo.xcodeproj/xcuserdata/florian.gabach.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>OpenSourceControllerDemo.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

Exemple/OpenSourceControllerDemo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -103,8 +103,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "logo 7-3.png",
       "scale" : "1x"
     }
   ],

OpenSourceController.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -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>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>

OpenSourceController.xcodeproj/project.xcworkspace/xcuserdata/florian.gabach.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,18 @@
+<?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>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>EnabledFullIndexStoreVisibility</key>
+	<false/>
+	<key>IssueFilterStyle</key>
+	<string>ShowActiveSchemeOnly</string>
+	<key>LiveSourceIssuesEnabled</key>
+	<true/>
+</dict>
+</plist>

README.md

@@ -54,9 +54,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 "terflogag/OpenSourceController" ~> 2.0
+github "floriangbh/OpenSourceController" ~> 2.0
 
-github "terflogag/OpenSourceController" ~> 1.0.8 # Swift 3.1 version
+github "floriangbh/OpenSourceController" ~> 1.0.8 # Swift 3.1 version
 ```
 
 ## Usage
@@ -131,7 +131,7 @@ What about yours ? If your application also use this library, feel free to cont
 
 ## Author
 
-Florian Gabach, contact@floriangabach.fr
+Florian Gabach, florian.gabach@gmail.com
 
 ## License
 

Sources/Controller/OpenSourceViewController.swift

@@ -11,7 +11,17 @@ class OpenSourceViewController: UITableViewController {
     // MARK: - Var
     
     /// Loading indicator 
-    fileprivate var indicator = UIActivityIndicatorView()
+    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
+    }()
     
     /// TableViewCell identifier
     private let reuseIdentifier = "openSourceCell"
@@ -38,28 +48,36 @@ class OpenSourceViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        // Prepare tableview
+        // Prepare controller
-        self.prepareTableView()
+        self.prepare()
-
-        // Download licences
-        self.prepareLicences()
-    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
     }
     
     // MARK: - Prepare
     
+    /// Prepare controller
+    fileprivate func prepare() {
+        self.prepareTableView()
+        self.prepareActivityIndicator()
+        self.prepareCloseButton()
+        self.prepareStyle()
+        self.prepareLicences()
+    }
+    
     /// Download licences 
     fileprivate func prepareLicences() {
-        if let licences = self.licences {
+        self.startLoading()
-            self.startLoading()
+        
-            LicenceDownloader.downloadLicences(licences: licences,
+        // Retrieve licence
-                                               config: self.config) { () in
+        guard let licences = self.licences else {
-                // Update licences 
+            print("No licences found.")
-                self.downloadedLicence = self.licences
+            return
-            }
+        }
+        
+        // Download licence
+        LicenceDownloader.downloadLicences(licences: licences,
+                                           config: self.config) { () in
+                                            // Update licences
+                                            self.downloadedLicence = self.licences
         }
     }
     
@@ -74,44 +92,49 @@ class OpenSourceViewController: UITableViewController {
         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
         }
+    }
     
-        // Navigation bar 
+    /// 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]
             self.navigationController?.navigationBar.titleTextAttributes = attribut
         }
+    }
     
+    /// Prepare close button on navigation bar 
+    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
-
-        // Loading indicator
-        self.prepareActivityIndicator()
     }
     
     // MARK: - Loading indicator
     
     /// Prepare UIActivityIndicatorView and display it at the center of the view
     fileprivate func prepareActivityIndicator() {
-        self.indicator = UIActivityIndicatorView(frame:CGRect(x: 0, 
+        // Add to view
-                                                              y: 0, 
-                                                              width: 40, 
-                                                              height: 40) )
-        self.indicator.activityIndicatorViewStyle = UIActivityIndicatorViewStyle.gray
-        self.indicator.center = self.view.center
-        self.indicator.hidesWhenStopped = true
-        self.indicator.backgroundColor = UIColor.clear
-        self.indicator.color = UIColor.black
         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 

Sources/Model/OpenSourceControllerConfig.swift

@@ -33,7 +33,7 @@ public struct OpenSourceControllerConfig {
     /// Will be applied to the navigation bar title
     public var title: String = "Tiers library"
 
-    // Verbose mode for print log when licence are downloaded
+    /// Verbose mode for print log when licence are downloaded
     public var verbose: Bool = false
 
     /// UI-specific configuration.