chore: update tab bar icons for selected unselected states (#81)

edx · Dec 13, 2024 · ac3dbe5 · ac3dbe5
1 parent e3512c8
commit ac3dbe5
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 47 deletions.
diff --git a/...avigationBar/learn.imageset/Contents.json → ...ar/discover_active.imageset/Contents.json b/...avigationBar/learn.imageset/Contents.json → ...ar/discover_active.imageset/Contents.json
@@ -1,15 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "learn filled.svg",
+      "filename" : "discover_active.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }
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/discover_inactive.imageset/Contents.json b/Core/Core/Assets.xcassets/NavigationBar/discover_inactive.imageset/Contents.json
@@ -0,0 +1,13 @@
+{
+  "images" : [
+
+    {
+      "filename" : "discover_inactive.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/.../Assets.xcassets/NavigationBar/discover_inactive.imageset/discover_inactive.svg b/.../Assets.xcassets/NavigationBar/discover_inactive.imageset/discover_inactive.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/discovery.imageset/Frame-6.svg b/Core/Core/Assets.xcassets/NavigationBar/discovery.imageset/Frame-6.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn.imageset/learn filled.svg b/Core/Core/Assets.xcassets/NavigationBar/learn.imageset/learn filled.svg
diff --git a/...ationBar/discovery.imageset/Contents.json → ...onBar/learn_active.imageset/Contents.json b/...ationBar/discovery.imageset/Contents.json → ...onBar/learn_active.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Frame-6.svg",
+      "filename" : "learn_active.svg",
       "idiom" : "universal"
     }
   ],

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/...igationBar/profile.imageset/Contents.json → ...Bar/learn_inactive.imageset/Contents.json b/...igationBar/profile.imageset/Contents.json → ...Bar/learn_inactive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Frame-8.svg",
+      "filename" : "learn_inactive.svg",
       "idiom" : "universal"
     }
   ],

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/Assets.xcassets/NavigationBar/profile.imageset/Frame-8.svg b/Core/Core/Assets.xcassets/NavigationBar/profile.imageset/Frame-8.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/Contents.json b/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "profile_active.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/profile_active.svg b/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/profile_active.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile_inactive.imageset/Contents.json b/Core/Core/Assets.xcassets/NavigationBar/profile_inactive.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "profile_inactive.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...re/Assets.xcassets/NavigationBar/profile_inactive.imageset/profile_inactive.svg b/...re/Assets.xcassets/NavigationBar/profile_inactive.imageset/profile_inactive.svg
diff --git a/Core/Core/SwiftGen/Assets.swift b/Core/Core/SwiftGen/Assets.swift
@@ -76,9 +76,12 @@ 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 discovery = ImageAsset(name: "discovery")
-  public static let learn = ImageAsset(name: "learn")
-  public static let profile = ImageAsset(name: "profile")
+  public static let discoverActive = ImageAsset(name: "discover_active")
+  public static let discoverInactive = ImageAsset(name: "discover_inactive")
+  public static let learnActive = ImageAsset(name: "learn_active")
+  public static let learnInactive = ImageAsset(name: "learn_inactive")
+  public static let profileActive = ImageAsset(name: "profile_active")
+  public static let profileInactive = ImageAsset(name: "profile_inactive")
   public static let programs = ImageAsset(name: "programs")
   public static let addPhoto = ImageAsset(name: "addPhoto")
   public static let bgDelete = ImageAsset(name: "bg_delete")

diff --git a/OpenEdX/View/MainScreenView.swift b/OpenEdX/View/MainScreenView.swift
@@ -96,7 +96,11 @@ struct MainScreenView: View {
                     registerBanner
                 }
                 .tabItem {
-                    CoreAssets.learn.swiftUIImage.renderingMode(.template)
+                    if viewModel.selection == .dashboard {
+                        CoreAssets.learnActive.swiftUIImage.renderingMode(.template)
+                    } else {
+                        CoreAssets.learnInactive.swiftUIImage.renderingMode(.template)
+                    }
                     Text(CoreLocalization.Mainscreen.learn)
                 }
                 .tag(MainTab.dashboard)
@@ -126,7 +130,11 @@ struct MainScreenView: View {
                     }
                 }
                 .tabItem {
-                    CoreAssets.discovery.swiftUIImage.renderingMode(.template)
+                    if viewModel.selection == .discovery {
+                        CoreAssets.discoverActive.swiftUIImage.renderingMode(.template)
+                    } else {
+                        CoreAssets.discoverInactive.swiftUIImage.renderingMode(.template)
+                    }
                     Text(CoreLocalization.Mainscreen.discovery)
                 }
                 .tag(MainTab.discovery)
@@ -139,7 +147,11 @@ struct MainScreenView: View {
                 )
             }
             .tabItem {
-                CoreAssets.profile.swiftUIImage.renderingMode(.template)
+                if viewModel.selection == .profile {
+                    CoreAssets.profileActive.swiftUIImage.renderingMode(.template)
+                } else {
+                    CoreAssets.profileInactive.swiftUIImage.renderingMode(.template)
+                }
                 Text(CoreLocalization.Mainscreen.profile)
             }
             .tag(MainTab.profile)