🔀️ Merge branch 'ladislas/feature/contentkit-move-back-activity-detai…

…ls-view'
leka · Mar 22, 2024 · 856b35b · 856b35b
2 parents 0205bd6 + 42488d7
commit 856b35b
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 111 deletions.
diff --git a/...Example/Sources/ActivityDetailsView.swift → ...itExample/Sources/ActivityDebugView.swift b/...Example/Sources/ActivityDetailsView.swift → ...itExample/Sources/ActivityDebugView.swift
@@ -37,9 +37,9 @@ struct RowView<T: StringProtocol>: View {
     }
 }
 
-// MARK: - ActivityDetailsView
+// MARK: - ActivityDebugView
 
-struct ActivityDetailsView: View {
+struct ActivityDebugView: View {
     // MARK: Internal
 
     let activity: Activity
@@ -153,6 +153,6 @@ struct ActivityDetailsView: View {
 
 #Preview {
     NavigationStack {
-        ActivityDetailsView(activity: Activity.mock)
+        ActivityDebugView(activity: Activity.mock)
     }
 }
diff --git a/Modules/ContentKit/Examples/ContentKitExample/Sources/ActivityListView.swift b/Modules/ContentKit/Examples/ContentKitExample/Sources/ActivityListView.swift
@@ -19,36 +19,20 @@ struct ActivityListView: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 44, height: 44)
-                    Text(activity.name)
+                    Text("\(activity.details.title)")
+                }
+                NavigationLink(destination: ActivityDebugView(activity: activity)) {
+                    Image(uiImage: activity.details.iconImage)
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 22, height: 22)
+                        .padding(.leading, 11)
+                    Text("\(activity.details.title) (DEBUG)")
+                        .font(.caption)
                 }
             }
         }
         .navigationTitle("Activities")
-        .onAppear {
-            let skills = Skills.list
-            for (index, skill) in skills.enumerated() {
-                print("skill \(index + 1)")
-                print("id: \(skill.id)")
-                print("name: \(skill.name)")
-                print("description: \(skill.description)")
-            }
-
-            let hmis = HMI.list
-            for (index, hmi) in hmis.enumerated() {
-                print("hmi \(index + 1)")
-                print("id: \(hmi.id)")
-                print("name: \(hmi.name)")
-                print("description: \(hmi.description)")
-            }
-
-            let authors = Authors.list
-            for (index, author) in authors.enumerated() {
-                print("author \(index + 1)")
-                print("id: \(author.id)")
-                print("name: \(author.name)")
-                print("description: \(author.description)")
-            }
-        }
     }
 }
 

diff --git a/Modules/ContentKit/Project.swift b/Modules/ContentKit/Project.swift
@@ -20,7 +20,10 @@ let project = Project.module(
     dependencies: [
         .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
         .project(target: "LogKit", path: Path("../../Modules/LogKit")),
+        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
         .external(name: "Version"),
         .external(name: "Yams"),
+        .external(name: "MarkdownUI"),
+        .external(name: "Fit"),
     ]
 )
diff --git a/Modules/ContentKit/Resources/Localizable.xcstrings b/Modules/ContentKit/Resources/Localizable.xcstrings
@@ -0,0 +1,78 @@
+{
+    "version": "1.0",
+    "sourceLanguage": "en",
+    "strings": {
+        "content_kit.activity_details_view.authors_section_title": {
+            "comment": "ActivityDetailsView 'authors' section title",
+            "extractionState": "extracted_with_value",
+            "localizations": {
+                "en": {
+                    "stringUnit": {
+                        "state": "new",
+                        "value": "Authors"
+                    }
+                },
+                "fr": {
+                    "stringUnit": {
+                        "state": "translated",
+                        "value": "Auteurs"
+                    }
+                }
+            }
+        },
+        "content_kit.activity_details_view.description_section_title": {
+            "comment": "ActivityDetailsView 'description' section title",
+            "extractionState": "extracted_with_value",
+            "localizations": {
+                "en": {
+                    "stringUnit": {
+                        "state": "new",
+                        "value": "Description"
+                    }
+                },
+                "fr": {
+                    "stringUnit": {
+                        "state": "translated",
+                        "value": "Description"
+                    }
+                }
+            }
+        },
+        "content_kit.activity_details_view.instructions_section_title": {
+            "comment": "ActivityDetailsView 'instructions' section title",
+            "extractionState": "extracted_with_value",
+            "localizations": {
+                "en": {
+                    "stringUnit": {
+                        "state": "new",
+                        "value": "Instructions"
+                    }
+                },
+                "fr": {
+                    "stringUnit": {
+                        "state": "translated",
+                        "value": "Instructions"
+                    }
+                }
+            }
+        },
+        "content_kit.activity_details_view.skills_section_title": {
+            "comment": "ActivityDetailsView 'skills' section title",
+            "extractionState": "extracted_with_value",
+            "localizations": {
+                "en": {
+                    "stringUnit": {
+                        "state": "new",
+                        "value": "Skills"
+                    }
+                },
+                "fr": {
+                    "stringUnit": {
+                        "state": "translated",
+                        "value": "Comp\u00e9tences"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/...ources/Extensions/Text+MarkdownInit.swift → ...ources/Extensions/Text+MarkdownInit.swift b/...ources/Extensions/Text+MarkdownInit.swift → ...ources/Extensions/Text+MarkdownInit.swift
@@ -4,6 +4,7 @@
 
 import SwiftUI
 
+// TODO: (@ladislas) move to UtilsKit
 public extension Text {
     init(markdown: String) {
         self.init(.init(markdown))

diff --git a/.../Views/Activity/ActivityDetailsView.swift → ...t/Sources/Views/ActivityDetailsView.swift b/.../Views/Activity/ActivityDetailsView.swift → ...t/Sources/Views/ActivityDetailsView.swift
@@ -2,7 +2,6 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-import ContentKit
 import DesignKit
 import Fit
 import LocalizationKit
@@ -118,23 +117,23 @@ public struct ActivityDetailsView: View {
 
 extension l10n {
     enum ActivityDetailsView {
-        static let skillsSectionTitle = LocalizedString("game_engine_kit.activity_details_view.skills_section_title",
-                                                        bundle: GameEngineKitResources.bundle,
+        static let skillsSectionTitle = LocalizedString("content_kit.activity_details_view.skills_section_title",
+                                                        bundle: ContentKitResources.bundle,
                                                         value: "Skills",
                                                         comment: "ActivityDetailsView 'skills' section title")
 
-        static let authorsSectionTitle = LocalizedString("game_engine_kit.activity_details_view.authors_section_title",
-                                                         bundle: GameEngineKitResources.bundle,
+        static let authorsSectionTitle = LocalizedString("content_kit.activity_details_view.authors_section_title",
+                                                         bundle: ContentKitResources.bundle,
                                                          value: "Authors",
                                                          comment: "ActivityDetailsView 'authors' section title")
 
-        static let descriptionSectionTitle = LocalizedString("game_engine_kit.activity_details_view.description_section_title",
-                                                             bundle: GameEngineKitResources.bundle,
+        static let descriptionSectionTitle = LocalizedString("content_kit.activity_details_view.description_section_title",
+                                                             bundle: ContentKitResources.bundle,
                                                              value: "Description",
                                                              comment: "ActivityDetailsView 'description' section title")
 
-        static let instructionsSectionTitle = LocalizedString("game_engine_kit.activity_details_view.instructions_section_title",
-                                                              bundle: GameEngineKitResources.bundle,
+        static let instructionsSectionTitle = LocalizedString("content_kit.activity_details_view.instructions_section_title",
+                                                              bundle: ContentKitResources.bundle,
                                                               value: "Instructions",
                                                               comment: "ActivityDetailsView 'instructions' section title")
     }

diff --git a/Modules/GameEngineKit/Project.swift b/Modules/GameEngineKit/Project.swift
@@ -21,7 +21,6 @@ let project = Project.module(
         .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
         .external(name: "SwiftUIJoystick"),
         .external(name: "AudioKit"),
-        .external(name: "Fit"),
         .external(name: "SVGView"),
     ]
 )
diff --git a/Modules/GameEngineKit/Resources/Localizable.xcstrings b/Modules/GameEngineKit/Resources/Localizable.xcstrings
@@ -38,78 +38,6 @@
                 }
             }
         },
-        "game_engine_kit.activity_details_view.authors_section_title": {
-            "comment": "ActivityDetailsView 'authors' section title",
-            "extractionState": "extracted_with_value",
-            "localizations": {
-                "en": {
-                    "stringUnit": {
-                        "state": "new",
-                        "value": "Authors"
-                    }
-                },
-                "fr": {
-                    "stringUnit": {
-                        "state": "translated",
-                        "value": "Auteurs"
-                    }
-                }
-            }
-        },
-        "game_engine_kit.activity_details_view.description_section_title": {
-            "comment": "ActivityDetailsView 'description' section title",
-            "extractionState": "extracted_with_value",
-            "localizations": {
-                "en": {
-                    "stringUnit": {
-                        "state": "new",
-                        "value": "Description"
-                    }
-                },
-                "fr": {
-                    "stringUnit": {
-                        "state": "translated",
-                        "value": "Description"
-                    }
-                }
-            }
-        },
-        "game_engine_kit.activity_details_view.instructions_section_title": {
-            "comment": "ActivityDetailsView 'instructions' section title",
-            "extractionState": "extracted_with_value",
-            "localizations": {
-                "en": {
-                    "stringUnit": {
-                        "state": "new",
-                        "value": "Instructions"
-                    }
-                },
-                "fr": {
-                    "stringUnit": {
-                        "state": "translated",
-                        "value": "Instructions"
-                    }
-                }
-            }
-        },
-        "game_engine_kit.activity_details_view.skills_section_title": {
-            "comment": "ActivityDetailsView 'skills' section title",
-            "extractionState": "extracted_with_value",
-            "localizations": {
-                "en": {
-                    "stringUnit": {
-                        "state": "new",
-                        "value": "Skills"
-                    }
-                },
-                "fr": {
-                    "stringUnit": {
-                        "state": "translated",
-                        "value": "Comp\u00e9tences"
-                    }
-                }
-            }
-        },
         "game_engine_kit.choice_emoji_view.emoji_error": {
             "comment": "ChoiceEmojiView emoji error ",
             "extractionState": "extracted_with_value",