Fix #6668 - Onboarding card should get built in theme on relaunch (#6673

)
mozilla-mobile · May 22, 2020 · d5748a6 · d5748a6
1 parent 0a05a9f
commit d5748a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/Client/Frontend/Intro/IntroScreenSyncViewV2.swift b/Client/Frontend/Intro/IntroScreenSyncViewV2.swift
@@ -38,14 +38,14 @@ to make it center in the top container view.
 
 */
 
-class IntroScreenSyncViewV2: UIView {
+class IntroScreenSyncViewV2: UIView, CardTheme {
     // Private vars
     private var fxTextThemeColour: UIColor {
         // For dark theme we want to show light colours and for light we want to show dark colours
-        return UpdateViewController.theme == .dark ? .white : .black
+        return theme == .dark ? .white : .black
     }
     private var fxBackgroundThemeColour: UIColor {
-        return UpdateViewController.theme == .dark ? UIColor.Firefox.DarkGrey10 : .white
+        return theme == .dark ? UIColor.Firefox.DarkGrey10 : .white
     }
     private lazy var titleImageView: UIImageView = {
         let imgView = UIImageView(image: #imageLiteral(resourceName: "tour-sync-v2"))

diff --git a/Client/Frontend/Intro/IntroScreenWelcomeViewV2.swift b/Client/Frontend/Intro/IntroScreenWelcomeViewV2.swift
@@ -40,14 +40,14 @@ in the middle of the screen.
 
 */
 
-class IntroScreenWelcomeViewV2: UIView {
+class IntroScreenWelcomeViewV2: UIView, CardTheme {
     // Private vars
     private var fxTextThemeColour: UIColor {
         // For dark theme we want to show light colours and for light we want to show dark colours
-        return UpdateViewController.theme == .dark ? .white : .black
+        return theme == .dark ? .white : .black
     }
     private var fxBackgroundThemeColour: UIColor {
-        return UpdateViewController.theme == .dark ? UIColor.Firefox.DarkGrey10 : .white
+        return theme == .dark ? UIColor.Firefox.DarkGrey10 : .white
     }
     private lazy var titleImageView: UIImageView = {
         let imgView = UIImageView(image: #imageLiteral(resourceName: "splash"))

diff --git a/Client/Frontend/Intro/IntroViewModelV2.swift b/Client/Frontend/Intro/IntroViewModelV2.swift
@@ -11,6 +11,16 @@ struct ViewControllerConsts {
     }
 }
 
+protocol CardTheme {
+    var theme: BuiltinThemeName { get }
+}
+
+extension CardTheme {
+    var theme: BuiltinThemeName {
+        return BuiltinThemeName(rawValue: ThemeManager.instance.current.name) ?? .normal
+    }
+}
+
 // MARK: Requires Work (Currently part of A/B test)
 // Intro View Model V2 - This is suppose to be the main view model for the
 // IntroView V2 however since we are running an onboarding A/B test

diff --git a/Client/Frontend/Intro/IntroWelcomeAndSyncViewV1.swift b/Client/Frontend/Intro/IntroWelcomeAndSyncViewV1.swift
@@ -25,14 +25,14 @@ import Shared
 
  */
 
-class IntroWelcomeAndSyncViewV1: UIView {
+class IntroWelcomeAndSyncViewV1: UIView, CardTheme {
     // Private vars
     private var fxTextThemeColour: UIColor {
         // For dark theme we want to show light colours and for light we want to show dark colours
-        return UpdateViewController.theme == .dark ? .white : .black
+        return theme == .dark ? .white : .black
     }
     private var fxBackgroundThemeColour: UIColor {
-        return UpdateViewController.theme == .dark ? .black : .white
+        return theme == .dark ? .black : .white
     }
     // Screen constants
     private let screenHeight = UIScreen.main.bounds.size.height