Add support for tab bars

DSKit/Sources/DSKit/Designable/DSAppearance.swift

@@ -63,6 +63,20 @@ public extension DSAppearance {
         ]
 
         UINavigationBar.appearance().standardAppearance = navigationBarAppearance
+
+        let itemAppearance = UITabBarItemAppearance()
+        itemAppearance.normal.iconColor = self.tabBar.unselectedItemTint
+        itemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: self.tabBar.unselectedItemTint]
+        itemAppearance.selected.iconColor =  self.tabBar.itemTint
+        itemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: self.tabBar.itemTint]
+
+        let tabBarAppearance = UITabBarAppearance()
+        tabBarAppearance.configureWithOpaqueBackground()
+        tabBarAppearance.backgroundColor = self.tabBar.barTint
+        tabBarAppearance.stackedLayoutAppearance = itemAppearance
+
+        UITabBar.appearance().standardAppearance = tabBarAppearance
+        UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance
     }
 }
 

DSKitExplorer/Screens/CartScreen4.swift

@@ -106,7 +106,7 @@ extension CartScreen4 {
                     DSText("for").dsTextStyle(.subheadline)
                     DSText(itemsCount).dsTextStyle(.smallHeadline)
                     DSText("items").dsTextStyle(.subheadline)
-                    DSPriceView(price: price, size: .subheadline)
+                    DSPriceView(price: price, size: .headline)
                 }
             }
         }

DSKitExplorer/Screens/HomeScreen3.swift

@@ -28,7 +28,7 @@ struct HomeScreen3: View {
 
                 DSHScroll(data: viewModel.categories, id: \.self) { category in
                     CategoryView(title: category) { dismiss() }
-                }
+                }.dsPadding(.top, .small)
 
                 DSVStack {
                     DSSectionHeaderView(title: "Discounts", actionTitle: "View all", action: { self.dismiss() })

DSKitExplorer/Screens/HomeScreen4.swift

@@ -32,13 +32,13 @@ struct HomeScreen4: View {
                 DSHScroll(data: viewModel.categories, id: \.id) { category in
                     CategoryView(category: category, isSelected: viewModel.selectedCategory == category.id)
                         .onTap { viewModel.selectedCategory = category.id }
-                }
+                }.dsPadding(.top, .small)
 
                 DSVStack {
                     DSGrid(viewHeight: 190, data: viewModel.products, id: \.id) { product in
                         ProductView(product: product).onTap { self.dismiss() }
                     }
-                }
+                }.dsPadding(.top, .small)
             }
         }.dsScreen()
     }

DSKitExplorer/Screens/ItemDetails2.swift

@@ -55,7 +55,7 @@ struct ItemDetails2: View {
         }
         .safeAreaInset(edge: .bottom) {
             DSBottomContainer {
-                DSButton(title: "Add to cart", rightSystemName: "cart") {
+                DSButton(title: "Add to cart", rightSystemName: "cart.fill") {
                     dismiss()
                 }
                 DSText(viewModel.priceDisclaimer, alignment: .center)
@@ -90,7 +90,7 @@ final class ItemDetails2Model: ObservableObject {
         amount: "120.0",
         regularAmount: "200",
         currency: "$",
-        discountBadge: "80$ Off"
+        discountBadge: "80$ OFF"
     )
 }
 

DSKitExplorer/Screens/ItemDetails3.swift

@@ -152,7 +152,7 @@ final class ItemDetails3Model: ObservableObject {
         amount: "120",
         regularAmount: "200",
         currency: "$",
-        discountBadge: "80$ Off"
+        discountBadge: "80$ OFF"
     )
 }
 

DSKitExplorer/Screens/ItemDetails4.swift

@@ -122,7 +122,7 @@ final class ItemDetails4Model: ObservableObject {
         amount: "120.0",
         regularAmount: "200",
         currency: "$",
-        discountBadge: "80$ Off"
+        discountBadge: "80$ OFF"
     )
 
     @Published var selectedSize: String = "10"

DSKitExplorer/Screens/ItemDetails5.swift

@@ -93,7 +93,7 @@ final class ItemDetails5Model: ObservableObject {
         amount: "120",
         regularAmount: "200",
         currency: "$",
-        discountBadge: "80$ Off"
+        discountBadge: "80$ OFF"
     )
 }
 

DSKitExplorer/Screens/Items4.swift

@@ -21,6 +21,7 @@ struct Items4: View {
                         .dsTextStyle(.headline, 12)
                         .dsPadding(.horizontal, .large)
                         .dsCardStyle()
+                        .dsHeight(.actionElement)
                         .onTap { self.dismiss() }
                 }
                 DSGrid(data: viewModel.products, id: \.id) { product in

DSKitExplorer/Screens/Items5.swift

@@ -30,6 +30,7 @@ struct Items5: View {
                     DSText(title).dsTextStyle(.smallHeadline)
                         .dsPadding(.horizontal)
                         .dsCardStyle()
+                        .dsHeight(.actionElement)
                         .onTap { self.dismiss() }
                 }
                 DSGrid(data: viewModel.products, id: \.id) { product in

DSKitExplorer/Screens/LogInScreen2.swift

@@ -18,7 +18,7 @@ struct LogInScreen2: View {
 
             DSImageView(
                 systemName: "square.3.layers.3d.top.filled",
-                size: 50,
+                size: 70,
                 tint: .text(.headline)
             )
 

DSKitExplorer/Screens/LogInScreen3.swift

@@ -20,7 +20,7 @@ struct LogInScreen3: View {
             DSVStack(alignment: .center, spacing: .medium) {
                 DSImageView(
                     systemName: "square.3.layers.3d.top.filled",
-                    size: 60,
+                    size: 90,
                     tint: .text(.headline)
                 )
                 DSText(
@@ -31,9 +31,9 @@ struct LogInScreen3: View {
                 .dsWidth(300)
             }.frame(maxWidth: .infinity)
 
-           Spacer()
-           Spacer()
-           Spacer()
+            Spacer()
+            Spacer()
+            Spacer()
 
             DSVStack(alignment: .center) {
 
@@ -61,10 +61,15 @@ struct LogInScreen3: View {
 
                 DSText("or sign up with Email").dsTextStyle(.subheadline)
 
-                DSButton(title: "Sign Up", rightSystemName: "envelope.fill", pushContentToSides: true, style: .light) {
+                DSButton(
+                    title: "Sign Up",
+                    rightSystemName: "envelope.fill",
+                    pushContentToSides: true,
+                    style: .light
+                ) {
                     self.dismiss()
                 }
-
+                
                 DSButton(title: "Log in with Email", style: .clear, action: {
                     self.dismiss()
                 })

DSKitExplorer/Screens/NewsScreen1.swift

@@ -22,8 +22,8 @@ struct NewsScreen1: View {
     var body: some View {
         ScrollView {
             DSVStack {
-                ForEach(viewModel.articles) { product in
-                    ArticleView(article: product, style: $style)
+                ForEach(viewModel.articles) { article in
+                    ArticleView(article: article, style: $style)
                 }
             }
         }
@@ -80,7 +80,6 @@ extension NewsScreen1 {
                         }
                     }.dsPadding()
                 } else {
-
                     DSHStack(alignment: .top, spacing: .medium) {
 
                         if let image = article.image {
@@ -100,7 +99,11 @@ extension NewsScreen1 {
                         }
 
                         if article.bookmarked {
-                            DSImageView(systemName: "bookmark.fill", size: .font(.smallSubtitle), tint: .color(.orange))
+                            DSImageView(
+                                systemName: "bookmark.fill",
+                                size: .font(.smallSubtitle),
+                                tint: .color(.orange)
+                            )
                         }
 
                     }.dsPadding()
@@ -203,7 +206,25 @@ struct Testable_NewsScreen1: View {
 
 struct NewsScreen1_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { Testable_NewsScreen1() }
+        DSPreviewForEachAppearance {
+            TabView {
+                Testable_NewsScreen1()
+                    .tabItem {
+                        Image(systemName: "newspaper.fill")
+                        Text("Home")
+                    }
+                Text("Empty")
+                    .tabItem {
+                        Image(systemName: "bookmark")
+                        Text("Bookmarks")
+                    }
+                Text("Empty")
+                    .tabItem {
+                        Image(systemName: "gearshape")
+                        Text("Settings")
+                    }
+            }
+        }
     }
 }
 

DSKitExplorer/Screens/NewsScreen2.swift

@@ -159,7 +159,26 @@ struct Testable_NewsScreen2: View {
 
 struct NewsScreen2_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { Testable_NewsScreen2() }
+        @State var selectedTab: Int = 1
+        DSPreviewForEachAppearance {
+            TabView(selection: $selectedTab) {
+                Text("Empty")
+                    .tabItem {
+                        Image(systemName: "newspaper.fill")
+                        Text("Home")
+                    }.tag(0)
+                Testable_NewsScreen2()
+                    .tabItem {
+                        Image(systemName: "bookmark")
+                        Text("Bookmarks")
+                    }.tag(1)
+                Text("Empty")
+                    .tabItem {
+                        Image(systemName: "gearshape")
+                        Text("Settings")
+                    }.tag(2)
+            }
+        }
     }
 }
 

DSKitExplorerTests/AssertSnapshot.swift

@@ -26,10 +26,10 @@ extension XCTestCase {
         let view = UIHostingController(rootView: testView)
         view.overrideUserInterfaceStyle = .light
 
-        guard let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) else {
-            fatalError("A key window is required for UI operations")
-        }
-        window.rootViewController = view
+//        guard let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) else {
+//            fatalError("A key window is required for UI operations")
+//        }
+        //window.rootViewController = view
 
         SnapshotTesting.assertSnapshot(
             matching: view,