Merge pull request #2 from mapierce/feature/ios-13

iOS 13 updates

Author: mapierce

Example/Tests/WaveTabBarPresenterUnitTests.swift

@@ -46,14 +46,16 @@ final class WaveTabBarPresenterUnitTests: XCTestCase {
         XCTAssertFalse(view.setupCurveCalled)
         XCTAssertFalse(view.setupCircleCalled)
         XCTAssertFalse(view.setupImageViewCalled)
-        XCTAssertFalse(view.setupTabBarStylingCalled)
+        XCTAssertFalse(view.setupTabBarColoringCalled)
+        XCTAssertFalse(view.setupTabBarBackgroundCalled)
         presenter.viewDidAppear(portrait: true)
         XCTAssertTrue(view.showTabBarCalled)
         XCTAssertTrue(view.setupTabBarTagsCalled)
         XCTAssertTrue(view.setupCurveCalled)
         XCTAssertTrue(view.setupCircleCalled)
         XCTAssertTrue(view.setupImageViewCalled)
-        XCTAssertTrue(view.setupTabBarStylingCalled)
+        XCTAssertTrue(view.setupTabBarColoringCalled)
+        XCTAssertTrue(view.setupTabBarBackgroundCalled)
     }
 
     func testViewDidRotate() {
@@ -76,6 +78,12 @@ final class WaveTabBarPresenterUnitTests: XCTestCase {
         XCTAssertTrue(view.moveCircleCalled)
     }
 
+    func testViewWillLayoutSubviews() {
+        XCTAssertFalse(view.setupTabBarColoringCalled)
+        presenter.viewWillLayoutSubviews()
+        XCTAssertTrue(view.setupTabBarColoringCalled)
+    }
+    
     func testMoveCircleCompleteDown() {
         XCTAssertFalse(view.updateImageViewCalled)
         XCTAssertFalse(view.updateCircleCenterCalled)
@@ -106,7 +114,8 @@ private class WaveTabBarControllerMock: WaveTabBarProtocol {
     var setupCurveCalled = false
     var setupCircleCalled = false
     var updateCircleSizeCalled = false
-    var setupTabBarStylingCalled = false
+    var setupTabBarColoringCalled = false
+    var setupTabBarBackgroundCalled = false
     var setupImageViewCalled = false
     var updateImageViewSizeCalled = false
     var updateImageViewCalled = false
@@ -138,8 +147,12 @@ private class WaveTabBarControllerMock: WaveTabBarProtocol {
         updateCircleSizeCalled = true
     }
 
-    func setupTabBarStyling() {
-        setupTabBarStylingCalled = true
+    func setupTabBarColoring() {
+        setupTabBarColoringCalled = true
+    }
+    
+    func setupTabBarBackground() {
+        setupTabBarBackgroundCalled = true
     }
 
     func setupImageView(_ center: Float) {

WaveTab/Classes/Implementation/Wave Tab Bar Controller/WaveTabBarController.swift

@@ -69,6 +69,10 @@ open class WaveTabBarController: UITabBarController, WaveTabBarProtocol {
         }
     }
 
+    open override func viewWillLayoutSubviews() {
+        presenter.viewWillLayoutSubviews()
+    }
+    
     // MARK: - WaveTabBarProtocol functions
 
     func showTabBar(_ show: Bool, animated: Bool, over duration: TimeInterval) {
@@ -110,23 +114,34 @@ open class WaveTabBarController: UITabBarController, WaveTabBarProtocol {
         circle.layer.cornerRadius = CGFloat(radius) / 2
     }
 
-    func setupTabBarStyling() {
+    func setupTabBarColoring() {
         let backgroundColor: UIColor
-        if let color = tabBar.barTintColor {
-            backgroundColor = color
-        } else {
-            switch tabBar.barStyle {
-            case .black, .blackTranslucent: backgroundColor = Constants.blackBackgroundColor
-            case .default: backgroundColor = Constants.whiteBackgroundColor
-            @unknown default: backgroundColor = Constants.whiteBackgroundColor
+        if #available(iOS 13.0, *) {
+            switch traitCollection.userInterfaceStyle {
+            case .light: backgroundColor = Constants.whiteBackgroundColor
+            case .dark: backgroundColor = Constants.blackBackgroundColor
+            case .unspecified: backgroundColor = getColorFromTabBarStyle()
+            @unknown default: backgroundColor = getColorFromTabBarStyle()
             }
+        } else {
+            backgroundColor = getColorFromTabBarStyle()
         }
         waveSubLayer.fillColor = backgroundColor.cgColor
         circle?.backgroundColor = backgroundColor
-        tabBar.backgroundColor = .clear
-        tabBar.tintColor = UIColor.clear
-        tabBar.backgroundImage = UIImage()
-        tabBar.shadowImage = UIImage()
+    }
+    
+    func setupTabBarBackground() {
+        tabBar.tintColor = .clear
+        if #available(iOS 13.0, *) {
+            let barAppearance = UIBarAppearance()
+            barAppearance.configureWithTransparentBackground()
+            let tabBarAppearance = UITabBarAppearance(barAppearance: barAppearance)
+            tabBar.standardAppearance = tabBarAppearance
+        } else {
+            tabBar.backgroundColor = .clear
+            tabBar.backgroundImage = UIImage()
+            tabBar.shadowImage = UIImage()
+        }
     }
 
     func setupImageView(_ center: Float) {
@@ -192,4 +207,14 @@ open class WaveTabBarController: UITabBarController, WaveTabBarProtocol {
         circle.alpha = down ? Constants.emptyAlpha : Constants.fullAlpha
     }
 
+    // MARK: - Private functions
+    
+    private func getColorFromTabBarStyle() -> UIColor {
+        switch tabBar.barStyle {
+        case .black, .blackTranslucent: return Constants.blackBackgroundColor
+        case .default: return Constants.whiteBackgroundColor
+        @unknown default: return Constants.whiteBackgroundColor
+        }
+    }
+    
 }

WaveTab/Classes/Implementation/Wave Tab Bar Controller/WaveTabBarPresenter.swift

@@ -19,6 +19,8 @@ protocol WaveTabBarPresenter: class {
 
     func tabBarDidSelectItem(with tag: Int)
 
+    func viewWillLayoutSubviews()
+    
     func moveCircleComplete(down movingDown: Bool)
 
 }

WaveTab/Classes/Implementation/Wave Tab Bar Controller/WaveTabBarPresenterBase.swift

@@ -44,7 +44,8 @@ class WaveTabBarPresenterBase: WaveTabBarPresenter {
         view.setupCurve(isPortrait ? Constants.bigRadius : Constants.smallRadius)
         view.setupCircle(isPortrait ? Constants.bigCircle : Constants.smallCircle)
         view.setupImageView((isPortrait ? Constants.bigCircle : Constants.smallCircle) / 2)
-        view.setupTabBarStyling()
+        view.setupTabBarColoring()
+        view.setupTabBarBackground()
     }
 
     func viewDidRotate(portrait portraitOrientation: Bool, at index: Int) {
@@ -68,6 +69,10 @@ class WaveTabBarPresenterBase: WaveTabBarPresenter {
                         down: true)
     }
 
+    func viewWillLayoutSubviews() {
+        view.setupTabBarColoring()
+    }
+    
     func moveCircleComplete(down movingDown: Bool) {
         view.updateImageView()
         view.updateCircleCenter()

WaveTab/Classes/Implementation/Wave Tab Bar Controller/WaveTabBarProtocol.swift

@@ -21,7 +21,9 @@ protocol WaveTabBarProtocol: class {
 
     func updateCircleSize(_ radius: Float)
 
-    func setupTabBarStyling()
+    func setupTabBarColoring()
+    
+    func setupTabBarBackground()
 
     func setupImageView(_ center: Float)