[Horizon] Fix dashboard & course details ui issues (#3403)

Author: Ahmed-Naguib93

Core/CoreTests/Common/CommonUI/NavigationBar/UIKit/UINavigationBarExtensionsTests.swift

@@ -54,7 +54,8 @@ class UINavigationBarExtensionsTests: XCTestCase {
             navIconFillActive: .textLightest.variantForLightMode,
             navTextColor: .textLightest.variantForLightMode,
             navTextColorActive: .textLightest.variantForLightMode,
-            primary: .textLightest.variantForLightMode
+            primary: .textLightest.variantForLightMode,
+            institutionLogo: URL(string: "https://canvas.com/logo.png")
         )
         bar.useGlobalNavStyle(brand: shiny)
         XCTAssertEqual(bar.barStyle, .default)

Core/CoreTests/Features/Dashboard/K5/Model/Schedule/K5ScheduleItemInfoTests.swift

@@ -62,7 +62,8 @@ class K5ScheduleItemInfoTests: CoreTestCase {
                              navIconFillActive: nil,
                              navTextColor: nil,
                              navTextColorActive: nil,
-                             primary: .red)
+                             primary: .red,
+                             institutionLogo: nil)
         XCTAssertEqual(APIPlannable.make(course_id: ID("testID")).k5ScheduleSubject(courseInfoByCourseIDs: ["testID": (color: .green,
                                                                                                                        image: nil,
                                                                                                                        isHomeroom: false,

Core/CoreTests/TestHelpers/CoreTestCase.swift

@@ -157,7 +157,8 @@ class CoreTestCase: XCTestCase {
             navIconFillActive: nil,
             navTextColor: nil,
             navTextColorActive: nil,
-            primary: nil
+            primary: nil,
+            institutionLogo: nil
         )
     }
 }

Horizon/Horizon/Sources/Common/View/ModuleItemListView.swift

@@ -56,7 +56,7 @@ struct ModuleItemListView: View {
         Text(item.title)
             .huiTypography(.labelMediumBold)
             .foregroundStyle(Color.huiColors.text.body)
-            .padding(.top, .huiSpaces.space12)
+            .padding(.top, items.first?.id == item.id ? .zero : .huiSpaces.space32)
     }
 
     private func moduleItemButton(item: HModuleItem, type: ModuleItemType) -> some View {

Horizon/Horizon/Sources/Features/Dashboard/View/DashboardView.swift

@@ -23,6 +23,7 @@ import SwiftUI
 struct DashboardView: View {
     @Bindable private var viewModel: DashboardViewModel
     @Environment(\.viewController) private var viewController
+    @State private var isShowHeader: Bool = true
 
     init(viewModel: DashboardViewModel) {
         self.viewModel = viewModel
@@ -41,7 +42,7 @@ struct DashboardView: View {
                 ),
                 refreshAction: viewModel.reload
             ) { _ in
-                LazyVStack(spacing: .zero) {
+                VStack(spacing: .zero) {
                     if viewModel.courses.isEmpty, viewModel.state == .data {
                         Text("You aren’t currently enrolled in a course.", bundle: .horizon)
                             .padding(.huiSpaces.space24)
@@ -50,22 +51,42 @@ struct DashboardView: View {
                             .huiTypography(.h3)
 
                     } else {
+                        topView
                         contentView(courses: viewModel.courses)
                             .padding(.bottom, .huiSpaces.space16)
                     }
                 }
             }
         }
-        .toolbar(.hidden)
-        .safeAreaInset(edge: .top, spacing: .zero) { navigationBar }
+        .safeAreaInset(edge: .top, spacing: .zero) {
+            if isShowHeader {
+                navigationBar
+                    .toolbar(.hidden)
+                    .transition(.move(edge: .top).combined(with: .opacity))
+            } else {
+                Rectangle()
+                    .fill(Color.huiColors.surface.pagePrimary)
+                    .frame(height: 55)
+                    .ignoresSafeArea()
+            }
+        }
         .scrollIndicators(.hidden, axes: .vertical)
         .background(Color.huiColors.surface.pagePrimary)
         .animation(.smooth, value: viewModel.invitedCourses)
+        .animation(.linear, value: isShowHeader)
         .alert(isPresented: $viewModel.isAlertPresented) {
             Alert(title: Text("Something went wrong", bundle: .horizon), message: Text(viewModel.errorMessage))
         }
     }
 
+    private var topView: some View {
+        Color.clear
+            .frame(height: 0)
+            .readingFrame { frame in
+                isShowHeader = frame.minY > -100
+            }
+    }
+
     private func contentView(courses: [HCourse]) -> some View {
         ForEach(courses) { course in
             VStack(alignment: .leading, spacing: .zero) {
@@ -81,6 +102,7 @@ struct DashboardView: View {
 
                 if let learningObjectCardModel = course.learningObjectCardModel {
                     learningObjectCard(model: learningObjectCardModel, progress: course.progress)
+                        .padding(.bottom, .huiSpaces.space16)
                 } else {
                     Text("Congrats! You've completed your course.", bundle: .horizon)
                         .huiTypography(.h3)
@@ -101,7 +123,7 @@ struct DashboardView: View {
             Text(course.name)
                 .huiTypography(.h1)
                 .foregroundStyle(Color.huiColors.text.title)
-                .padding(.top, .huiSpaces.space48)
+                .padding(.top, .huiSpaces.space16)
                 .padding(.bottom, .huiSpaces.space16)
 
             HorizonUI.ProgressBar(

Horizon/Horizon/Sources/Features/Learn/Scores/View/ScoresAssignmentGroupsView.swift

@@ -107,7 +107,7 @@ struct ScoresAssignmentGroupsView: View {
 
     @ViewBuilder
     private func assignmentGroupListRow(group: ScoresAssignmentGroup) -> some View {
-        VStack(alignment: .leading, spacing: .huiSpaces.space8) {
+        VStack(alignment: .leading, spacing: .huiSpaces.space12) {
             Text(group.name)
                 .huiTypography(.p1)
                 .foregroundStyle(Color.huiColors.text.body)

Horizon/Horizon/Sources/Features/Learn/Scores/View/ScoresAssignmentsView.swift

@@ -37,7 +37,7 @@ struct ScoresAssignmentsView: View {
             .padding(.top, .huiSpaces.space24)
             VStack(spacing: .zero) {
                 ForEach(Array(details.assignments.enumerated()), id: \.offset) { index, assignment in
-                    VStack(alignment: .leading, spacing: .huiSpaces.space8) {
+                    VStack(alignment: .leading, spacing: .huiSpaces.space12) {
                         Text("Name: \(assignment.name)", bundle: .horizon)
                         if let dueAtString = assignment.dueAtString {
                             Text("Due Date: \(dueAtString)", bundle: .horizon)

packages/HorizonUI/Sources/HorizonUI/Sources/Components/Cards/LearningObjectItem/HorizonUI.LearningObjectItem.swift

@@ -120,27 +120,26 @@ public extension HorizonUI {
                         Text(duration)
                             .foregroundStyle(Color.huiColors.text.timestamp)
                             .huiTypography(.labelSmall)
-                            .padding(.leading, .huiSpaces.space16)
                     }
                 }
-                .padding(.top, .huiSpaces.space12)
+                .padding(.top, .huiSpaces.space4)
 
                 HStack(spacing: .zero) {
                     if let dueDate {
                         dueDateView(dueDate)
-                            .padding(.top, .huiSpaces.space24)
+                            .padding(.top, .huiSpaces.space4)
                             .padding(.trailing, .huiSpaces.space16)
                     }
 
                     if let points {
                         Text("\(points) pts")
                             .foregroundStyle(Color.huiColors.text.timestamp)
-                            .padding(.top, .huiSpaces.space24)
+                            .padding(.top, .huiSpaces.space4)
                     }
                     if let minScore {
                         Text(" | \(minScore)")
                             .foregroundStyle(Color.huiColors.text.timestamp)
-                            .padding(.top, .huiSpaces.space24)
+                            .padding(.top, .huiSpaces.space4)
                     }
                 }
                 .huiTypography(.labelSmall)

packages/HorizonUI/Sources/HorizonUI/Sources/Components/ProgressBar/HorizonUI.ProgressBar.swift

@@ -107,7 +107,6 @@ extension HorizonUI.ProgressBar {
             Group {
                 Text(percentageRound, format: .number) + Text("%")
             }
-            .padding(.horizontal, .huiSpaces.space8)
             .huiTypography(.buttonTextMedium)
         }
     }