fix: fix tab bar color not properly applying (#85)

* fix: fix tar bar color not properly applying * chore: parity with android for discover icon
openedx · Dec 13, 2024 · efbb635 · efbb635
1 parent 555d662
commit efbb635
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 36 deletions.
diff --git a/.../discover_inactive.imageset/Contents.json → ...gationBar/discover.imageset/Contents.json b/.../discover_inactive.imageset/Contents.json → ...gationBar/discover.imageset/Contents.json
diff --git a/...r_inactive.imageset/discover_inactive.svg → ...r/discover.imageset/discover_inactive.svg b/...r_inactive.imageset/discover_inactive.svg → ...r/discover.imageset/discover_inactive.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/discover_active.imageset/Contents.json b/Core/Core/Assets.xcassets/NavigationBar/discover_active.imageset/Contents.json
diff --git a/...Core/Assets.xcassets/NavigationBar/discover_active.imageset/discover_active.svg b/...Core/Assets.xcassets/NavigationBar/discover_active.imageset/discover_active.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn_active.imageset/learn_active.svg b/Core/Core/Assets.xcassets/NavigationBar/learn_active.imageset/learn_active.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn_inactive.imageset/learn_inactive.svg b/Core/Core/Assets.xcassets/NavigationBar/learn_inactive.imageset/learn_inactive.svg
diff --git a/Core/Core/SwiftGen/Assets.swift b/Core/Core/SwiftGen/Assets.swift
@@ -76,8 +76,7 @@ public enum CoreAssets {
   public static let noAnnouncements = ImageAsset(name: "noAnnouncements")
   public static let noHandouts = ImageAsset(name: "noHandouts")
   public static let dashboard = ImageAsset(name: "dashboard")
-  public static let discoverActive = ImageAsset(name: "discover_active")
-  public static let discoverInactive = ImageAsset(name: "discover_inactive")
+  public static let discover = ImageAsset(name: "discover")
   public static let learnActive = ImageAsset(name: "learn_active")
   public static let learnInactive = ImageAsset(name: "learn_inactive")
   public static let profileActive = ImageAsset(name: "profile_active")

diff --git a/OpenEdX/View/MainScreenView.swift b/OpenEdX/View/MainScreenView.swift
@@ -26,9 +26,9 @@ struct MainScreenView: View {
     init(viewModel: MainScreenViewModel) {
         self.viewModel = viewModel
         UITabBar.appearance().isTranslucent = false
-        UITabBar.appearance().barTintColor = UIColor(Theme.Colors.tabbarColor)
-        UITabBar.appearance().backgroundColor = UIColor(Theme.Colors.tabbarColor)
-        UITabBar.appearance().unselectedItemTintColor = UIColor(Theme.Colors.textSecondaryLight)
+        UITabBar.appearance().barTintColor = Theme.UIColors.tabbarActiveColor
+        UITabBar.appearance().backgroundColor = Theme.UIColors.tabbarBGColor
+        UITabBar.appearance().unselectedItemTintColor = Theme.UIColors.tabbarInactiveColor
 
         UITabBarItem.appearance().setTitleTextAttributes(
             [NSAttributedString.Key.font: Theme.UIFonts.labelSmall()],
@@ -130,11 +130,7 @@ struct MainScreenView: View {
                     }
                 }
                 .tabItem {
-                    if viewModel.selection == .discovery {
-                        CoreAssets.discoverActive.swiftUIImage.renderingMode(.template)
-                    } else {
-                        CoreAssets.discoverInactive.swiftUIImage.renderingMode(.template)
-                    }
+                    CoreAssets.discover.swiftUIImage.renderingMode(.template)
                     Text(CoreLocalization.Mainscreen.discovery)
                 }
                 .tag(MainTab.discovery)

diff --git a/Theme/Theme/Theme.swift b/Theme/Theme/Theme.swift
@@ -117,7 +117,6 @@ public struct Theme: Sendable {
             secondaryButtonBorderColor: Color = ThemeAssets.secondaryButtonBorderColor.swiftUIColor,
             secondaryButtonTextColor: Color = ThemeAssets.secondaryButtonTextColor.swiftUIColor,
             success: Color = ThemeAssets.success.swiftUIColor,
-            tabbarColor: Color = ThemeAssets.tabbarColor.swiftUIColor,
             primaryButtonTextColor: Color = ThemeAssets.primaryButtonTextColor.swiftUIColor,
             toggleSwitchColor: Color = ThemeAssets.toggleSwitchColor.swiftUIColor,
             textInputTextColor: Color = ThemeAssets.textInputTextColor.swiftUIColor,
@@ -163,7 +162,6 @@ public struct Theme: Sendable {
             self.secondaryButtonBorderColor = secondaryButtonBorderColor
             self.secondaryButtonTextColor = secondaryButtonTextColor
             self.success = success
-            self.tabbarColor = tabbarColor
             self.primaryButtonTextColor = primaryButtonTextColor
             self.toggleSwitchColor = toggleSwitchColor
             self.textInputTextColor = textInputTextColor
@@ -181,6 +179,9 @@ public struct Theme: Sendable {
         nonisolated(unsafe) public private(set) static var accentXColor = ThemeAssets.accentXColor.color
         nonisolated(unsafe) public private(set) static var navigationBarTintColor =
         ThemeAssets.navigationBarTintColor.color
+        nonisolated(unsafe) public private(set) static var tabbarActiveColor = ThemeAssets.tabbarActiveColor.color
+        nonisolated(unsafe) public private(set) static var tabbarBGColor = ThemeAssets.tabbarBGColor.color
+        nonisolated(unsafe) public private(set) static var tabbarInactiveColor = ThemeAssets.tabbarInactiveColor.color
 
         public static func update(
             textPrimary: UIColor = ThemeAssets.textPrimary.color,