♻️ (ContentKit): Move UIElementType to Exercise

leka · Nov 13, 2023 · 28922af · 28922af
1 parent 93a35f5
commit 28922af
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+DragAndDropAssociation.swift b/Modules/ContentKit/Sources/Exercise/Exercise+DragAndDropAssociation.swift
@@ -13,7 +13,7 @@ public enum DragAndDropAssociation {
 
     public struct Choice: Codable {
         public let value: String
-        public let type: UIElementType
+        public let type: Exercise.UIElementType
         public let catergory: Catergory?
     }
 

diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+DragAndDropIntoZones.swift b/Modules/ContentKit/Sources/Exercise/Exercise+DragAndDropIntoZones.swift
@@ -12,13 +12,13 @@ public enum DragAndDropIntoZones {
 
         public struct Details: Codable {
             public let value: String
-            public let type: UIElementType
+            public let type: Exercise.UIElementType
         }
     }
 
     public struct Choice: Codable {
         public let value: String
-        public let type: UIElementType
+        public let type: Exercise.UIElementType
         public let dropZone: DropZone?
     }
 

diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+TouchAssociation.swift b/Modules/ContentKit/Sources/Exercise/Exercise+TouchAssociation.swift
@@ -13,7 +13,7 @@ public enum TouchAssociation {
 
     public struct Choice: Codable {
         public let value: String
-        public let type: UIElementType
+        public let type: Exercise.UIElementType
         public let catergory: Catergory?
     }
 

diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+TouchSelection.swift b/Modules/ContentKit/Sources/Exercise/Exercise+TouchSelection.swift
@@ -8,7 +8,7 @@ public enum TouchSelection {
 
     public struct Choice: Codable {
         public let value: String
-        public let type: UIElementType
+        public let type: Exercise.UIElementType
         public let isRightAnswer: Bool
 
         private enum CodingKeys: String, CodingKey {
@@ -18,11 +18,11 @@ public enum TouchSelection {
         public init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             value = try container.decode(String.self, forKey: .value)
-            type = try container.decode(UIElementType.self, forKey: .type)
+            type = try container.decode(Exercise.UIElementType.self, forKey: .type)
             isRightAnswer = try container.decodeIfPresent(Bool.self, forKey: .isRightAnswer) ?? false
         }
 
-        public init(value: String, type: UIElementType, isRightAnswer: Bool = false) {
+        public init(value: String, type: Exercise.UIElementType, isRightAnswer: Bool = false) {
             self.value = value
             self.type = type
             self.isRightAnswer = isRightAnswer

diff --git a/Modules/ContentKit/Sources/Exercise/Exercise+UIElement.swift b/Modules/ContentKit/Sources/Exercise/Exercise+UIElement.swift
@@ -0,0 +1,15 @@
+// Leka - iOS Monorepo
+// Copyright 2023 APF France handicap
+// SPDX-License-Identifier: Apache-2.0
+
+import Foundation
+
+extension Exercise {
+
+    public enum UIElementType: String, Codable {
+        case image
+        case text
+        case color
+    }
+
+}
diff --git a/Modules/ContentKit/Sources/Exercise/Exercise.swift b/Modules/ContentKit/Sources/Exercise/Exercise.swift
@@ -28,8 +28,8 @@ public struct Exercise: Codable {
 
 }
 
-public enum UIElementType: String, Codable {
-    case image
-    case text
-    case color
-}
+//public enum UIElementType: String, Codable {
+//    case image
+//    case text
+//    case color
+//}