🔀️ Merge branch 'release/LekaApp/1.11.0'

Author: ladislas

.github/workflows/ci-fastlane-release_beta_internal.yml

@@ -18,7 +18,7 @@ on:
       - "Modules/ContentKit/**"
       - "Tuist/Package.swift"
       - "Tuist/Package.resolved"
-      - "fastlane/Fastfile" # TODO: (@ladislas) remove this line after test
+      - "!**/Examples/**/*.swift"
   workflow_dispatch: # nothing to setup here, just to trigger the workflow manually
 
 concurrency:

.github/workflows/ci-linter-license_checker.yml

@@ -25,10 +25,10 @@ jobs:
           lfs: false
 
       - name: Install deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
           deno-version: vx.x.x
 
       - name: Check licenses in all files
         run: |
-          deno run --allow-read https://deno.land/x/license_checker@v3.2.2/main.ts
+          deno run --allow-read jsr:@kt3k/license-checker@3.3.1/main

.pre-commit-config.yaml

@@ -6,12 +6,23 @@
 # ? See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
-      - id: trailing-whitespace
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: detect-private-key
       - id: end-of-file-fixer
         exclude_types: [json]
         exclude: '(.*\.xcstrings|\.xcassets|\.svg)'
+      - id: forbid-submodules
+      - id: mixed-line-ending
+      - id: no-commit-to-branch
+        args: [--branch, main, --branch, develop]
+      - id: trailing-whitespace
       - id: check-yaml
         exclude: exercise_templates.yml
       - id: check-json
@@ -23,18 +34,13 @@ repos:
         types: [file]
         files: \.(json|xcstrings)$
         exclude: '(\.vscode/settings\.json|\.jtd\.json$|.*\.xcassets/.*|.*\.colorset/.*|\.animation\.lottie\.json$)'
-      - id: check-added-large-files
-      - id: check-executables-have-shebangs
-      - id: check-shebang-scripts-are-executable
-      - id: detect-private-key
-      - id: forbid-submodules
-      - id: mixed-line-ending
 
   - repo: https://github.com/realm/SwiftLint
     rev: 0.57.0
     hooks:
       - id: swiftlint
         entry: swiftlint
+        args: ["--use-alternative-excluding"]
 
   - repo: https://github.com/nicklockwood/SwiftFormat
     rev: 0.54.5

.swiftlint.yml

@@ -64,7 +64,6 @@ disabled_rules:
   - closure_parameter_position
 
 excluded:
-  - Tuist/Dependencies
-  - ./*/Derived
+  - Tuist/.build
 
 reporter: "emoji"

Apps/LekaApp/Project.swift

@@ -13,7 +13,7 @@ let kLekaAppVersion: String = {
     }
 
     // ? App version
-    return "1.10.0"
+    return "1.11.0"
 }()
 
 let project = Project.app(

Apps/LekaApp/Resources/l10n/Localizable.xcstrings

@@ -686,6 +686,24 @@
                 }
             }
         },
+        "lekaapp.caregiver_creation.email_whitespaces_error_message": {
+            "comment": "Error message when whitespaces or linebreaks detected in email textfield",
+            "extractionState": "extracted_with_value",
+            "localizations": {
+                "en": {
+                    "stringUnit": {
+                        "state": "new",
+                        "value": "Email cannot contain spaces or line breaks"
+                    }
+                },
+                "fr": {
+                    "stringUnit": {
+                        "state": "translated",
+                        "value": "L\u2019e-mail ne doit pas contenir d\u2019espaces ou de sauts de ligne"
+                    }
+                }
+            }
+        },
         "lekaapp.caregiver_creation.profession_label": {
             "comment": "Caregiver creation profession label above profession selection button",
             "extractionState": "extracted_with_value",

Apps/LekaApp/Sources/Views/TextFields/TextFieldDefault.swift

@@ -8,6 +8,8 @@ import SwiftUI
 // MARK: - TextFieldDefault
 
 struct TextFieldDefault: View {
+    // MARK: Internal
+
     let label: String
     @Binding var entry: String
 
@@ -18,8 +20,18 @@ struct TextFieldDefault: View {
             TextField("", text: self.$entry)
                 .textFieldStyle(.roundedBorder)
                 .autocorrectionDisabled()
+                .focused(self.$focused)
+                .onChange(of: self.focused) { focused in
+                    if !focused {
+                        self.entry = self.entry.trimLeadingAndTrailingWhitespaces()
+                    }
+                }
         }
     }
+
+    // MARK: Private
+
+    @FocusState private var focused: Bool
 }
 
 #Preview {

Apps/LekaApp/Sources/Views/TextFields/TextFieldEmail.swift

@@ -40,8 +40,10 @@ struct TextFieldEmail: View {
                 .textInputAutocapitalization(.never)
                 .autocorrectionDisabled()
                 .focused(self.$focused)
-                .onChange(of: self.entry) { newValue in
-                    self.entry = newValue.trimmingCharacters(in: .whitespaces)
+                .onChange(of: self.focused) { focused in
+                    if !focused {
+                        self.entry = self.entry.trimLeadingAndTrailingWhitespaces()
+                    }
                 }
                 .overlay(
                     RoundedRectangle(cornerRadius: 8)

Apps/LekaApp/Sources/Views/TextFields/TextFieldPassword.swift

@@ -46,9 +46,6 @@ struct TextFieldPassword: View {
                 .textInputAutocapitalization(.never)
                 .autocorrectionDisabled()
                 .focused(self.$focused)
-                .onChange(of: self.entry) { newValue in
-                    self.entry = newValue.trimmingCharacters(in: .whitespaces)
-                }
                 .overlay(
                     RoundedRectangle(cornerRadius: 8)
                         .stroke(self.focused ? .blue : .clear, lineWidth: 1)

Apps/LekaApp/Sources/Views/Users/CareReceiver/CreateCarereceiverView.swift

@@ -71,6 +71,12 @@ struct CreateCarereceiverView: View {
                             .autocorrectionDisabled()
                             .multilineTextAlignment(.trailing)
                             .foregroundStyle(Color.secondary)
+                            .focused(self.$focused)
+                            .onChange(of: self.focused) { focused in
+                                if !focused {
+                                    self.newCarereceiver.username = self.newCarereceiver.username.trimLeadingAndTrailingWhitespaces()
+                                }
+                            }
                     }
                 }
 
@@ -114,6 +120,8 @@ struct CreateCarereceiverView: View {
     @State private var isCarereceiverCreated: Bool = false
     @StateObject private var viewModel = CreateCarereceiverViewModel()
 
+    @FocusState private var focused: Bool
+
     @State private var newCarereceiver = Carereceiver()
     @State private var isAvatarPickerPresented: Bool = false
     @State private var cancellables = Set<AnyCancellable>()