🔀️ Merge branch 'release/LekaApp/1.8.1'

ladislas · ladislas · commit 45433d838bf9 · 2024-07-02T17:31:12.000+02:00
diff --git a/Apps/LekaApp/Project.swift b/Apps/LekaApp/Project.swift
@@ -13,7 +13,7 @@ let kLekaAppVersion: String = {
     }
 
     // ? App version
-    return "1.8.0"
+    return "1.8.1"
 }()
 
 let project = Project.app(
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_counting_candies-215DCF9CCB7B4E36A73273DC42D848E9/curriculum_counting_candies-215DCF9CCB7B4E36A73273DC42D848E9.curriculum.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_counting_candies-215DCF9CCB7B4E36A73273DC42D848E9/curriculum_counting_candies-215DCF9CCB7B4E36A73273DC42D848E9.curriculum.yml
@@ -8,7 +8,7 @@ name: curriculum_counting_candies
 status: published
 
 created_at: "2024-03-21T15:12:35.579066"
-last_edited_at: "2024-07-01T14:21:25.779345"
+last_edited_at: "2024-07-02T17:02:03.192135"
 authors:
   - leka
 
@@ -51,3 +51,4 @@ l10n:
 
 activities:
   - counting_candies_from_1_to_5-1A3097D58288406EB4835812663D3376
+  - counting_candies_from_5_to_10-1BD7331BDF0D4319B7E71AA64A16A638
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_1_image-69283AFFE9F24D73A99F22F46D9D28D3.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_1_image-69283AFFE9F24D73A99F22F46D9D28D3.activity.yml
@@ -8,7 +8,7 @@ uuid: 69283AFFE9F24D73A99F22F46D9D28D3
 name: recognition_sports_drawings_1_image
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005058"
+last_edited_at: "2024-07-02T17:02:00.505901"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 1 image
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_2_images-DF4A9657809D4435916A82A8314D2E4A.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_2_images-DF4A9657809D4435916A82A8314D2E4A.activity.yml
@@ -8,7 +8,7 @@ uuid: DF4A9657809D4435916A82A8314D2E4A
 name: recognition_sports_drawings_2_images
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005058"
+last_edited_at: "2024-07-02T17:02:00.505901"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 2 images
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_3_images-2AFAF1C1D3ED4602A9BBB8B06E51D59D.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_3_images-2AFAF1C1D3ED4602A9BBB8B06E51D59D.activity.yml
@@ -8,7 +8,7 @@ uuid: 2AFAF1C1D3ED4602A9BBB8B06E51D59D
 name: recognition_sports_drawings_3_images
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005058"
+last_edited_at: "2024-07-02T17:02:00.505901"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 3 images
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_4_images-55ECB1EFFAA3466CA1704BCFE7AC371E.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_4_images-55ECB1EFFAA3466CA1704BCFE7AC371E.activity.yml
@@ -8,7 +8,7 @@ uuid: 55ECB1EFFAA3466CA1704BCFE7AC371E
 name: recognition_sports_drawings_4_images
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005380"
+last_edited_at: "2024-07-02T17:02:00.505903"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 4 images
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_5_images-659278115279467190B097830E94F250.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_5_images-659278115279467190B097830E94F250.activity.yml
@@ -8,7 +8,7 @@ uuid: 659278115279467190B097830E94F250
 name: recognition_sports_drawings_5_images
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005380"
+last_edited_at: "2024-07-02T17:02:00.505903"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 5 images
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_6_images-D9A7EC7FDFA5478596A36015A03F4D5E.activity.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/activities/recognition_sports_drawings_6_images-D9A7EC7FDFA5478596A36015A03F4D5E.activity.yml
@@ -8,7 +8,7 @@ uuid: D9A7EC7FDFA5478596A36015A03F4D5E
 name: recognition_sports_drawings_6_images
 
 created_at: "2024-03-04T18:07:12.519229"
-last_edited_at: "2024-06-28T12:58:46.005058"
+last_edited_at: "2024-07-02T17:02:00.505901"
 status: published
 
 authors:
@@ -36,7 +36,7 @@ l10n:
     details:
       icon: recognition_sports_touch
 
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: 6 images
 
       short_description: |
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE.curriculum.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE/curriculum_recognition_sports-C7F3963541234712A2701C0EB9E2EEAE.curriculum.yml
@@ -8,7 +8,7 @@ name: curriculum_recognition_sports
 status: published
 
 created_at: "2024-03-21T15:12:35.579066"
-last_edited_at: "2024-06-28T13:27:40.504918"
+last_edited_at: "2024-07-02T17:02:03.192135"
 authors:
   - leka
 
@@ -30,7 +30,7 @@ l10n:
   - locale: fr_FR
     details:
       icon: recognition_sports_touch
-      title: Sports en dessins
+      title: Les sports en dessins
       subtitle: Identifier les sports
       abstract: |
         Ce curriculum vise à développer la reconnaissance des sports à travers des représentations dessinées.
diff --git a/Modules/ContentKit/Resources/Content/curriculums/curriculum_sort_objects_by_location-CC406024F40C4834A66BB7C8F0E8C0AD/curriculum_sort_objects_by_location-CC406024F40C4834A66BB7C8F0E8C0AD.curriculum.yml b/Modules/ContentKit/Resources/Content/curriculums/curriculum_sort_objects_by_location-CC406024F40C4834A66BB7C8F0E8C0AD/curriculum_sort_objects_by_location-CC406024F40C4834A66BB7C8F0E8C0AD.curriculum.yml
@@ -8,7 +8,7 @@ name: curriculum_sort_objects_by_location
 status: published
 
 created_at: "2024-03-21T15:12:35.579066"
-last_edited_at: "2024-06-28T13:43:13.793797"
+last_edited_at: "2024-07-02T17:02:03.192135"
 authors:
   - leka
 
@@ -31,26 +31,26 @@ l10n:
   - locale: fr_FR
     details:
       icon: recognition_public_places_drag
-      title: Reconnaitre des lieux publics
-      subtitle: En les plaçant dans un panier
+      title: Trier des objets par lieux
+      subtitle: Organiser les objets par endroit
       abstract: |
-        Concentré sur le tri et l'appariement, ce curriculum utilise des fruits et légumes pour développer la reconnaissance et la classification, enrichissant l'interaction avec le monde naturel.
+        Centré sur le tri et l'appariement, ce curriculum utilise différents objets pour améliorer la reconnaissance et la classification, enrichissant l'interaction avec l'environnement.
       description: |
-        Ce curriculum renforce la reconnaissance et le tri des fruits et légumes, guidant les participants à travers une aventure éducative. Ils exploreront la diversité et l'importance de ces aliments.
+        Ce curriculum renforce la reconnaissance et le tri des objets en fonction de leur lieu, guidant les participants à travers une aventure éducative. Ils exploreront la diversité et l'importance de ces objets.
 
-        À travers des activités variées, les participants affinent leurs compétences d'observation et apprennent à distinguer et reconnaître les caractéristiques uniques des différents types de fruits et légumes.
+        À travers des activités variées, les participants affinent leurs compétences d'observation et apprennent à distinguer et reconnaître les caractéristiques uniques des différents types d'objets en fonction de leur emplacement.
 
   - locale: en_US
     details:
       icon: recognition_public_places_drag
-      title: Sorting fruits and vegetables
-      subtitle: By placing them in a basket
+      title: Sorting objects by location
+      subtitle: Organizing objects by place
       abstract: |
-        Focused on sorting and matching, this curriculum leverages fruits and vegetables to enhance recognition and classification, enriching interaction with the natural world.
+        Focused on sorting and matching, this curriculum leverages different objects to enhance recognition and classification, enriching interaction with the environment.
       description: |
-        This curriculum enhances the recognition and sorting of fruits and vegetables, taking participants on an educational journey. They will explore the diversity and importance of these foods.
+        This curriculum enhances the recognition and sorting of objects based on their location, taking participants on an educational journey. They will explore the diversity and importance of these objects.
 
-        Through a variety of activities, participants refine their observation skills and learn to distinguish and recognize the unique characteristics of different types of fruits and vegetables.
+        Through a variety of activities, participants refine their observation skills and learn to distinguish and recognize the unique characteristics of different types of objects based on their location.
 
 activities:
   - sort_objects_by_location_1_zone_1_choice-03347E31BA8745E5A2A078F7F261CCB9
diff --git a/Modules/ContentKit/Sources/ContentKit.swift b/Modules/ContentKit/Sources/ContentKit.swift
@@ -28,9 +28,9 @@ public enum ContentKit {
         let bundle = Bundle.module
         var files: [String] = []
 
-        files.append(contentsOf: bundle.paths(forResourcesOfType: "png", inDirectory: nil))
-        files.append(contentsOf: bundle.paths(forResourcesOfType: "jpg", inDirectory: nil))
-        files.append(contentsOf: bundle.paths(forResourcesOfType: "jpeg", inDirectory: nil))
+        files.append(contentsOf: bundle.filenamesWithoutExtensions(forResourcesOfType: "png", inDirectory: nil))
+        files.append(contentsOf: bundle.filenamesWithoutExtensions(forResourcesOfType: "jpg", inDirectory: nil))
+        files.append(contentsOf: bundle.filenamesWithoutExtensions(forResourcesOfType: "jpeg", inDirectory: nil))
 
         return files.sorted()
     }
@@ -39,7 +39,7 @@ public enum ContentKit {
         let bundle = Bundle.module
         var files: [String] = []
 
-        files.append(contentsOf: bundle.paths(forResourcesOfType: "svg", inDirectory: nil))
+        files.append(contentsOf: bundle.filenamesWithoutExtensions(forResourcesOfType: "svg", inDirectory: nil))
 
         return files.sorted()
     }
diff --git a/Modules/GameEngineKit/Sources/Exercises/Touch/ChoiceImageView.swift b/Modules/GameEngineKit/Sources/Exercises/Touch/ChoiceImageView.swift
@@ -15,7 +15,8 @@ public struct ChoiceImageView: View {
 
     public init(image: String, size: CGFloat, background: Color? = nil, state: GameplayChoiceState = .idle) {
         guard let image = Bundle.path(forImage: image) else {
-            fatalError("Image not found")
+            log.error("Image not found: \(image)")
+            fatalError("💥️ Image not found: \(image)")
         }
         self.image = image
         self.size = size
diff --git a/Modules/UtilsKit/Sources/Extensions/Bundle+Extension.swift b/Modules/UtilsKit/Sources/Extensions/Bundle+Extension.swift
@@ -0,0 +1,12 @@
+// Leka - iOS Monorepo
+// Copyright APF France handicap
+// SPDX-License-Identifier: Apache-2.0
+
+import Foundation
+
+public extension Bundle {
+    func filenamesWithoutExtensions(forResourcesOfType: String, inDirectory: String?) -> [String] {
+        let paths = paths(forResourcesOfType: forResourcesOfType, inDirectory: inDirectory)
+        return paths.map(\.filenameWithoutExtension)
+    }
+}
diff --git a/Modules/UtilsKit/Sources/Extensions/String+Extension.swift b/Modules/UtilsKit/Sources/Extensions/String+Extension.swift
@@ -30,6 +30,10 @@ public extension String {
         self.fileURL.lastPathComponent
     }
 
+    var filenameWithoutExtension: String {
+        (self.lastPathComponent as NSString).deletingPathExtension
+    }
+
     func containsEmoji() -> Bool {
         contains { $0.isEmoji }
     }
diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved
diff --git a/Tuist/Package.swift b/Tuist/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/gonzalezreal/swift-markdown-ui",
-            exact: "2.3.0"
+            exact: "2.3.1"
         ),
         .package(
             url: "https://github.com/apple/swift-argument-parser",
@@ -40,27 +40,27 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/apple/swift-log",
-            exact: "1.5.4"
+            exact: "1.6.1"
         ),
         .package(
             url: "https://github.com/mxcl/Version",
             exact: "2.0.1"
         ),
         .package(
             url: "https://github.com/firebase/firebase-ios-sdk",
-            exact: "10.27.0"
+            exact: "10.28.1"
         ),
         .package(
             url: "https://github.com/OlehKorchytskyi/Fit",
-            exact: "1.0.1"
+            exact: "1.0.2"
         ),
         .package(
             url: "https://github.com/exyte/SVGView",
             exact: "1.0.6"
         ),
         .package(
             url: "https://github.com/devicekit/DeviceKit",
-            exact: "5.3.0"
+            exact: "5.4.0"
         ),
         .package(
             url: "https://github.com/SvenTiigi/YouTubePlayerKit",
diff --git a/fastlane/release/LekaApp/metadata/en-US/release_notes.txt b/fastlane/release/LekaApp/metadata/en-US/release_notes.txt
@@ -7,3 +7,4 @@
 ### Bug Fixes
 
 - Localization Fixes: Resolved various localization issues in ContentKit and GEK.
+- New curriculums: Fix typos
diff --git a/fastlane/release/LekaApp/metadata/fr-FR/release_notes.txt b/fastlane/release/LekaApp/metadata/fr-FR/release_notes.txt
@@ -1,9 +1,10 @@
 ### Nouveaux Contenus & Fonctionnalités
 
-- Nouveaux Programmes: Introduction de nouveaux programmes, y compris la reconnaissance des sports et des professions, le tri des objets par emplacement et le comptage des bonbons.
+- Nouveaux Parcours: Introduction de nouveaux parcours, y compris la reconnaissance des sports et des professions, le tri des objets par emplacement et le comptage des bonbons.
 - Robot: Ajout de la possibilité d'afficher des images sur le robot et de rechercher les fichiers du robot par nom.
 - Améliorations du Gameplay: Ajout de nouvelles fonctionnalités de gameplay, y compris Find The Right Order et les vues DragAndDropInOrder.
 
 ### Corrections de Bugs
 
 - Corrections de Localisation: Résolution de divers problèmes de localisation dans ContentKit et GEK.
+- Nouveaux Parcours: Corrections des fautes de frappe

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ let kLekaAppVersion: String = {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// ? App version`
`16`		`- return "1.8.0"`
	`16`	`+ return "1.8.1"`
`17`	`17`	`}()`
`18`	`18`
`19`	`19`	`let project = Project.app(`