#92 Fix TimelineStyle targets

element-hq · Jun 24, 2022 · d7a7e02 · d7a7e02
1 parent d065cb3
commit d7a7e02
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 68 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
@@ -11,24 +11,4 @@ import Foundation
 enum TimelineStyle: String, CaseIterable {
     case plain
     case bubbled
-
-    var shortDescription: String {
-        switch self {
-        case .plain:
-            return ElementL10n.roomTimelineStylePlainShortDescription
-        case .bubbled:
-            return ElementL10n.roomTimelineStyleBubbledShortDescription
-        }
-    }
-}
-
-extension TimelineStyle: CustomStringConvertible {
-    var description: String {
-        switch self {
-        case .plain:
-            return ElementL10n.roomTimelineStylePlainLongDescription
-        case .bubbled:
-            return ElementL10n.roomTimelineStyleBubbledLongDescription
-        }
-    }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
@@ -22,7 +22,12 @@ class TimelineStyler: ObservableObject, Identifiable {
     static let bubbled = TimelineStyler(style: .bubbled)
 
     var shortDescription: String {
-        style.shortDescription
+        switch style {
+        case .plain:
+            return ElementL10n.roomTimelineStylePlainShortDescription
+        case .bubbled:
+            return ElementL10n.roomTimelineStyleBubbledShortDescription
+        }
     }
 
     @ViewBuilder
@@ -54,7 +59,12 @@ class TimelineStyler: ObservableObject, Identifiable {
 
 extension TimelineStyler: CustomStringConvertible {
     var description: String {
-        style.description
+        switch style {
+        case .plain:
+            return ElementL10n.roomTimelineStylePlainLongDescription
+        case .bubbled:
+            return ElementL10n.roomTimelineStyleBubbledLongDescription
+        }
     }
 }
 

diff --git a/ElementX/Sources/Screens/Settings/View/Settings.swift b/ElementX/Sources/Screens/Settings/View/Settings.swift
@@ -98,7 +98,7 @@ struct Settings: View {
                     HStack {
                         Text(ElementL10n.settingsTimelineStyle)
                         Spacer()
-                        Text(ElementSettings.shared.timelineStyle.shortDescription)
+                        Text(timelineStyler.shortDescription)
                         Image(systemName: "chevron.right")
                             .font(.body)
                     }

diff --git a/UITests/SupportingFiles/target.yml b/UITests/SupportingFiles/target.yml
@@ -41,4 +41,5 @@ targets:
     - path: ../SupportingFiles
     - path: ../../Tools/Scripts/Templates/SimpleScreenExample/Tests/UI
     - path: ../../ElementX/Sources/BuildSettings.swift
+    - path: ../../ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
     - path: ../../ElementX/Sources/UITestScreenIdentifier.swift
diff --git a/UnitTests/SupportingFiles/target.yml b/UnitTests/SupportingFiles/target.yml
@@ -24,3 +24,4 @@ targets:
     - path: ../../Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit
     - path: ../Resources
     - path: ../../ElementX/Sources/BuildSettings.swift
+    - path: ../../ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift