🔀 Merge branch 'ladislas/feature/contentkit-add-skills-model'

leka · Feb 7, 2024 · 1f651e5 · 1f651e5
2 parents 4a267e3 + fa6e7ce
commit 1f651e5
Show file tree

Hide file tree

Showing 5 changed files with 350 additions and 186 deletions.
diff --git a/Modules/ContentKit/Examples/ContentKitExample/Resources/activity.yml b/Modules/ContentKit/Examples/ContentKitExample/Resources/activity.yml
@@ -12,9 +12,9 @@ authors:
   - aurore_kiesler
 
 skills:
-  - skill_one
-  - skill_two
-  - skill_three
+  - spatial_understanding
+  - recognition/animals
+  - communication/non_verbal_communication/gestures
 
 tags:
   - tag_one

diff --git a/Modules/ContentKit/Examples/ContentKitExample/Sources/MainView.swift b/Modules/ContentKit/Examples/ContentKitExample/Sources/MainView.swift
@@ -71,7 +71,15 @@ struct MainView: View {
 
                 DisclosureGroup("**Skills**") {
                     ForEach(self.activity?.skills ?? [], id: \.self) { skill in
-                        Text(skill)
+                        let skill = Skills.skill(id: skill)!
+                        HStack {
+                            Text(skill.name)
+                            Button {
+                                self.selectedSkill = skill
+                            } label: {
+                                Image(systemName: "info.circle")
+                            }
+                        }
                     }
                 }
 
@@ -93,14 +101,31 @@ struct MainView: View {
                     .markdownTheme(.leka)
             }
         }
+        .sheet(item: self.$selectedSkill, onDismiss: { self.selectedSkill = nil }, content: { skill in
+            VStack(alignment: .leading) {
+                Text(skill.name)
+                    .font(.headline)
+                Text(skill.description)
+            }
+        })
         .onAppear {
             self.activity = ContentKit.decodeActivity("activity")
             print(self.activity ?? "not working")
+
+            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)")
+            }
         }
     }
 
     // MARK: Private
 
+    @State private var selectedSkill: Skill?
+
     @State private var activity: Activity?
 }
 

diff --git a/Modules/ContentKit/Project.swift b/Modules/ContentKit/Project.swift
@@ -20,6 +20,7 @@ let project = Project.module(
     dependencies: [
         .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
         .project(target: "LogKit", path: Path("../../Modules/LogKit")),
+        .external(name: "Version"),
         .external(name: "Yams"),
     ]
 )