Horizon Core Changes #5 (#3517)

[ignore-commit-lint]
affects: Student, Teacher, Parent

Author: szabinst

Core/Core/Common/CommonModels/API/API.swift

@@ -119,6 +119,11 @@ public class API {
     -> APITask? {
         var request = URLRequest(url: url)
 
+        if AppEnvironment.shared.app == .horizon {
+            let token = AppEnvironment.shared.currentSession?.accessToken ?? ""
+            request.setValue("Bearer \(token)", forHTTPHeaderField: HttpHeader.authorization)
+        }
+
         if let method {
             request.httpMethod = method.rawValue.uppercased()
         }

Core/Core/Common/CommonModels/AppEnvironment/AppEnvironment.swift

@@ -21,6 +21,7 @@ import Combine
 import CoreData
 import SwiftUI
 import WidgetKit
+import WebKit
 
 public protocol AppEnvironmentDelegate {
     var environment: AppEnvironment { get }
@@ -52,6 +53,8 @@ open class AppEnvironment {
     public var lastLoginAccount: APIAccountResult?
     public let k5 = K5State()
     public weak var loginDelegate: LoginDelegate?
+    public var userDidLogin: (() -> Void)?
+
     public weak var window: UIWindow?
     open var isTest: Bool { false }
     private var subscriptions = Set<AnyCancellable>()
@@ -89,13 +92,15 @@ open class AppEnvironment {
         refreshWidgets()
         saveAccount(for: session)
 
-        Just(())
-            .receive(on: RunLoop.main)
-            .flatMap { CoreWebView.deleteAllCookies() }
-            .sink {
-                CoreWebView.refreshKeepAliveCookies()
-            }
-            .store(in: &subscriptions)
+        if AppEnvironment.shared.app != .horizon {
+            Just(())
+                .receive(on: RunLoop.main)
+                .flatMap { CoreWebView.deleteAllCookies() }
+                .sink {
+                    CoreWebView.refreshKeepAliveCookies()
+                }
+                .store(in: &subscriptions)
+        }
     }
 
     public func userDidLogout(session: LoginSession) {
@@ -109,6 +114,12 @@ open class AppEnvironment {
         router.courseTabUrlInteractor?.cancelTabSubscription()
         refreshWidgets()
         deleteUserData(session: session)
+        if AppEnvironment.shared.app == .horizon {
+            // doing cleanup of webviews so that logged in user data is not available
+            WKWebsiteDataStore.default().removeData(ofTypes: WKWebsiteDataStore.allWebsiteDataTypes(),
+                                                    modifiedSince: Date(timeIntervalSince1970: 0),
+                                                    completionHandler: {})
+        }
     }
 
     public func widgetUserDidLogout() {
@@ -186,6 +197,22 @@ open class AppEnvironment {
         UserDefaults.standard.set(data, forKey: "lastLoginAccount")
     }
 
+    public func tabBar(isVisible: Bool) {
+        let currentTabBar = (window?.rootViewController as? UITabBarController)
+        if #available(iOS 18, *) {
+            currentTabBar?.setTabBarHidden(!isVisible, animated: false)
+        } else {
+            currentTabBar?.tabBar.isHidden = !isVisible
+        }
+    }
+
+    public func navigationBar(isVisible: Bool) {
+        let currentTabBar = (window?.rootViewController as? UITabBarController)
+        if let currentNavigation = currentTabBar?.selectedViewController as? UINavigationController {
+            currentNavigation.setNavigationBarHidden(!isVisible, animated: false)
+        }
+    }
+
     public var apiHost: String? {
         currentSession?.baseURL.host()
     }

Core/Core/Common/CommonModels/AppEnvironment/LocalizationManager.swift

@@ -17,8 +17,9 @@
 //
 
 import UIKit
+import Combine
 
-public class LocalizationManager {
+public enum LocalizationManager {
     private static let instUserLocale = "InstUserLocale"
     static var suspend = #selector(NSXPCConnection.suspend)
 
@@ -77,4 +78,26 @@ public class LocalizationManager {
             env.router.show(alert, from: root, options: .modal())
         }
     }
+
+    public static func localizeForApp(
+        _ app: UIApplication,
+        locale: String?
+    ) -> AnyPublisher<UIAlertController?, Never> {
+        setCurrentLocale(locale)
+        let env = AppEnvironment.shared
+        guard
+            needsRestart,
+            env.window?.rootViewController != nil else {
+            return Just(nil).eraseToAnyPublisher()
+        }
+        let alert = UIAlertController(
+            title: String(localized: "Updated Language Settings", bundle: .core),
+            message: String(localized: "The app needs to restart to use the new language settings. Please relaunch the app.", bundle: .core),
+            preferredStyle: .alert
+        )
+        alert.addAction(AlertAction(String(localized: "Close App", bundle: .core), style: .default) { _ in
+            UIControl().sendAction(suspend, to: app, for: nil)
+        })
+        return Just(alert).eraseToAnyPublisher()
+    }
 }

Core/Core/Common/CommonModels/AppEnvironment/Secret.swift

@@ -42,9 +42,6 @@ public enum Secret {
     /// The value used for testing that Secret is working properly
     case testSecret
 
-    /// The clientID required for OAuth. Currently only Horizon uses it with PKCE login, regular Canvas apps use the Mobile Verify endpoint to obtain clientID (and other required properties).
-    case appClientID
-
     public var string: String? {
         guard let data = NSDataAsset(name: String(describing: self), bundle: .core)?.data else { return nil }
         let mixer = [UInt8]("\(String(describing: self))+\(Bundle.core.bundleIdentifier ?? "")".utf8)

Core/Core/Common/CommonModels/AppEnvironment/SessionDefaults.swift

@@ -256,6 +256,13 @@ public struct SessionDefaults: Equatable {
         set { self["assignmentListTeacherStatusFilterSettingByCourseId"] = newValue }
     }
 
+    // MARK: - Horizon
+
+    public var assignmentSubmissionTextEntry: [String: String]? {
+        get { self["assignmentSubmissionTextEntry"] as? [String: String] }
+        set { self["assignmentSubmissionTextEntry"] = newValue }
+    }
+
     // MARK: - SpeedGrader
 
     public var isSpeedGraderAnnotationToolbarVisible: Bool? {

Core/Core/Common/CommonModels/Router/Router.swift

@@ -220,6 +220,13 @@ open class Router {
 
     // MARK: - View Controller Presentation
 
+    open func setRootViewController(isLoginTransition: Bool, viewController: UIViewController) {
+        guard let window = AppEnvironment.shared.window else { return }
+        UIView.transition(with: window, duration: 0.5, options: isLoginTransition ? .transitionFlipFromRight : .transitionFlipFromLeft) {
+            window.rootViewController = viewController
+        }
+    }
+
     /**
      - parameters:
         - analyticsRoute: The route to be reported as screen\_view analytics event. If nil, no route is reported but this is only for internal usage to avoid both the `route` and `show` functions reporting the same event.

Core/Core/Common/CommonUI/CoreWebView/View/CoreWebView.swift

@@ -22,6 +22,7 @@ import UIKit
 
 @IBDesignable
 open class CoreWebView: WKWebView {
+
     private static var BalsamiqRegularCSSFontFace: String = {
         let url = Bundle.core.url(forResource: "font_balsamiq_regular", withExtension: "css")!
         // swiftlint:disable:next force_try
@@ -33,6 +34,13 @@ open class CoreWebView: WKWebView {
         // swiftlint:disable:next force_try
         return try! String(contentsOf: url)
     }()
+
+    private static var FigtreeRegularCSSFontFace: String = {
+        let url = Bundle.core.url(forResource: "font_figtree_regular", withExtension: "css")!
+        // swiftlint:disable:next force_try
+        return try! String(contentsOf: url)
+    }()
+
     public static let processPool = WKProcessPool()
 
     @IBInspectable public var autoresizesHeight: Bool = false
@@ -195,7 +203,7 @@ open class CoreWebView: WKWebView {
         } }
     }
 
-    func html(for content: String) -> String {
+    open func html(for content: String) -> String {
         // If it looks like jQuery is used, include the same version of jQuery as web.
         let jquery = content.contains("$(") || content.contains("$.")
             ? "<script defer src=\"https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js\"></script>"
@@ -279,12 +287,17 @@ open class CoreWebView: WKWebView {
                                                  : style.uiFont
         let marginsDisabled = features.contains { $0 is DisableDefaultBodyMargin }
 
-        if AppEnvironment.shared.k5.isK5Enabled {
-            font = "BalsamiqSans-Regular"
-            fontCSS = Self.BalsamiqRegularCSSFontFace
+        if AppEnvironment.shared.app == .horizon {
+            font = "Figtree-Regular"
+            fontCSS = Self.FigtreeRegularCSSFontFace
         } else {
-            font = "Lato-Regular"
-            fontCSS = Self.LatoRegularCSSFontFace
+            if AppEnvironment.shared.k5.isK5Enabled {
+                font = "BalsamiqSans-Regular"
+                fontCSS = Self.BalsamiqRegularCSSFontFace
+            } else {
+                font = "Lato-Regular"
+                fontCSS = Self.LatoRegularCSSFontFace
+            }
         }
 
         return """
@@ -460,7 +473,7 @@ extension CoreWebView: WKNavigationDelegate {
         decisionHandler(.allow)
     }
 
-    public func webView(
+    open func webView(
         _ webView: WKWebView,
         didFinish navigation: WKNavigation!
     ) {

Core/Core/Common/CommonUI/InstUI/BaseScreen.swift

@@ -40,6 +40,7 @@ public extension InstUI {
         public let scrollBounce: ScrollBounceBehavior
         public let errorPandaConfig: InteractivePanda.Config
         public let emptyPandaConfig: InteractivePanda.Config
+        public let loaderBackgroundColor: Color
 
         /**
          - parameters:
@@ -52,15 +53,18 @@ public extension InstUI {
             showsScrollIndicators: Bool = true,
             scrollAxes: Axis.Set = .vertical,
             scrollBounce: ScrollBounceBehavior = .automatic,
-            errorPandaConfig: InteractivePanda.Config = .error(),
-            emptyPandaConfig: InteractivePanda.Config = .empty()
+            errorPandaConfig: InteractivePanda.Config = AppEnvironment.shared.app == .horizon ? .horizonError() : .error(),
+            emptyPandaConfig: InteractivePanda.Config = AppEnvironment.shared.app == .horizon ? .horizonEmpty() : .empty(),
+            loaderBackgroundColor: Color = .backgroundLightest
+
         ) {
             self.refreshable = refreshable
             self.showsScrollIndicators = showsScrollIndicators
             self.scrollAxes = scrollAxes
             self.scrollBounce = scrollBounce
             self.errorPandaConfig = errorPandaConfig
             self.emptyPandaConfig = emptyPandaConfig
+            self.loaderBackgroundColor = loaderBackgroundColor
         }
     }
 
@@ -120,7 +124,7 @@ public extension InstUI {
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .background(showOverlay
                     ? Color.backgroundGrouped.opacity(0.5)
-                    : Color.backgroundLightest
+                    : config.loaderBackgroundColor
                 )
         }
 
@@ -165,8 +169,8 @@ public extension InstUI {
                     .frame(width: geometry.size.width, height: geometry.size.height)
                 }
             }
+            .background(AppEnvironment.shared.app == .horizon ? Color.clear : Color.backgroundLightest)
             .scrollBounceBehavior(config.scrollBounce)
-            .background(Color.backgroundLightest)
         }
     }
 }

Core/Core/Common/CommonUI/NavigationBar/UIKit/UINavigationBarExtensions.swift

@@ -46,8 +46,10 @@ extension UINavigationBar {
     }
 
     public func useGlobalNavStyle(brand: Brand = Brand.shared) {
-        let background = brand.navBackground
-        let foreground = brand.navTextColor
+        // TODO: Remove the isHorizon condition once horizon-specific logic is no longer needed.
+        let isHorizon = AppEnvironment.shared.app == .horizon
+        let background: UIColor = isHorizon ? .backgroundLightest : brand.navBackground
+        let foreground: UIColor = isHorizon ? .backgroundDarkest : brand.navTextColor
         titleTextAttributes = [.foregroundColor: foreground]
         tintColor = foreground
         barTintColor = background
@@ -99,4 +101,20 @@ extension UINavigationBar {
         standardAppearance = appearance
         scrollEdgeAppearance = standardAppearance
     }
+
+    // TODO: Remove the isHorizon condition once horizon-specific logic is no longer needed.
+    private func clearNavigation() {
+        let appearance = UINavigationBarAppearance()
+        appearance.configureWithTransparentBackground()
+        appearance.backgroundColor = .backgroundLightest
+        appearance.shadowColor = .backgroundLightest
+        appearance.titleTextAttributes = [.foregroundColor: UIColor.textDarkest]
+
+        tintColor = UIColor.textDarkest
+        standardAppearance = appearance
+        scrollEdgeAppearance = appearance
+        compactAppearance = appearance
+        isTranslucent = true
+        self.backgroundColor = .backgroundLightest
+    }
 }

Core/Core/Common/Extensions/Foundation/URLExtensions.swift

@@ -302,3 +302,24 @@ public extension Array where Element == URL {
         }
     }
 }
+
+public extension URL {
+    func replaceHostWithCanvasForCareer() -> URL? {
+        guard let components = URLComponents(url: self, resolvingAgainstBaseURL: false) else {
+            return nil
+        }
+        var newComponents = components
+        newComponents.host = newComponents.host?.replaceHostWithCanvasForCareer()
+        return newComponents.url
+    }
+}
+
+public extension String {
+    func replaceHostWithCanvasForCareer() -> String {
+        let newString = replacing("horizon.cd.instructure.com", with: "dev.cd.canvashorizon.com")
+        if let range = newString.range(of: "instructure.com") {
+            return newString.replacingCharacters(in: range, with: "canvasforcareer.com")
+        }
+        return newString
+    }
+}