Merge branch 'release/1.3.3'

crescentflare · Oct 4, 2019 · 50c7644 · 50c7644
2 parents 46a445f + 6492a31
commit 50c7644
Show file tree

Hide file tree

Showing 26 changed files with 732 additions and 708 deletions.
diff --git a/DynamicAppConfig.podspec b/DynamicAppConfig.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'DynamicAppConfig'
-  s.version          = '1.3.2'
+  s.version          = '1.3.3'
   s.swift_version    = '5.0'
   s.summary          = 'A useful library to support multiple build configurations in one application build.'
 

diff --git a/...gIOS/DynamicAppConfig/Classes/ViewController/EditAppConfig/Table/AppConfigEditTable.swift b/...gIOS/DynamicAppConfig/Classes/ViewController/EditAppConfig/Table/AppConfigEditTable.swift
@@ -246,8 +246,8 @@ class AppConfigEditTable : UIView, UITableViewDataSource, UITableViewDelegate, A
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         // Create cell (if needed)
-        let tableValue = tableValues[(indexPath as NSIndexPath).row]
-        let nextType = (indexPath as NSIndexPath).row + 1 < tableValues.count ? tableValues[(indexPath as NSIndexPath).row + 1].type : AppConfigEditTableValueType.unknown
+        let tableValue = tableValues[indexPath.row]
+        let nextType = indexPath.row + 1 < tableValues.count ? tableValues[indexPath.row + 1].type : AppConfigEditTableValueType.unknown
         let cell = tableView.dequeueReusableCell(withIdentifier: tableValue.type.rawValue) as? AppConfigTableCell ?? AppConfigTableCell()
 
         // Set up a loader cell
@@ -369,7 +369,7 @@ class AppConfigEditTable : UIView, UITableViewDataSource, UITableViewDelegate, A
     // --
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let tableValue = tableValues[(indexPath as NSIndexPath).row]
+        let tableValue = tableValues[indexPath.row]
         UIApplication.shared.sendAction(#selector(resignFirstResponder), to: nil, from: nil, for: nil)
         if tableValue.type == .action && delegate != nil {
             switch tableValue.action {
@@ -413,7 +413,7 @@ class AppConfigEditTable : UIView, UITableViewDataSource, UITableViewDelegate, A
                     // Observe buttons and present
                     alert.addAction(UIAlertAction(title: AppConfigBundle.localizedString(key: "CFLAC_SHARED_OK"), style: .default, handler: { [weak alert] (_) in
                         let enteredText = alert?.textFields?[0].text ?? ""
-                        self.tableValues[(indexPath as NSIndexPath).row] = AppConfigEditTableValue.valueForTextEntry(configSetting: tableValue.configSetting ?? "", andValue: enteredText, numberOnly: tableValue.limitUsage)
+                        self.tableValues[indexPath.row] = AppConfigEditTableValue.valueForTextEntry(configSetting: tableValue.configSetting ?? "", andValue: enteredText, numberOnly: tableValue.limitUsage)
                         tableView.reloadRows(at: [indexPath], with: .none)
                         self.delegate?.configChanged(newSettings: self.obtainNewConfigurationSettings())
                     }))

diff --git a/...namicAppConfig/Classes/ViewController/ManageAppConfig/AppConfigManageViewController.swift b/...namicAppConfig/Classes/ViewController/ManageAppConfig/AppConfigManageViewController.swift
@@ -60,10 +60,13 @@ public class AppConfigManageViewController : UIViewController, AppConfigManageTa
     // MARK: Launching
     // --
 
-    public static func launch() {
+    public static func launch(forceFullscreen: Bool = true) {
         if AppConfigManageViewController.isOpenCounter == 0 && AppConfigStorage.shared.isActivated() {
             let viewController = AppConfigManageViewController()
             let navigationController = UINavigationController.init(rootViewController: viewController)
+            if forceFullscreen {
+                navigationController.modalPresentationStyle = .overFullScreen
+            }
             ac_topmostViewController?.present(navigationController, animated: true, completion: nil)
         }
     }

diff --git a/.../DynamicAppConfig/Classes/ViewController/ManageAppConfig/Table/AppConfigManageTable.swift b/.../DynamicAppConfig/Classes/ViewController/ManageAppConfig/Table/AppConfigManageTable.swift
@@ -282,8 +282,8 @@ class AppConfigManageTable : UIView, UITableViewDataSource, UITableViewDelegate,
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         // Create cell (if needed)
-        let tableValue = tableValues[(indexPath as NSIndexPath).row]
-        let nextType = (indexPath as NSIndexPath).row + 1 < tableValues.count ? tableValues[(indexPath as NSIndexPath).row + 1].type : AppConfigManageTableValueType.unknown
+        let tableValue = tableValues[indexPath.row]
+        let nextType = indexPath.row + 1 < tableValues.count ? tableValues[indexPath.row + 1].type : AppConfigManageTableValueType.unknown
         let cell = tableView.dequeueReusableCell(withIdentifier: tableValue.type.rawValue) as? AppConfigTableCell ?? AppConfigTableCell()
 
         // Set up a loader cell
@@ -434,13 +434,13 @@ class AppConfigManageTable : UIView, UITableViewDataSource, UITableViewDelegate,
     }
 
     func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
-        let tableValue = tableValues[(indexPath as NSIndexPath).row]
+        let tableValue = tableValues[indexPath.row]
         return tableValue.type == .config && tableValue.config != nil
     }
 
     func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
         let editAction = UITableViewRowAction.init(style: .normal, title: AppConfigBundle.localizedString(key: "CFLAC_MANAGE_SWIPE_EDIT"), handler: { action, indexPath in
-            let tableValue = self.tableValues[(indexPath as NSIndexPath).row]
+            let tableValue = self.tableValues[indexPath.row]
             tableView.setEditing(false, animated: true)
             if tableValue.config != nil {
                 self.delegate?.editConfig(configName: tableValue.config!)
@@ -456,7 +456,7 @@ class AppConfigManageTable : UIView, UITableViewDataSource, UITableViewDelegate,
     // --
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let tableValue = tableValues[(indexPath as NSIndexPath).row]
+        let tableValue = tableValues[indexPath.row]
         if delegate != nil {
             if tableValue.config != nil {
                 delegate?.selectedConfig(configName: tableValue.config!)
@@ -495,7 +495,7 @@ class AppConfigManageTable : UIView, UITableViewDataSource, UITableViewDelegate,
                         // Observe buttons and present
                         alert.addAction(UIAlertAction(title: AppConfigBundle.localizedString(key: "CFLAC_SHARED_OK"), style: .default, handler: { [weak alert] (_) in
                             let enteredText = alert?.textFields?[0].text ?? ""
-                            self.tableValues[(indexPath as NSIndexPath).row] = AppConfigManageTableValue.valueForTextEntry(configSetting: tableValue.configSetting ?? "", andValue: enteredText, numberOnly: tableValue.limitUsage)
+                            self.tableValues[indexPath.row] = AppConfigManageTableValue.valueForTextEntry(configSetting: tableValue.configSetting ?? "", andValue: enteredText, numberOnly: tableValue.limitUsage)
                             editTextCellView.value = enteredText
                             tableView.reloadRows(at: [indexPath], with: .none)
                         }))

diff --git a/...DynamicAppConfig/Classes/ViewController/Shared/View/AppConfigCellSectionDividerView.swift b/...DynamicAppConfig/Classes/ViewController/Shared/View/AppConfigCellSectionDividerView.swift
@@ -35,7 +35,7 @@ enum AppConfigCellSectionLocation: String {
 
     @IBInspectable var dividerLocation: String = "" {
         didSet {
-            location = AppConfigCellSectionLocation.init(rawValue: dividerLocation) ?? .none
+            location = AppConfigCellSectionLocation.init(rawValue: dividerLocation) ?? AppConfigCellSectionLocation.none
         }
     }
 

diff --git a/...IOS/DynamicAppConfig/Classes/ViewController/Shared/View/AppConfigSelectionPopupView.swift b/...IOS/DynamicAppConfig/Classes/ViewController/Shared/View/AppConfigSelectionPopupView.swift
@@ -148,7 +148,7 @@ protocol AppConfigSelectionPopupViewDelegate: class {
         let cell = tableView.dequeueReusableCell(withIdentifier: "ignored") as? AppConfigTableCell ?? AppConfigTableCell()
 
         // Regular cell view
-        if (indexPath as NSIndexPath).row < _tableChoices.count {
+        if indexPath.row < _tableChoices.count {
             // Create view
             if cell.cellView == nil {
                 cell.cellView = AppConfigItemCellView()
@@ -158,12 +158,12 @@ protocol AppConfigSelectionPopupViewDelegate: class {
             // Supply data and return the cell
             cell.selectionStyle = .default
             cell.accessoryType = .disclosureIndicator
-            cell.shouldHideDivider = (indexPath as NSIndexPath).row + 1 >= _tableChoices.count
-            cellView?.label = _tableChoices[(indexPath as NSIndexPath).row]
+            cell.shouldHideDivider = indexPath.row + 1 >= _tableChoices.count
+            cellView?.label = _tableChoices[indexPath.row]
         }
 
         // Bottom divider
-        if (indexPath as NSIndexPath).row >= _tableChoices.count {
+        if indexPath.row >= _tableChoices.count {
             // Create view
             if cell.cellView == nil {
                 cell.cellView = AppConfigCellSectionDividerView(location: .bottom)
@@ -183,11 +183,13 @@ protocol AppConfigSelectionPopupViewDelegate: class {
     // --
 
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if delegate != nil {
-            delegate?.selectedItem(_tableChoices[(indexPath as NSIndexPath).row], token: token)
-        }
         _tableView.deselectRow(at: indexPath, animated: false)
-        dismiss()
+        if indexPath.row < _tableChoices.count {
+            if delegate != nil {
+                delegate?.selectedItem(_tableChoices[indexPath.row], token: token)
+            }
+            dismiss()
+        }
     }
 
 }
diff --git a/DynamicAppConfigIOS/Example/Podfile.lock b/DynamicAppConfigIOS/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - DynamicAppConfig (1.3.2)
+  - DynamicAppConfig (1.3.3)
 
 DEPENDENCIES:
   - DynamicAppConfig (from `../../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  DynamicAppConfig: 57728cfdc8bc08d7e1731d914a413d7ca36a368e
+  DynamicAppConfig: ff610086de74d1a61be2cb2b0ba94308dd20b411
 
 PODFILE CHECKSUM: 79e308523c8fc52743ffa5d4cef5c6dbd80b623b
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.1
diff --git a/DynamicAppConfigIOS/Example/Pods/Local Podspecs/DynamicAppConfig.podspec.json b/DynamicAppConfigIOS/Example/Pods/Local Podspecs/DynamicAppConfig.podspec.json
diff --git a/DynamicAppConfigIOS/Example/Pods/Manifest.lock b/DynamicAppConfigIOS/Example/Pods/Manifest.lock