feat: Create icon modifier for Navigation bar

Team-B1ND · Apr 1, 2024 · 982df00 · 982df00
1 parent 77d31d2
commit 982df00
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 76 deletions.
diff --git a/Source/DDS/Component/NavigationBar/NavigationBar.swift b/Source/DDS/Component/NavigationBar/NavigationBar.swift
@@ -5,21 +5,24 @@ public struct DodamNavigationBar: View {
 
     private let title: String
     private let font: Font
+    private let icon: DodamIconography?
     private let verticalSpacing: CGFloat?
     private let showBackButton: Bool
     private let subView: AnyView?
     private let buttons: [DodamNavigationBarButton]
 
     private init(
-        title: String,
+        title: String = "",
         font: Font = .headline(.small),
+        icon: DodamIconography? = nil,
         verticalSpacing: CGFloat? = nil,
         showBackButton: Bool = true,
         subView: AnyView? = nil,
         buttons: [DodamNavigationBarButton] = .init()
     ) {
         self.title = title
         self.font = font
+        self.icon = icon
         self.verticalSpacing = verticalSpacing
         self.showBackButton = showBackButton
         self.subView = subView
@@ -33,6 +36,13 @@ public struct DodamNavigationBar: View {
         )
     }
 
+    public static func icon(icon: DodamIconography) -> Self {
+        .init(
+            icon: icon,
+            showBackButton: false
+        )
+    }
+
     public static func small(title: String) -> Self {
         .init(
             title: title,
@@ -61,6 +71,7 @@ public struct DodamNavigationBar: View {
         .init(
             title: self.title,
             font: self.font,
+            icon: self.icon,
             verticalSpacing: self.verticalSpacing,
             showBackButton: self.showBackButton,
             subView: AnyView(content()),
@@ -75,6 +86,7 @@ public struct DodamNavigationBar: View {
         .init(
             title: self.title,
             font: self.font,
+            icon: self.icon,
             verticalSpacing: self.verticalSpacing,
             showBackButton: self.showBackButton,
             subView: self.subView,
@@ -108,6 +120,13 @@ public struct DodamNavigationBar: View {
                     }
                     .dodamColor(.onSurface)
                 }
+                if let icon = icon {
+                    Dodam.icon(icon)
+                        .resizable()
+                        .frame(width: 88, height: 22)
+                        .dodamColor(.primary)
+                        .padding(.leading, 16)
+                }
                 if verticalSpacing == nil {
                     text
                         .padding(
@@ -157,6 +176,9 @@ public struct DodamNavigationBar: View {
             .button(icon: .plus) { }
             .button(icon: .bell) { }
         Divider()
+        DodamNavigationBar.icon(icon: .logo)
+            .button(icon: .bell) { }
+        Divider()
         DodamNavigationBar.small(title: "Small")
             .button(icon: .plus) { }
             .button(icon: .bell) { }

diff --git a/Source/DDS/Component/OldScrollView/OldScrollView.swift b/Source/DDS/Component/OldScrollView/OldScrollView.swift
diff --git a/Source/DDS/Foundation/Iconography/Iconography.xcassets/gear.imageset/Contents.json b/Source/DDS/Foundation/Iconography/Iconography.xcassets/gear.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "gear.svg",
+      "filename" : "Gear.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },