Merge pull request openedx#363 from edx/discussions-ui-fixes

Discussions UI fixes
edx · Mar 25, 2024 · 2bc8c4f · 2bc8c4f
2 parents 6f1ec1b + d21a3bd
commit 2bc8c4f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/Core/Core/Extensions/UIApplicationExtension.swift b/Core/Core/Extensions/UIApplicationExtension.swift
@@ -53,12 +53,20 @@ extension UINavigationController {
             .font: Theme.UIFonts.titleMedium()
         ]
 
+        UISegmentedControl.appearance().setTitleTextAttributes(
+            [
+                .foregroundColor: Theme.Colors.textPrimary.uiColor(),
+                .font: Theme.UIFonts.labelLarge()
+            ],
+            for: .normal
+        )
         UISegmentedControl.appearance().setTitleTextAttributes(
             [
                 .foregroundColor: Theme.Colors.primaryButtonTextColor.uiColor(),
                 .font: Theme.UIFonts.labelLarge()
             ],
-            for: .normal)
+            for: .selected
+        )
         UISegmentedControl.appearance().selectedSegmentTintColor = UIColor(Theme.Colors.accentXColor)
 
         UIView.appearance(whenContainedInInstancesOf: [UIAlertController.self]).tintColor = Theme.UIColors.accentXColor

diff --git a/Core/Core/View/Base/ProgressBar.swift b/Core/Core/View/Base/ProgressBar.swift
@@ -50,9 +50,7 @@ public struct ProgressBar: View {
                 .animation(animation, value: isAnimating)
         }
         .onAppear {
-            withAnimation {
-                isAnimating = true
-            }
+            isAnimating = true
         }
     }
 }

diff --git a/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift b/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift
@@ -34,9 +34,6 @@ public struct CreateNewThreadView: View {
         self.onPostCreated = onPostCreated
         self.courseID = courseID
         viewModel.selectedTopic = selectedTopic
-        Task {
-            await viewModel.getTopics(courseID: courseID)
-        }
     }
 
     public var body: some View {
@@ -198,6 +195,9 @@ public struct CreateNewThreadView: View {
                 Theme.Colors.background
                     .ignoresSafeArea()
             )
+            .task {
+                await viewModel.getTopics(courseID: courseID)
+            }
         }
     }
 }

diff --git a/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadViewModel.swift b/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadViewModel.swift
@@ -40,6 +40,7 @@ public class CreateNewThreadViewModel: ObservableObject {
 
     @MainActor
     public func getTopics(courseID: String) async {
+        guard allTopics.isEmpty else { return }
         isShowProgress = true
         do {
             topics = try await interactor.getTopics(courseID: courseID)

diff --git a/Discussion/Discussion/Presentation/Posts/PostsView.swift b/Discussion/Discussion/Presentation/Posts/PostsView.swift
@@ -13,7 +13,6 @@ import Theme
 public struct PostsView: View {
 
     @ObservedObject private var viewModel: PostsViewModel
-    @State private var isShowProgress: Bool = true
     @State private var showingAlert = false
     private let router: DiscussionRouter
     private let title: String