🔀 Merge branch 'ladislas/feature/contentkit-activity-optional-subtitle'

leka · Feb 26, 2024 · 7aa1ee6 · 7aa1ee6
2 parents 8f023a1 + 06ced38
commit 7aa1ee6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Modules/ContentKit/Examples/ContentKitExample/Sources/ActivityDetailsView.swift b/Modules/ContentKit/Examples/ContentKitExample/Sources/ActivityDetailsView.swift
@@ -131,7 +131,7 @@ struct ActivityDetailsView: View {
             Section("Details (in: \(l10n.language.identifier))") {
                 Text(self.activity.details.title)
                     .font(.title)
-                Text(self.activity.details.subtitle)
+                Text(self.activity.details.subtitle ?? "no subtitle")
                     .font(.title2)
                 Markdown(self.activity.details.description)
                     .markdownTheme(.gitHub)

diff --git a/...ources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml b/...ources/Content/activities/examples/sample_6-2FE0B8BDD1B0497F87B32A390119DB98.activity.yml
@@ -43,7 +43,7 @@ l10n:
       icon: sample_6
 
       title: Activité d'exemple 6
-      subtitle: pour le développement
+      subtitle: null
 
       short_description: >
         Nunc Corinthiaci anilem, rerum primo et ambos fata? Et Drya aliis abest, *adeunt
@@ -74,7 +74,7 @@ l10n:
       icon: sample_6
 
       title: Sample activity 6
-      subtitle: for development
+      subtitle: null
 
       short_description: >
         Nunc Corinthiaci anilem, rerum primo et ambos fata? Et Drya aliis abest, *adeunt

diff --git a/Modules/ContentKit/Sources/Activity/Activity.swift b/Modules/ContentKit/Sources/Activity/Activity.swift
@@ -132,7 +132,7 @@ public extension Activity {
 
         public let icon: String
         public let title: String
-        public let subtitle: String
+        public let subtitle: String?
         public let shortDescription: String
         public let description: String
         public let instructions: String

diff --git a/Modules/GameEngineKit/Sources/Views/Activity/ActivityDetailsView.swift b/Modules/GameEngineKit/Sources/Views/Activity/ActivityDetailsView.swift
@@ -33,9 +33,11 @@ public struct ActivityDetailsView: View {
                                 .font(.largeTitle)
                                 .bold()
 
-                            Text(self.activity.details.subtitle)
-                                .font(.title2)
-                                .foregroundColor(.secondary)
+                            if let subtitle = self.activity.details.subtitle {
+                                Text(subtitle)
+                                    .font(.title2)
+                                    .foregroundColor(.secondary)
+                            }
 
                             Text(self.activity.details.shortDescription)
                                 .font(.subheadline)

diff --git a/Specs/jtd/activity.jtd.json b/Specs/jtd/activity.jtd.json
@@ -99,7 +99,8 @@
                     "type": "string"
                 },
                 "subtitle": {
-                    "type": "string"
+                    "type": "string",
+                    "nullable": true
                 },
                 "short_description": {
                     "type": "string"