fix: PR feedback

Infomaniak · Feb 10, 2025 · a427b93 · a427b93
1 parent 603611d
commit a427b93
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 9 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "dd47893907886c9f81f7bc3c364403f24307b057d2119120d2c533d62a65a638",
+  "originHash" : "d19aa5b5b3f1772f9c20a559b858c66d93920baae5fd7d7a4317bceba4d7c0b7",
   "pins" : [
     {
       "identity" : "alamofire",
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-core-ui",
       "state" : {
-        "revision" : "3c36b8c376dd8779b47a5b03acfbe71ed270282a",
-        "version" : "18.0.0"
+        "revision" : "89873aff2c300f9f2966340b7b3e8832e88a95a6",
+        "version" : "18.0.1"
       }
     },
     {

diff --git a/Sources/MyKSuite/Generated/Resources+Generated.swift b/Sources/MyKSuite/Generated/Resources+Generated.swift
@@ -46,6 +46,7 @@ public enum Resources {
     public static let gradientColor5 = ColorAsset(name: "gradient.color.5")
     public static let bat = ColorAsset(name: "bat")
     public static let elephant = ColorAsset(name: "elephant")
+    public static let mouse = ColorAsset(name: "mouse")
     public static let orca = ColorAsset(name: "orca")
     public static let polarBear = ColorAsset(name: "polar.bear")
     public static let productDrive = ColorAsset(name: "product.drive")

diff --git a/Sources/MyKSuite/Resources/Colors.xcassets/mouse.colorset/Contents.json b/Sources/MyKSuite/Resources/Colors.xcassets/mouse.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE0",
+          "green" : "0xE0",
+          "red" : "0xE0"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sources/MyKSuite/Sources/Dashboard/FreeTrialView.swift b/Sources/MyKSuite/Sources/Dashboard/FreeTrialView.swift
@@ -30,7 +30,7 @@ struct FreeTrialView: View {
                 Resources.Assets.myKSuitePlusLogo.swiftUIImage
                     .resizable()
                     .scaledToFit()
-                    .frame(width: 90)
+                    .frame(maxWidth: 90)
 
                 Spacer()
 

diff --git a/Sources/MyKSuite/Sources/Dashboard/SubscriptionCardView.swift b/Sources/MyKSuite/Sources/Dashboard/SubscriptionCardView.swift
@@ -29,10 +29,12 @@ struct SubscriptionCardView: View {
             HeaderView(myKSuite: myKSuite, avatar: avatar)
 
             Divider()
+                .overlay(ColorHelper.divider)
 
             SubscriptionProductsView(myKSuite: myKSuite)
 
             Divider()
+                .overlay(ColorHelper.divider)
 
             if myKSuite.isFree {
                 SubscriptionFreeDetailsView(dailyLimit: myKSuite.mail.dailyLimitSent)

diff --git a/Sources/MyKSuite/Sources/Dashboard/SubscriptionFreeDetailsView.swift b/Sources/MyKSuite/Sources/Dashboard/SubscriptionFreeDetailsView.swift
@@ -24,17 +24,18 @@ struct SubscriptionFreeDetailsView: View {
     let dailyLimit: Int
 
     var body: some View {
-        VStack(alignment: .leading, spacing: IKPadding.large) {
+        VStack(alignment: .leading, spacing: IKPadding.mini) {
             Label {
                 Text(MyKSuiteLocalizable.myKSuiteDashboardFreeMailLabel)
             } icon: {
                 Image(systemName: "envelope")
                     .iconSize(.medium)
                     .foregroundStyle(ColorHelper.secondary)
             }
+            .padding(.vertical, value: .mini)
 
             DisclosureGroup {
-                VStack(alignment: .leading, spacing: 8) {
+                VStack(alignment: .leading, spacing: IKPadding.mini) {
                     Text(MyKSuiteLocalizable.myKSuiteDashboardFunctionalityMailAndDrive)
                     HStack {
                         Text(MyKSuiteLocalizable.myKSuiteDashboardFunctionalityLimit)
@@ -46,7 +47,7 @@ struct SubscriptionFreeDetailsView: View {
                     }
                     Text(MyKSuiteLocalizable.myKSuiteDashboardFunctionalityCustomReminders)
                 }
-                .padding(.top, 18)
+                .padding(.top, value: .mini)
                 .foregroundStyle(ColorHelper.secondary)
                 .font(FontHelper.bodySmall)
             } label: {
@@ -57,6 +58,7 @@ struct SubscriptionFreeDetailsView: View {
                         .iconSize(.medium)
                         .foregroundStyle(ColorHelper.secondary)
                 }
+                .padding(.vertical, value: .mini)
             }
         }
         .font(FontHelper.body)

diff --git a/Sources/MyKSuite/Sources/Dashboard/SubscriptionPlusDetailsView.swift b/Sources/MyKSuite/Sources/Dashboard/SubscriptionPlusDetailsView.swift
@@ -36,14 +36,20 @@ struct SubscriptionPlusDetailsView: View {
                 }
             }
 
-            HStack(alignment: .top, spacing: IKPadding.small) {
+            HStack(alignment: .iconAndMultilineTextAlignment, spacing: IKPadding.small) {
                 Resources.Assets.information.swiftUIImage
                     .iconSize(.medium)
                     .foregroundStyle(ColorHelper.secondary)
+                    .alignmentGuide(.iconAndMultilineTextAlignment) { d in
+                        d[VerticalAlignment.center]
+                    }
 
                 VStack(alignment: .leading, spacing: IKPadding.medium) {
                     Text(MyKSuiteLocalizable.myKSuiteManageSubscriptionDescription)
                         .foregroundStyle(ColorHelper.primary)
+                        .alignmentGuide(.iconAndMultilineTextAlignment) { d in
+                            (d.height - (d[.lastTextBaseline] - d[.firstTextBaseline])) / 2
+                        }
 
                     Button {
                         // Gerer mon abonnement

diff --git a/Sources/MyKSuite/Sources/Networking/MyKSuite.swift b/Sources/MyKSuite/Sources/Networking/MyKSuite.swift
@@ -18,7 +18,6 @@
 
 import SwiftUI
 
-@MainActor
 public struct MyKSuite: Codable, Sendable {
     let id: Int
     let isFree: Bool

diff --git a/Sources/MyKSuite/Sources/Utils/ColorHelper.swift b/Sources/MyKSuite/Sources/Utils/ColorHelper.swift
@@ -30,6 +30,8 @@ enum ColorHelper {
 
     static let reversedPrimary = Color(light: Resources.Colors.rabbit.swiftUIColor, dark: Resources.Colors.orca.swiftUIColor)
 
+    static let divider = Color(light: Resources.Colors.mouse.swiftUIColor, dark: Resources.Colors.elephant.swiftUIColor)
+
     // MARK: - Gradient
 
     static let gradientColor1 = Color("gradient.color.1", bundle: .module)