Merge pull request #142 from DroidKaigi/feature/bottom_tab_icon

[iOS]Added bottom tab icons
DroidKaigi · Jul 17, 2024 · 381b9d6 · 381b9d6
2 parents ae4b353 + 910b21c
commit 381b9d6
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 5 deletions.
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_fav.imageset/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/ic_fav.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_fav.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_fav.imageset/ic_fav.svg b/app-ios/Sources/App/Resources/Media.xcassets/ic_fav.imageset/ic_fav.svg
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_info.imageset/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/ic_info.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_info.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_info.imageset/ic_info.svg b/app-ios/Sources/App/Resources/Media.xcassets/ic_info.imageset/ic_info.svg
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_map.imageset/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/ic_map.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_map.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_map.imageset/ic_map.svg b/app-ios/Sources/App/Resources/Media.xcassets/ic_map.imageset/ic_map.svg
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_profileCard.imageset/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/ic_profileCard.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_profileCard.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...Sources/App/Resources/Media.xcassets/ic_profileCard.imageset/ic_profileCard.svg b/...Sources/App/Resources/Media.xcassets/ic_profileCard.imageset/ic_profileCard.svg
diff --git a/app-ios/Sources/App/Resources/Media.xcassets/ic_timetable.imageset/Contents.json b/app-ios/Sources/App/Resources/Media.xcassets/ic_timetable.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_timetable.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...ios/Sources/App/Resources/Media.xcassets/ic_timetable.imageset/ic_timetable.svg b/...ios/Sources/App/Resources/Media.xcassets/ic_timetable.imageset/ic_timetable.svg
diff --git a/app-ios/Sources/App/RootView.swift b/app-ios/Sources/App/RootView.swift
@@ -8,6 +8,7 @@ import StaffFeature
 import SwiftUI
 import TimetableDetailFeature
 import TimetableFeature
+import Theme
 
 private enum Tab {
     case timetable
@@ -32,7 +33,7 @@ public struct RootView: View {
                 .tabItem {
                     Label(
                         title: { Text("Timetable") },
-                        icon: { Image(systemName: "42.circle") }
+                        icon: { Image(.icTimetable).renderingMode(.template) }
                     )
                 }
 
@@ -41,7 +42,7 @@ public struct RootView: View {
                 .tabItem {
                     Label(
                         title: { Text("Event Map") },
-                        icon: { Image(systemName: "42.circle") }
+                        icon: { Image(.icMap).renderingMode(.template) }
                     )
                 }
 
@@ -55,7 +56,7 @@ public struct RootView: View {
             .tabItem {
                 Label(
                     title: { Text("Favorite") },
-                    icon: { Image(systemName: "42.circle") }
+                    icon: { Image(.icFav).renderingMode(.template) }
                 )
             }
 
@@ -64,7 +65,7 @@ public struct RootView: View {
                 .tabItem {
                     Label(
                         title: { Text("About") },
-                        icon: { Image(systemName: "42.circle") }
+                        icon: { Image(.icInfo).renderingMode(.template) }
                     )
                 }
 
@@ -73,10 +74,11 @@ public struct RootView: View {
                 .tabItem {
                     Label(
                         title: { Text("ID Card") },
-                        icon: { Image(systemName: "42.circle") }
+                        icon: { Image(.icProfileCard).renderingMode(.template) }
                     )
                 }
         }
+        .tint(AssetColors.Custom.arcticFox.swiftUIColor)
     }
 
     @MainActor