fix color changing on CourseUpdate view

openedx · Sep 20, 2023 · 5331d48 · 5331d48
1 parent 9e87918
commit 5331d48
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/Course/Course/Data/Model/Data_UpdatesResponse.swift b/Course/Course/Data/Model/Data_UpdatesResponse.swift
@@ -13,7 +13,7 @@ public extension DataLayer {
         public let id: Int
         public let date: String
         public let content: String
-        public let status: String
+        public let status: String?
     }
     typealias CourseUpdates = [CourseUpdate]
 }

diff --git a/Course/Course/Domain/Model/CourseUpdate.swift b/Course/Course/Domain/Model/CourseUpdate.swift
@@ -11,9 +11,9 @@ public struct CourseUpdate {
     public let id: Int
     public let date: String
     public var content: String
-    public let status: String
+    public let status: String?
 
-    public init(id: Int, date: String, content: String, status: String) {
+    public init(id: Int, date: String, content: String, status: String?) {
         self.id = id
         self.date = date
         self.content = content

diff --git a/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift b/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift
@@ -18,7 +18,6 @@ public struct HandoutsUpdatesDetailView: View {
     private var handouts: String?
     private var announcements: [CourseUpdate]?
     private let title: String
-    @State private var height: [Int: CGFloat] = [:]
 
     public init(
         handouts: String?,
@@ -100,12 +99,12 @@ public struct HandoutsUpdatesDetailView: View {
                                     type: .discovery,
                                     screenWidth: reader.size.width
                                 )
-                                HTMLFormattedText(
-                                    fixBrokenLinks(in: formattedAnnouncements),
-                                    isScrollEnabled: true,
-                                    textViewHeight: $height[index]
-                                )
-                                .frame(height: height[index])
+                                HStack {
+                                    HTMLFormattedText(formattedAnnouncements)
+                                    Spacer()
+                                }
+
+                                .id(UUID())
 
                                 if index != announcements.count - 1 {
                                     Divider()
@@ -122,13 +121,7 @@ public struct HandoutsUpdatesDetailView: View {
                         router.back()
                     }
                 Spacer(minLength: 84)
-
-//                    .background(
-//                        Theme.Colors.background
-//                            .ignoresSafeArea()
-//                    )
             }
-
         }
         .navigationBarHidden(false)
         .navigationBarBackButtonHidden(false)