Feature/restructure

.github/workflows/publish.yml

@@ -23,10 +23,10 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Setup Ruby 3.3.0
+      - name: Setup Ruby 3.3.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3.0'
+          ruby-version: '3.3.6'
           bundler-cache: true
 
       - name: Netrc maven.pkg.github.com

.github/workflows/test.yml

@@ -13,10 +13,10 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Setup Ruby 3.3.0
+      - name: Setup Ruby 3.3.6
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3.0'
+          ruby-version: '3.3.6'
           bundler-cache: true
 
       - name: Netrc api.github.com

.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.6

Modules/SharedUI/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

Modules/SharedUI/.swiftpm/xcode/xcshareddata/xcschemes/SharedUI.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SharedUI"
+               BuildableName = "SharedUI"
+               BlueprintName = "SharedUI"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SharedUI"
+            BuildableName = "SharedUI"
+            BlueprintName = "SharedUI"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Modules/SharedUI/Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+    name: "SharedUI",
+    platforms: [
+        .iOS(.v15),
+    ],
+    products: [
+        .library(
+            name: "SharedUI",
+            targets: ["SharedUI"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "SharedUI",
+            resources: [
+                .process("Resources"),
+            ]
+        ),
+        .testTarget(
+            name: "SharedUITests",
+            dependencies: ["SharedUI"]
+        ),
+    ]
+)

Modules/SharedUI/Sources/SharedUI/Colors.swift

@@ -0,0 +1,33 @@
+import SwiftUI
+
+public extension Color {
+    static var main: Color {
+        Color(.main)
+    }
+
+    static var accent: Color {
+        Color(.accent)
+    }
+
+    /// black in light mode, white in dark mode
+    static var blackWhite: Color {
+        Color(.blackWhite)
+    }
+
+    /// white in light mode, black in dark mode
+    static var whiteBlack: Color {
+        Color(.whiteBlack)
+    }
+
+    static var text: Color {
+        Color(.text)
+    }
+
+    static var title: Color {
+        Color(.title)
+    }
+
+    static var palletOrange: Color {
+        Color(.palletOrange)
+    }
+}

Modules/SharedUI/Sources/SharedUI/Fonts.swift

@@ -0,0 +1,87 @@
+import SwiftUI
+
+public enum WrFont {
+    case h1
+    case h2
+    case h3
+    case h4
+    case body
+    case caption1
+    case caption2
+
+    var baseSize: CGFloat {
+        switch self {
+        case .h1:
+            56
+        case .h2:
+            48
+        case .h3:
+            32
+        case .h4:
+            24
+        case .body:
+            18
+        case .caption1:
+            14
+        case .caption2:
+            12
+        }
+    }
+}
+
+private struct WrTextStyle: ViewModifier {
+    let fontStyle: WrFont
+    let textColor: Color
+
+    @ScaledMetric
+    var fontSize: CGFloat
+
+    var font: Font {
+        .system(size: fontSize)
+    }
+
+    init(fontStyle: WrFont, textColor: Color) {
+        self.fontStyle = fontStyle
+        self.textColor = textColor
+        _fontSize = ScaledMetric(wrappedValue: fontStyle.baseSize)
+    }
+
+    func body(content: Content) -> some View {
+        content
+            .font(font)
+            .foregroundStyle(textColor)
+    }
+}
+
+public extension View {
+    func textStyle(_ font: WrFont, textColor: Color = .text) -> some View {
+        modifier(WrTextStyle(fontStyle: font, textColor: textColor))
+    }
+}
+
+#Preview {
+    ScrollView {
+        VStack {
+            Text("h1")
+                .textStyle(.h1)
+
+            Text("h2")
+                .textStyle(.h2)
+
+            Text("h3")
+                .textStyle(.h3)
+
+            Text("h4")
+                .textStyle(.h4)
+
+            Text("body")
+                .textStyle(.body)
+
+            Text("caption1")
+                .textStyle(.caption1)
+
+            Text("caption2")
+                .textStyle(.caption2)
+        }
+    }
+}

Modules/SharedUI/Sources/SharedUI/Images.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+public extension Image {
+    static var logoRounded: Image {
+        Image(.logoRounded)
+    }
+
+    static var logoLaunch: Image {
+        Image(.logoLaunch)
+    }
+}

WaiterRobot/Resources/Colors.xcassets/main.colorset/Contents.json → Modules/SharedUI/Sources/SharedUI/Resources/Colors.xcassets/accent.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.491",
-          "red" : "0.375"
+          "blue" : "0xFF",
+          "green" : "0x7D",
+          "red" : "0x60"
         }
       },
       "idiom" : "universal"

Modules/SharedUI/Sources/SharedUI/Resources/Colors.xcassets/main.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xBC",
+          "red" : "0xAC"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x88",
+          "green" : "0x4C",
+          "red" : "0x40"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WaiterRobot/Resources/Colors.xcassets/second.colorset/Contents.json → Modules/SharedUI/Sources/SharedUI/Resources/Colors.xcassets/palletOrange.colorset/Contents.json

@@ -2,12 +2,12 @@
   "colors" : [
     {
       "color" : {
-        "color-space" : "display-p3",
+        "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.967",
-          "green" : "0.691",
-          "red" : "0.607"
+          "blue" : "0x46",
+          "green" : "0x96",
+          "red" : "0xFA"
         }
       },
       "idiom" : "universal"

Modules/SharedUI/Sources/SharedUI/Resources/Colors.xcassets/text.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x47",
+          "green" : "0x23",
+          "red" : "0x1B"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}