Merge pull request #12 from clutter/single-selection-toolbar-bug

Fix Toolbar Not Showing in `SingleSelectionController`

Author: MichaelM1177

Example/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - SwiftLint (0.34.0)
-  - TiltUp (0.4.1)
-  - TiltUpTest (0.4.1)
+  - TiltUp (0.4.2)
+  - TiltUpTest (0.4.2)
 
 DEPENDENCIES:
   - SwiftLint
@@ -20,8 +20,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
-  TiltUp: 8625a9aa996f241edf86840c6faa2a8f23786612
-  TiltUpTest: 404137458fbaf85e27e86fa72bec875c0ff9a536
+  TiltUp: 0361700e865c524c86efee1796d12e0c1fcf87e2
+  TiltUpTest: 6e9a851cb28630e793710fdeb03341bc4c894521
 
 PODFILE CHECKSUM: c3ad4c36e5d17d3b4a90d5cf5f5b66d3221db5dd
 

TiltUp.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TiltUp'
-  s.version          = '0.4.1'
+  s.version          = '0.4.2'
   s.summary          = 'Official Clutter SDK in Swift to access core iOS features.'
 
 # This description is used to generate tags and improve search results.

TiltUp/Classes/Screens/SingleSelection/SingleSelectionController.swift

@@ -47,8 +47,13 @@ public final class SingleSelectionController<Value: SingleSelectionableRow>: UIT
         viewModel.viewObservers.toolbarButtonTitle = { [weak self] title in
             guard let self = self else { return }
 
-            let item = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(self.tappedToolbarButton))
-            self.setToolbarItems([item], animated: false)
+            let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+            let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(self.tappedToolbarButton))
+            self.setToolbarItems([spacer, button, spacer], animated: false)
+        }
+
+        viewModel.viewObservers.toolbarHidden = { [weak self] hidden, animated in
+            self?.navigationController?.setToolbarHidden(hidden, animated: animated)
         }
 
         viewModel.viewObservers.rowUpdated = { [weak self] indexPath in
@@ -67,9 +72,7 @@ public final class SingleSelectionController<Value: SingleSelectionableRow>: UIT
     public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        viewModel.viewObservers.toolbarHidden = { [weak self] hidden in
-            self?.navigationController?.setToolbarHidden(hidden, animated: animated)
-        }
+        viewModel.updateToolbarHidden(animated: animated)
     }
 
     // MARK: - UITableViewDataSource

TiltUp/Classes/Screens/SingleSelection/SingleSelectionViewModel.swift

@@ -31,7 +31,7 @@ public enum SingleSelection {
         var navTitle: ((String) -> Void)?
         var confirmButtonEnabled: ((Bool) -> Void)?
         var confirmButtonTitle: ((String) -> Void)?
-        var toolbarHidden: ((Bool) -> Void)?
+        var toolbarHidden: ((_ hidden: Bool, _ animated: Bool) -> Void)?
         var toolbarButtonTitle: ((String?) -> Void)?
         var rowUpdated: ((IndexPath) -> Void)?
     }
@@ -98,8 +98,13 @@ public final class SingleSelectionViewModel<Value: SingleSelectionableRow> {
         viewObservers.navTitle?(navTitle)
         viewObservers.confirmButtonEnabled?(selectedIndexPath != nil)
         viewObservers.confirmButtonTitle?(confirmButtonTitle)
-        viewObservers.toolbarHidden?(toolbarHidden)
         viewObservers.toolbarButtonTitle?(toolbarButtonTitle)
+
+        updateToolbarHidden(animated: false)
+    }
+
+    public func updateToolbarHidden(animated: Bool) {
+        viewObservers.toolbarHidden?(toolbarHidden, animated)
     }
 
     var selectedIndexPath: IndexPath? {

TiltUpTest.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TiltUpTest'
-  s.version          = '0.4.1'
+  s.version          = '0.4.2'
   s.summary          = 'Official Clutter SDK in Swift to access core iOS test helpers.'
 
 # This description is used to generate tags and improve search results.