Fix Appearance (Light/Dark Mode) Issues of Course Smart Search (#3016)

refs: MBL-18169
affects: Student
release note: Improved dark mode support for Smart Search.

Author: suhaibabsi-inst

Core/Core/Contexts/Context.swift

@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import CoreData
 
 public enum ContextType: String, Codable {
     case account, course, group, user, section, folder
@@ -95,3 +96,16 @@ public extension Context {
         return context.id.localID == id.localID
     }
 }
+
+public extension Context {
+
+    func color(in client: NSManagedObjectContext) -> UIColor? {
+        contextColor(in: client)?.color
+    }
+
+    func contextColor(in client: NSManagedObjectContext) -> ContextColor? {
+        client.fetch(
+            scope: .where(#keyPath(ContextColor.canvasContextID), equals: canvasContextID)
+        ).first
+    }
+}

Core/Core/Courses/SmartSearch/View/CourseSearchResultRowView.swift

@@ -88,11 +88,11 @@ struct CourseSearchResultRowView: View {
     }
 
     private var accentColor: Color {
-        Color(uiColor: searchContext.accentColor ?? .textDarkest)
+        searchContext.accentColor?.asColor ?? .textDarkest
     }
 
     private var titleColor: Color {
-        let visitedColor = searchContext.accentColor ?? .textDarkest
-        return Color(uiColor: isVisited ? visitedColor : .textDarkest)
+        let visitedColor: Color = searchContext.accentColor?.asColor ?? .textDarkest
+        return isVisited ? visitedColor : .textDarkest
     }
 }

Core/Core/Courses/SmartSearch/View/CourseSmartSearchFilterEditorView.swift

@@ -126,7 +126,7 @@ public struct CourseSmartSearchFilterEditorView: View {
     }
 
     private var contextColor: Color {
-        return Color(uiColor: searchContext.accentColor ?? .textDarkest)
+        return searchContext.accentColor?.asColor ?? .textDarkest
     }
 }
 

Core/Core/Courses/SmartSearch/View/CourseSmartSearchHelpView.swift

@@ -110,7 +110,7 @@ public struct CourseSmartSearchHelpView: View {
     }
 
     private var contextColor: Color {
-        return Color(uiColor: searchContext.accentColor ?? .textDarkest)
+        return searchContext.accentColor?.asColor ?? .textDarkest
     }
 }
 

Core/Core/Extensions/UIColorExtensions.swift

@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import SwiftUI
 import UIKit
 
 extension UIColor {
@@ -204,4 +205,6 @@ extension UIColor {
         }
         return color
     }
+
+    public var asColor: Color { Color(self) }
 }

Core/Core/Search/View/SearchContentContainerView.swift

@@ -120,6 +120,6 @@ struct SearchContentContainerView<Attributes: SearchViewAttributes, ViewProvider
     }
 
     private var clearButtonColor: Color {
-        return searchContext.accentColor.flatMap({ Color(uiColor: $0) }) ?? .secondary
+        return searchContext.accentColor?.asColor ?? .secondary
     }
 }

Student/Student/Routes.swift

@@ -589,10 +589,11 @@ private func courseDetails(url: URLComponents, params: [String: String], userInf
 
     let regularCourseDetails: () -> UIViewController = {
         let viewModel = CourseDetailsViewModel(context: .course(courseID), offlineModeInteractor: OfflineModeAssembly.make())
+        let client = AppEnvironment.shared.database.viewContext
 
         return CourseSmartSearchAssembly.makeHostController(
             courseID: courseID,
-            color: url.contextColor,
+            color: context.color(in: client) ?? url.contextColor,
             containing: CourseDetailsView(viewModel: viewModel)
         )
     }