Fix the about us screens

imodeveloperlab · May 20, 2024 · e56c9cc · e56c9cc
1 parent 7640385
commit e56c9cc
Show file tree

Hide file tree

Showing 11 changed files with 250 additions and 105 deletions.
diff --git a/DSKit/Sources/DSKit/Appearances/BlueAppearance.swift b/DSKit/Sources/DSKit/Appearances/BlueAppearance.swift
@@ -73,7 +73,7 @@ public class BlueAppearance: DSAppearance {
             text: secondaryText,
             textField: secondaryViewTextField,
             background: .dynamic(light: 0xF4F4F4, dark: 0x181825),
-            separator: .dynamic(light: 0xEBEBEB, dark: 0xEBEBEB),
+            separator: .dynamic(light: 0xEBEBEB, dark: 0x1E1E2E),
             cornerRadius: 10
         )
 

diff --git a/DSKit/Sources/DSKit/Appearances/DSKitAppearance.swift b/DSKit/Sources/DSKit/Appearances/DSKitAppearance.swift
@@ -112,7 +112,7 @@ public struct DSKitAppearance: DSAppearance {
         let sBackground: UIColor = .dynamic(light: 0xf3f4f2, dark: 0x101a24)
 
         // Separator
-        let sSeparator: UIColor = .dynamic(light: 0xd0dbe3, dark: 0x38444d)
+        let sSeparator: UIColor = .dynamic(light: 0xd0dbe3, dark: 0x15202b)
 
         // Corner radius
         let sCornerRadius: CGFloat = 10

diff --git a/DSKit/Sources/DSKit/Appearances/DarkAppearance.swift b/DSKit/Sources/DSKit/Appearances/DarkAppearance.swift
@@ -78,7 +78,7 @@ public class DarkAppearance: DSAppearance {
             text: secondaryText,
             textField: secondaryViewTextField,
             background: .dynamic(light: 0xF4F4F4, dark: 0x2D2D2D),
-            separator: .dynamic(light: 0xEBEBEB, dark: 0x555555),
+            separator: .dynamic(light: 0xEBEBEB, dark: 0x333333),
             cornerRadius: 2
         )
 

diff --git a/DSKit/Sources/DSKit/Appearances/RetroAppearance.swift b/DSKit/Sources/DSKit/Appearances/RetroAppearance.swift
@@ -95,7 +95,7 @@ public final class RetroAppearance: DSAppearance {
             text: secondaryText,
             textField: secondaryViewTextField,
             background: .dynamic(light: 0xF4F2EA, dark: 0x4E4A57),
-            separator: .dynamic(light: 0xDFDCD3, dark: 0xFFFCF8),
+            separator: .dynamic(light: 0xDFDCD3, dark: 0x111111),
             cornerRadius: 13
         )
 

diff --git a/DSKitExplorer/Screens/AboutUsScreen1.swift b/DSKitExplorer/Screens/AboutUsScreen1.swift
@@ -19,28 +19,51 @@ struct AboutUsScreen1: View {
         ScrollView {
             DSVStack(spacing: .medium) {
                 DSVStack {
-                    DSText("Our Story").dsTextStyle(.title2)
-                    DSText("Start working with DSKit that can provide everything you need to generate any interface you need. Dummy text is text that is used in the publishing industry or by web designers to occupy the space which will later be filled with 'real' content.").dsTextStyle(.body)
+                    DSText("Our Story")
+                        .dsTextStyle(.title2)
+                    DSText("Here you will feel the attitude, here you will receive quality, here you will see the atmosphere of an authentic store")
+                        .dsTextStyle(.body)
                 }
 
                 DSCoverFlow(height: 250, data: imageGallery, id: \.self) { image in
-                    DSImageView(url: image).dsCornerRadius()
+                    DSImageView(url: image)
+                        .dsCornerRadius()
                 }
 
                 DSVStack(alignment: .leading) {
-                    DSHStack {
-                        DSImageView(systemName: "message.fill", size: .font(.headline), tint: .text(.body))
-                        DSText("DSFaker().text").dsTextStyle(.caption1).dsFullWidth()
+                    DSHStack(spacing: .medium) {
+                        DSImageView(
+                            systemName: "message.fill", 
+                            size: .font(.headline),
+                            tint: .text(.body)
+                        )
+                        DSText("Introducing Grocify, where convenience meets quality. Our goal: tailor solutions for modern grocery stores. With a focus on user-friendly technology, we empower stores of all sizes to thrive.")
+                            .dsTextStyle(.caption1)
+                            .dsFullWidth()
                     }
-                    DSDivider().background(appearance.secondaryView.separator.color)
-                    DSHStack {
-                        DSImageView(systemName: "shippingbox.fill", size: .font(.headline), tint: .text(.body))
-                        DSText("DSFaker().text").dsTextStyle(.subheadline).dsFullWidth()
+                    DSDivider()
+                        .dsPadding(.leading, 30)
+                    DSHStack(spacing: .medium) {
+                        DSImageView(
+                            systemName: "shippingbox.fill",
+                            size: .font(.headline),
+                            tint: .text(.body)
+                        )
+                        DSText("At Grocify, collaboration is key. Our team crafts cutting-edge tools for seamless operations, from inventory management to customer service. From local markets to supermarket chains, we're committed to elevating the grocery experience.")
+                            .dsTextStyle(.subheadline)
+                            .dsFullWidth()
                     }
-                    DSDivider().background(appearance.secondaryView.separator.color)
-                    DSHStack {
-                        DSImageView(systemName: "leaf.arrow.triangle.circlepath", size: .font(.headline), tint: .text(.body))
-                        DSText("DSFaker().text").dsTextStyle(.footnote).dsFullWidth()
+                    DSDivider()
+                        .dsPadding(.leading, 30)
+                    DSHStack(spacing: .medium) {
+                        DSImageView(
+                            systemName: "leaf.arrow.triangle.circlepath",
+                            size: .font(.headline),
+                            tint: .text(.body)
+                        )
+                        DSText("Join us at Grocify, redefining the grocery industry. With intuitive solutions, we're shaping the future of shopping.")
+                            .dsTextStyle(.footnote)
+                            .dsFullWidth()
                     }
                 }.dsCardStyle()
             }
@@ -51,8 +74,36 @@ struct AboutUsScreen1: View {
 // MARK: - Testable
 
 struct Testable_AboutUsScreen1: View {
+    @Environment(\.dismiss) var dismiss
+    @State var selectedTab: Int = 2
     var body: some View {
-        AboutUsScreen1()
+        TabView(selection: $selectedTab) {
+            Text("Shop")
+            .tabItem {
+                Image(systemName: "house.fill")
+                Text("Home")
+            }.tag(0)
+            Text("Cart")
+                .tabItem {
+                    Image(systemName: "cart.fill")
+                    Text("Cart")
+                }.tag(1)
+
+            AboutUsScreen1()
+                .tabItem {
+                    Image(systemName: "info.circle.fill")
+                    Text("About")
+                }.tag(2)
+
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }.tag(3)
+        }
     }
 }
 
@@ -63,8 +114,5 @@ struct AboutUsScreen1_Previews: PreviewProvider {
 }
 
 fileprivate let p1Image = URL(string: "https://images.pexels.com/photos/1036857/pexels-photo-1036857.jpeg?cs=srgb&dl=pexels-artem-beliaikin-1036857.jpg&fm=jpg")
-
-
 fileprivate let p2Image = URL(string: "https://images.pexels.com/photos/264636/pexels-photo-264636.jpeg?cs=srgb&dl=pexels-pixabay-264636.jpg&fm=jpg")
-
 fileprivate let p3Image = URL(string: "https://images.pexels.com/photos/1402407/pexels-photo-1402407.jpeg?cs=srgb&dl=pexels-lisa-fotios-1402407.jpg&fm=jpg")