Refactor FXIOS-7778 [v122] Theming to match design system (#17402)

mozilla-mobile · Nov 21, 2023 · 71ccced · 71ccced
1 parent a558fbc
commit 71ccced
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 11 deletions.
diff --git a/BrowserKit/Sources/Common/Theming/DarkTheme.swift b/BrowserKit/Sources/Common/Theming/DarkTheme.swift
@@ -74,7 +74,6 @@ private struct DarkColourPalette: ThemeColourPalette {
     // MARK: - Text
     var textPrimary: UIColor = FXColors.LightGrey05
     var textSecondary: UIColor = FXColors.LightGrey40
-    var textSecondaryAction: UIColor = FXColors.DarkGrey90
     var textDisabled: UIColor = FXColors.LightGrey05.withAlphaComponent(0.4)
     var textWarning: UIColor = FXColors.Red20
     var textAccent: UIColor = FXColors.Blue30

diff --git a/BrowserKit/Sources/Common/Theming/DefaultThemeManager.swift b/BrowserKit/Sources/Common/Theming/DefaultThemeManager.swift
@@ -56,10 +56,6 @@ public final class DefaultThemeManager: ThemeManager, Notifiable {
 
     // MARK: - ThemeManager
 
-    public func getInterfaceStyle() -> UIUserInterfaceStyle {
-        return currentTheme.type.getInterfaceStyle()
-    }
-
     public func changeCurrentTheme(_ newTheme: ThemeType) {
         guard currentTheme.type != newTheme else { return }
         currentTheme = newThemeForType(newTheme)

diff --git a/BrowserKit/Sources/Common/Theming/LightTheme.swift b/BrowserKit/Sources/Common/Theming/LightTheme.swift
@@ -74,7 +74,6 @@ private struct LightColourPalette: ThemeColourPalette {
     // MARK: - Text
     var textPrimary: UIColor = FXColors.DarkGrey90
     var textSecondary: UIColor = FXColors.DarkGrey05
-    var textSecondaryAction: UIColor = FXColors.DarkGrey90
     var textDisabled: UIColor = FXColors.DarkGrey90.withAlphaComponent(0.4)
     var textWarning: UIColor = FXColors.Red70
     var textAccent: UIColor = FXColors.Blue50

diff --git a/BrowserKit/Sources/Common/Theming/PrivateModeTheme.swift b/BrowserKit/Sources/Common/Theming/PrivateModeTheme.swift
@@ -76,7 +76,6 @@ private struct PrivateModeColorPalette: ThemeColourPalette {
     // MARK: - Text
     var textPrimary: UIColor = FXColors.LightGrey05
     var textSecondary: UIColor = FXColors.LightGrey40
-    var textSecondaryAction: UIColor = FXColors.DarkGrey90
     var textDisabled: UIColor = FXColors.LightGrey05.withAlphaComponent(0.4)
     var textWarning: UIColor = FXColors.Red20
     var textAccent: UIColor = FXColors.Blue30

diff --git a/BrowserKit/Sources/Common/Theming/ThemeColourPalette.swift b/BrowserKit/Sources/Common/Theming/ThemeColourPalette.swift
@@ -62,7 +62,6 @@ public protocol ThemeColourPalette {
     // MARK: - Text
     var textPrimary: UIColor { get }
     var textSecondary: UIColor { get }
-    var textSecondaryAction: UIColor { get }
     var textDisabled: UIColor { get }
     var textWarning: UIColor { get }
     var textAccent: UIColor { get }

diff --git a/BrowserKit/Sources/Common/Theming/ThemeManager.swift b/BrowserKit/Sources/Common/Theming/ThemeManager.swift
@@ -8,7 +8,6 @@ public protocol ThemeManager {
     var currentTheme: Theme { get }
     var window: UIWindow? { get set }
 
-    func getInterfaceStyle() -> UIUserInterfaceStyle
     func changeCurrentTheme(_ newTheme: ThemeType)
     func systemThemeChanged()
     func setSystemTheme(isOn: Bool)

diff --git a/BrowserKit/Sources/ComponentLibrary/Buttons/SecondaryRoundedButton.swift b/BrowserKit/Sources/ComponentLibrary/Buttons/SecondaryRoundedButton.swift
@@ -52,7 +52,7 @@ public class SecondaryRoundedButton: ResizableButton, ThemeApplicable {
         highlightedTintColor = theme.colors.actionSecondaryHover
         normalTintColor = theme.colors.actionSecondary
 
-        setTitleColor(theme.colors.textSecondaryAction, for: .normal)
+        setTitleColor(theme.colors.textOnLight, for: .normal)
         backgroundColor = theme.colors.actionSecondary
     }
 }
diff --git a/Client/Frontend/SurveySurface/SurveySurfaceViewController.swift b/Client/Frontend/SurveySurface/SurveySurfaceViewController.swift
@@ -247,7 +247,7 @@ class SurveySurfaceViewController: UIViewController, Themeable {
         takeSurveyButton.setTitleColor(theme.colors.textInverted, for: .normal)
         takeSurveyButton.backgroundColor = theme.colors.actionPrimary
 
-        dismissSurveyButton.setTitleColor(theme.colors.textSecondaryAction, for: .normal)
+        dismissSurveyButton.setTitleColor(theme.colors.textOnLight, for: .normal)
         dismissSurveyButton.backgroundColor = theme.colors.actionSecondary
     }
 }