Colors moved to assets to get automatic dark mode support

Fixed snapshot tests - now we force French language via xctestplan
Added snapshot tests to aggregated plan, so that they are run on CI too.

.github/workflows/ios.yml

@@ -17,13 +17,14 @@ jobs:
       - name: Checkout repository
         uses: actions/[email protected]
       - name: Cache packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: packages-cache
         with:
           path: packages_cache
           key: ${{ runner.os }}-packages-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-packages-
+          save-always: true
       - name: Enable macros
         run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
       - name: Run tests

NodeCrypto/NodeCrypto.xcodeproj/project.pbxproj

@@ -103,6 +103,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = E75E1A622B0A8E760053C9E9 /* Build configuration list for PBXNativeTarget "NodeCrypto" */;
 			buildPhases = (
+				7A19B1A92B665853006CFE1A /* Swiftlint */,
 				E75E1A502B0A8E750053C9E9 /* Sources */,
 				E75E1A512B0A8E750053C9E9 /* Frameworks */,
 				E75E1A522B0A8E750053C9E9 /* Resources */,
@@ -168,6 +169,28 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		7A19B1A92B665853006CFE1A /* Swiftlint */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = Swiftlint;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint > /dev/null; then\n  swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		E75E1A502B0A8E750053C9E9 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

NodeCrypto/NodeCrypto.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -102,10 +102,10 @@
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
+      "location" : "https://github.com/Frameio/swift-snapshot-testing",
       "state" : {
-        "revision" : "59b663f68e69f27a87b45de48cb63264b8194605",
-        "version" : "1.15.1"
+        "branch" : "image-colorspace-coversions",
+        "revision" : "2465c86a9f2166205ae3989e6909dfeb1d1b08a2"
       }
     },
     {

NodeCrypto/NodeCrypto/Aggregated.xctestplan

@@ -10,6 +10,8 @@
   ],
   "defaultOptions" : {
     "codeCoverage" : false,
+    "language" : "fr",
+    "region" : "FR",
     "targetForVariableExpansion" : {
       "containerPath" : "container:NodeCrypto.xcodeproj",
       "identifier" : "E75E1A532B0A8E750053C9E9",
@@ -48,6 +50,13 @@
         "identifier" : "OnboardingFeatureTests",
         "name" : "OnboardingFeatureTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:..\/Packages",
+        "identifier" : "SnapshotsTests",
+        "name" : "SnapshotsTests"
+      }
     }
   ],
   "version" : 1

Packages/Package.swift

@@ -22,7 +22,8 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/pointfreeco/swift-composable-architecture", branch: "main"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.2"),
-        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.15.1"),
+        //.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.15.2"),
+        .package(url: "https://github.com/Frameio/swift-snapshot-testing", branch: "image-colorspace-coversions"),
         .package(url: "https://github.com/tgrapperon/swift-dependencies-additions", from: "1.0.1"),
         .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),
         .package(url: "https://github.com/oliverfoggin/swift-composable-analytics", from: "1.1.0"),

Packages/Sources/ConnectWalletFeature/BackgroundLinearGradient.swift

@@ -9,18 +9,11 @@ import Foundation
 import SwiftUI
 
 struct BackgroundLinearGradient: View {
-  @Environment(\.colorScheme) var colorScheme
-
   var body: some View {
     LinearGradient(
-      stops: colorScheme == .light
-        ? [
-          Gradient.Stop(color: Color.hex(0xA4A8FF), location: 0.50),
-          Gradient.Stop(color: Color.hex(0xFFA4E0), location: 1.00)
-        ]
-        : [
-            Gradient.Stop(color: Color(red: 0.08, green: 0.08, blue: 0.09), location: 0.00),
-            Gradient.Stop(color: Color(red: 0.08, green: 0.08, blue: 0.09).opacity(0.7), location: 1.00)
+        stops: [
+            Gradient.Stop(color: .connectWalletGradient1, location: 0.50),
+            Gradient.Stop(color: .connectWalletGradient2, location: 1)
         ],
       startPoint: UnitPoint(x: 1, y: 0),
       endPoint: UnitPoint(x: 0, y: 1)

Packages/Sources/ConnectWalletFeature/ConnectWalletFeature.swift

@@ -100,8 +100,6 @@ extension BindingViewStore<ConnectWalletReducer.State> {
 public struct ConnectWalletView: View {
   var store: StoreOf<ConnectWalletReducer>
 
-  @Environment(\.colorScheme) var colorScheme
-
   public init(store: StoreOf<ConnectWalletReducer>) {
     self.store = store
   }
@@ -133,7 +131,7 @@ public struct ConnectWalletView: View {
           Text("Connect Wallet", bundle: .module)
             .multilineTextAlignment(.center)
             .font(Font(FontName.poppinsBold, size: 24))
-            .foregroundStyle(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+            .foregroundStyle(Color.neutral2)
 
           Spacer()
 
@@ -192,26 +190,27 @@ extension View {
 }
 
 struct PopUpModifier: ViewModifier {
-
   let isPresented: Bool
   let confirmAction: () -> Void
   let cancelAction: () -> Void
   @Environment(\.colorScheme) var colorScheme
+
   func body(content: Content) -> some View {
     ZStack {
       content
         .zIndex(0)
 
       if isPresented {
-        Color.neutral1.opacity(0.7)
+          Color.neutral1
+              .opacity(colorScheme == .dark ? 0.75 : 0.5)
           .ignoresSafeArea()
           .transition(.opacity.animation(.easeInOut))
           .zIndex(1)
 
         VStack {
           Text("This page will open another application.", bundle: .module)
             .multilineTextAlignment(.center)
-            .foregroundStyle(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+            .foregroundStyle(Color.neutral2)
             .font(Font(FontName.poppinsRegular, size: 12))
             .padding(.bottom, 20)
 
@@ -225,7 +224,7 @@ struct PopUpModifier: ViewModifier {
           )
           .clipShape(Capsule())
           .buttonStyle(.borderedProminent)
-          .foregroundStyle(Color.neutral8)
+          .foregroundStyle(.white)
           .tint(Color.primary1)
           .frame(minHeight: 40)
 
@@ -251,7 +250,7 @@ struct PopUpModifier: ViewModifier {
         .padding(20)
         .frame(width: 270)
         .background(
-          (colorScheme == .light ? Color.neutral8 : Color.neutral2)
+          Color.neutral8
             .clipShape(RoundedRectangle(cornerRadius: 32))
         )
         .animation(.easeInOut, value: self.isPresented)

Packages/Sources/ConnectWalletFeature/ConnectingWalletView.swift

@@ -9,8 +9,6 @@ import SwiftUI
 import StyleGuide
 
 public struct ConnectingWalletView: View {
-    @Environment (\.colorScheme) var colorScheme
-
     let selectedWallet: WalletType
     let cancelPressed: () -> Void
 
@@ -34,11 +32,11 @@ public struct ConnectingWalletView: View {
 
                 HStack(spacing: 8) {
                     ProgressView()
-                        .tint(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+                        .tint(Color.neutral2)
 
                     Text("Opening \(selectedWallet.rawValue)")
                         .font(Font.init(FontName.poppinsRegular, size: 14))
-                        .foregroundStyle(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+                        .foregroundStyle(Color.neutral2)
                 }
             }
         }
@@ -54,7 +52,6 @@ public struct ConnectingWalletView: View {
 
 struct CancelButton: View {
     let action: () -> Void
-    @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
         Button(action: { action() }) {
@@ -63,8 +60,7 @@ struct CancelButton: View {
         }
         .foregroundStyle(Color.neutral2)
         .buttonStyle(.borderedProminent)
-        .tint(colorScheme == .light ? Color.neutral6 : Color.neutral8
-        )
+        .tint(Color.neutral6)
         .clipShape(Capsule())
     }
 }

Packages/Sources/ConnectWalletFeature/LabelsView.swift

@@ -10,9 +10,6 @@ import SwiftUI
 import StyleGuide
 
 struct LabelsView: View {
-
-  @Environment(\.colorScheme) var colorScheme
-
   var message1: AttributedString {
     var result = AttributedString(
       String(localized: "By connecting your wallet, you agree to our", bundle: .module))
@@ -25,22 +22,22 @@ struct LabelsView: View {
     var result = AttributedString(String(localized: "Terms of Service", bundle: .module))
     result.link = URL(string: "https://stackoverflow.com")
     result.font = Font(FontName.poppinsRegular, size: 12)
-      result.foregroundColor = colorScheme == .light ? Color.neutral3 : Color.neutral6
+      result.foregroundColor = Color.neutral3
     return result
   }
 
   var message3: AttributedString {
     var result = AttributedString(String(localized: "and our", bundle: .module))
     result.font = Font(FontName.poppinsRegular, size: 12)
-      result.foregroundColor =   Color.neutral4
+      result.foregroundColor =  Color.neutral4
     return result
   }
 
   var message4: AttributedString {
     var result = AttributedString(String(localized: "Privacy and Policy", bundle: .module))
     result.link = URL(string: "https://google.com")
     result.font = Font(FontName.poppinsRegular, size: 12)
-      result.foregroundColor = colorScheme == .light ? Color.neutral3 : Color.neutral6
+      result.foregroundColor = Color.neutral3
     return result
   }
 

Packages/Sources/ConnectWalletFeature/ListView.swift

@@ -10,40 +10,39 @@ import SwiftUI
 import StyleGuide
 
 public struct ListView: View {
-
   let didSelectButton: (WalletType) -> Void
-    @Environment(\.colorScheme) var  colorScheme
+
   init(didSelectButton: @escaping (WalletType) -> Void) {
     self.didSelectButton = didSelectButton
   }
 
   public var body: some View {
     RoundedRectangle(cornerRadius: 32)
-      .foregroundStyle(colorScheme == .light ? .white.opacity(0.6) : Color.neutral3)
+      .foregroundStyle(Color.neutral8)
       .overlay(
         VStack {
           Text("Choose your wallet", bundle: .module)
-             .foregroundStyle(  colorScheme == .light ? Color.neutral2 : .neutral8)
+             .foregroundStyle(Color.neutral2)
             .font(Font(FontName.poppinsRegular, size: 16))
 
           LabelsView()
 
           ScrollView {
 
             VStack(spacing: 8) {
-              ListLabel(
+              WalletListRow(
                 title: "Rainbow",
                 walletType: .rainbow,
                 didSelectButton: didSelectButton(.rainbow)
               )
 
-              ListLabel(
+              WalletListRow(
                 title: "Coinbase",
                 walletType: .coinbase,
                 didSelectButton: didSelectButton(.coinbase)
               )
 
-              ListLabel(
+              WalletListRow(
                 title: "Metamasak",
                 walletType: .metamask,
                 didSelectButton: didSelectButton(.metamask)

Packages/Sources/ConnectWalletFeature/ListLabel.swift → Packages/Sources/ConnectWalletFeature/WalletListRow.swift

@@ -9,12 +9,11 @@ import Foundation
 import SwiftUI
 import StyleGuide
 
-struct ListLabel: View {
-
+struct WalletListRow: View {
   let title: LocalizedStringKey
   let walletType: WalletType
   let didSelectButton: () -> Void
-    @Environment(\.colorScheme) var  colorScheme
+
   init(
     title: LocalizedStringKey,
     walletType: WalletType,
@@ -35,20 +34,18 @@ struct ListLabel: View {
             title: {
               Text(title, bundle: .module)
                 .font(Font(FontName.poppinsBold, size: 18))
-                .foregroundStyle(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+                .foregroundStyle(Color.neutral2)
             },
             icon: { Image(walletType.rawValue, bundle: .module) }
           )
           Spacer()
-          Image(systemName: "chevron.right")
-                .foregroundStyle(colorScheme == .light ? Color.neutral2 : Color.neutral8)
+            Image(systemName: "chevron.right")
+                .foregroundStyle(Color.neutral2)
         }
-        .frame(maxWidth: .infinity)
       }
     )
-    .frame(height: 65)
-    .foregroundStyle(.white.opacity(0.0001), colorScheme == .light ? Color.white.opacity(1) : Color.hex(0xFCFCDD).opacity(0.1))
     .buttonStyle(.highlighted)
+    .foregroundStyle(Color.invisibleColor, Color.highlightedButtonSelected)
   }
 
 }

Packages/Sources/OnboardingFeature/Components/OnboardingStepper.swift

@@ -89,7 +89,6 @@ public struct OnboardingStepperReducer {
 }
 
 struct OnboardingStepper: View {
-    @Environment(\.colorScheme) var colorScheme
     let store: StoreOf<OnboardingStepperReducer>
     let disabledColor = Color.neutral5
 
@@ -124,7 +123,7 @@ struct OnboardingStepper: View {
                 )
             }
             .frame(width: 154, height: 64)
-            .background(colorScheme == .dark ? Color.neutral1 : Color.neutral8)
+            .background(Color.neutral8)
             .clipShape(RoundedRectangle(cornerRadius: 16))
         }
     }