[Horizon] Merge master

Core/Core/Assignments/AssignmentDetails/AssignmentDetailsView.swift

@@ -255,6 +255,7 @@ public struct AssignmentDetailsView: View, ScreenViewTrackable {
             id: assignment.first?.externalToolContentID,
             url: nil,
             launchType: "assessment",
+            isQuizLTI: assignment.first?.isQuizLTI,
             assignmentID: assignmentID,
             from: controller.value
         )

Core/Core/Assignments/AssignmentList/View/AssignmentListPreferencesScreen.swift

@@ -43,6 +43,7 @@ public struct AssignmentListPreferencesScreen: View {
                 }
             }
         }
+        .background(Color.backgroundLightest)
         .navigationTitleStyled(navBarTitleView)
         .navigationBarItems(leading: cancelButton, trailing: doneButton)
         .onDisappear {

Core/Core/Assignments/AssignmentList/View/AssignmentListScreen.swift

@@ -128,9 +128,12 @@ public struct AssignmentListScreen: View, ScreenViewTrackable {
         }
     }
 
-    private func setupDefaultSplitDetailView(_ route: String) {
-        guard let defaultViewProvider = controller.value as? DefaultViewProvider, defaultViewProvider.defaultViewRoute != route else { return }
-        defaultViewProvider.defaultViewRoute = route
+    private func setupDefaultSplitDetailView(_ routeUrl: String) {
+        guard let defaultViewProvider = controller.value as? DefaultViewProvider,
+              defaultViewProvider.defaultViewRoute?.url != routeUrl
+        else { return }
+
+        defaultViewProvider.defaultViewRoute = .init(url: routeUrl)
     }
 }
 

Core/Core/Assignments/AssignmentList/ViewModel/AssignmentListViewModel.swift

@@ -112,6 +112,7 @@ public class AssignmentListViewModel: ObservableObject {
     }
 
     private var assignmentGroups: Store<GetAssignmentsByGroup>?
+    private var wasAssignmentGroupsUpdated: Bool = false
 
     /** This is required for the router to help decide if the hybrid discussion details or the native one should be launched. */
     private lazy var featureFlags = env.subscribe(GetEnabledFeatureFlags(context: .course(courseID)))
@@ -133,13 +134,13 @@ public class AssignmentListViewModel: ObservableObject {
 
         loadAssignmentListPreferences()
         featureFlags.refresh()
+        course.refresh()
+        gradingPeriods.refresh(force: true)
     }
 
     // MARK: - Functions
 
-    public func viewDidAppear() {
-        gradingPeriods.refresh()
-        course.refresh()
+    func viewDidAppear() {
         isFilterIconSolid = isFilteringCustom || selectedGradingPeriodId != defaultGradingPeriodId
     }
 
@@ -162,7 +163,6 @@ public class AssignmentListViewModel: ObservableObject {
         }
 
         filterOptionsDidUpdate(filterOptionsStudent: selectedFilterOptionsStudent, gradingPeriodId: selectedGradingPeriodId)
-        assignmentGroups?.refresh()
     }
 
     func filterOptionsDidUpdate(
@@ -195,12 +195,20 @@ public class AssignmentListViewModel: ObservableObject {
         assignmentGroups = env.subscribe(GetAssignmentsByGroup(courseID: courseID, gradingPeriodID: selectedGradingPeriodId)) { [weak self] in
             self?.assignmentGroupsDidUpdate()
         }
+
+        assignmentGroups?.refresh()
     }
 
     private func assignmentGroupsDidUpdate() {
         guard let assignmentGroups else { return }
         if !assignmentGroups.requested || assignmentGroups.pending || !gradingPeriods.requested || gradingPeriods.pending { return }
 
+        if !wasAssignmentGroupsUpdated, assignmentGroups.isEmpty {
+            wasAssignmentGroupsUpdated = true
+            assignmentGroups.refresh(force: true)
+            return
+        }
+
         isShowingGradingPeriods = gradingPeriods.count > 1
         var assignmentGroupViewModels: [AssignmentGroupViewModel] = []
         let assignments: [Assignment]
@@ -332,7 +340,6 @@ public class AssignmentListViewModel: ObservableObject {
                     sortingOption: assignmentListPreferences.sortingOption,
                     gradingPeriodId: assignmentListPreferences.gradingPeriodId
                 )
-                assignmentGroups?.refresh()
                 saveAssignmentListPreferences()
             })
         let controller = CoreHostingController(AssignmentListPreferencesScreen(viewModel: viewModel))
@@ -350,33 +357,28 @@ public class AssignmentListViewModel: ObservableObject {
     }
 
     private func loadAssignmentListPreferences() {
-        guard let filterSettingsData = userDefaults?.assignmentListStudentFilterSettingsByCourseId?[courseID] else {
-            return
-        }
+        guard let userDefaults else { return }
 
-        guard let customFilterSettingData = userDefaults?.assignmentListTeacherFilterSettingByCourseId?[courseID] else {
-            return
+        if let savedStudentFilterOptionIds = userDefaults.assignmentListStudentFilterSettingsByCourseId?[courseID] {
+            selectedFilterOptionsStudent = savedStudentFilterOptionIds.compactMap { id in
+                AssignmentFilterOptionStudent.allCases.first { $0.id == id }
+            }
         }
 
-        guard let statusFilterSettingData = userDefaults?.assignmentListTeacherStatusFilterSettingByCourseId?[courseID] else {
-            return
+        if let savedTeacherFilterOptionId = userDefaults.assignmentListTeacherFilterSettingByCourseId?[courseID],
+           let savedTeacherFilterOption = AssignmentFilterOptionsTeacher(rawValue: savedTeacherFilterOptionId) {
+            selectedFilterOptionTeacher = savedTeacherFilterOption
         }
 
-        guard let groupBySettingData = userDefaults?.assignmentListGroupBySettingByCourseId?[courseID] else {
-            return
+        if let savedStatusFilterOptionId = userDefaults.assignmentListTeacherStatusFilterSettingByCourseId?[courseID],
+           let savedStatusFilterOption = AssignmentStatusFilterOptionsTeacher(rawValue: savedStatusFilterOptionId) {
+            selectedStatusFilterOptionTeacher = savedStatusFilterOption
         }
 
-        selectedFilterOptionsStudent = AssignmentFilterOptionStudent.allCases.filter { filterSettingsData.contains($0.id) }
-
-        selectedFilterOptionTeacher = AssignmentFilterOptionsTeacher.allCases.filter {
-            customFilterSettingData == $0.rawValue
-        }.first ?? selectedFilterOptionTeacher
-
-        selectedStatusFilterOptionTeacher = AssignmentStatusFilterOptionsTeacher.allCases.filter {
-            statusFilterSettingData == $0.rawValue
-        }.first ?? selectedStatusFilterOptionTeacher
-
-        selectedSortingOption = sortingOptions.filter { groupBySettingData == $0.rawValue }.first ?? selectedSortingOption
+        if let savedGroupByOptionId = userDefaults.assignmentListGroupBySettingByCourseId?[courseID],
+           let savedGroupByOption = AssignmentArrangementOptions(rawValue: savedGroupByOptionId) {
+            selectedSortingOption = savedGroupByOption
+        }
     }
 
     private func saveAssignmentListPreferences() {

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/CoreWebView/Model/Features/HideReturnButtonInQuizLTI.swift

@@ -0,0 +1,50 @@
+//
+// This file is part of Canvas.
+// Copyright (C) 2024-present  Instructure, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+
+private class HideReturnButtonInQuizLTI: CoreWebViewFeature {
+    private let script: String = {
+        let css = """
+            a[data-automation="sdk-return-button"] {
+                display: none;
+            }
+        """
+
+        let cssString = css.components(separatedBy: .newlines).joined()
+        return """
+           var element = document.createElement('style');
+           element.innerHTML = '\(cssString)';
+           document.head.appendChild(element);
+        """
+    }()
+
+    public override init() {}
+
+    override func apply(on webView: CoreWebView) {
+        webView.addScript(script)
+    }
+}
+
+public extension CoreWebViewFeature {
+
+    /// This feature hides the "Return" button in QuizLTI webviews, based on it's `data-automation` id.
+    /// The button normally leads the user back to the course home,
+    ///  but in the app we can dismiss the screen natively and the "Return" button navigation would cause issues.
+    static var hideReturnButtonInQuizLTI: CoreWebViewFeature {
+        HideReturnButtonInQuizLTI()
+    }
+}

Core/Core/Courses/AllCourses/Model/Entities/CDAllCoursesGroupItem.swift

@@ -34,6 +34,7 @@ public final class CDAllCoursesGroupItem: NSManagedObject, WriteableModel {
 
     @NSManaged public var concluded: Bool
     @NSManaged public var isFavorite: Bool
+    @NSManaged public var isAccessible: Bool
 
     public var context: Context? {
         get { contextRaw.flatMap { Context(canvasContextID: $0) } }
@@ -61,6 +62,7 @@ public final class CDAllCoursesGroupItem: NSManagedObject, WriteableModel {
 
         model.concluded = item.concluded
         model.isFavorite = item.is_favorite ?? true
+        model.isAccessible = item.can_access ?? false
 
         return model
     }

Core/Core/Courses/AllCourses/Model/GroupListInteractor.swift

@@ -62,7 +62,11 @@ public class GroupListInteractorLive: GroupListInteractor {
         return groupListStore
             .getEntities(keepObservingDatabaseChanges: true)
             .filter(with: searchQuery)
-            .map { $0.map { AllCoursesGroupItem(from: $0) }}
+            .map { groups in
+                groups
+                    .filter { $0.isAccessible }
+                    .map { AllCoursesGroupItem(from: $0) }
+            }
             .eraseToAnyPublisher()
     }
 

Core/Core/Courses/CourseDetails/View/CourseDetailsView.swift

@@ -164,7 +164,7 @@ public struct CourseDetailsView: View, ScreenViewTrackable {
                 .listRowBackground(Color.clear)
                 .listRowSeparator(.hidden)
                 .background(Color.backgroundLightest)
-                .padding(.top, headerViewModel.shouldShowHeader(for: geometry.size.height) ? headerViewModel.height : 0)
+                .padding(.top, headerViewModel.visibleHeight)
                 // Save the frame of the content so we can inspect its y position and move course image based on that
                 .transformAnchorPreference(key: ViewBoundsKey.self, value: .bounds) { preferences, bounds in
                     preferences = [.init(viewId: 0, bounds: geometry[bounds])]
@@ -180,14 +180,22 @@ public struct CourseDetailsView: View, ScreenViewTrackable {
 
     @ViewBuilder
     private func imageHeader(geometry: GeometryProxy) -> some View {
-        if headerViewModel.shouldShowHeader(for: geometry.size.height) {
+        if headerViewModel.shouldShowHeader(in: geometry.size) {
             CourseDetailsHeaderView(viewModel: headerViewModel, width: geometry.size.width)
         }
     }
 
     private func setupDefaultSplitDetailView(_ url: URL?) {
-        if let defaultViewProvider = controller.value as? DefaultViewProvider, defaultViewProvider.defaultViewRoute != url?.absoluteString {
-            defaultViewProvider.defaultViewRoute = url?.absoluteString
+        let routeUrl = url?.absoluteString
+        guard let defaultViewProvider = controller.value as? DefaultViewProvider,
+              defaultViewProvider.defaultViewRoute?.url != routeUrl
+        else { return }
+
+        defaultViewProvider.defaultViewRoute = routeUrl.map {
+            .init(
+                url: $0,
+                userInfo: [CourseTabUrlInteractor.blockDisabledTabUserInfoKey: false]
+            )
         }
     }
 }

Core/Core/Courses/CourseDetails/ViewModel/Cells/LTICellViewModel.swift

@@ -43,6 +43,7 @@ class LTICellViewModel: CourseDetailsCellViewModel {
             id: nil,
             url: url,
             launchType: nil,
+            isQuizLTI: false,
             assignmentID: nil,
             from: viewController.value
         )

Core/Core/Courses/CourseDetails/ViewModel/CourseDetailsHeaderViewModel.swift

@@ -40,6 +40,10 @@ public class CourseDetailsHeaderViewModel: ObservableObject {
         self?.hideColorOverlay = self?.settings.first?.hideDashcardColorOverlays == true
     }
 
+    private var shouldShow: Bool = false
+    private var checkedWidth: CGFloat = .nan
+    private var keyboard = KeyboardObserved()
+
     public func viewDidAppear() {
         settings.refresh()
     }
@@ -56,8 +60,17 @@ public class CourseDetailsHeaderViewModel: ObservableObject {
         scrollPositionYChanged(to: frame.minY)
     }
 
-    public func shouldShowHeader(for height: CGFloat) -> Bool {
-        self.height < height / 2
+    public func shouldShowHeader(in availableSize: CGSize) -> Bool {
+        let isRotating = checkedWidth.isFinite && checkedWidth != availableSize.width
+        guard isRotating || keyboard.isHiding else { return shouldShow }
+
+        shouldShow = self.height < availableSize.height / 2
+        checkedWidth = availableSize.width
+        return shouldShow
+    }
+
+    public var visibleHeight: CGFloat {
+        shouldShow ? height : 0
     }
 
     private func scrollPositionYChanged(to value: CGFloat) {

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/Database.xcdatamodeld/Database.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="24B91" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="23H222" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="AccountNotification" representedClassName="Core.AccountNotification" syncable="YES">
         <attribute name="endAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="iconRaw" attributeType="String"/>
@@ -154,6 +154,7 @@
         <attribute name="courseRoles" optional="YES" attributeType="String"/>
         <attribute name="courseTermName" optional="YES" attributeType="String"/>
         <attribute name="id" attributeType="String"/>
+        <attribute name="isAccessible" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="isFavorite" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="name" attributeType="String"/>
     </entity>

Core/Core/Extensions/UIColorExtensions.swift

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

Core/Core/Grades/GradeListAssembly.swift

@@ -57,7 +57,7 @@ public enum GradListAssembly {
             router: env.router
         )
         let viewController = CoreHostingController(GradeListView(viewModel: viewModel))
-        viewController.defaultViewRoute = "/empty"
+        viewController.defaultViewRoute = .init(url: "/empty")
         return viewController
     }