[Horizon ]Add learn tab (#3308)

Ahmed-Naguib93 · web-flow · commit 185d08066762 · 2025-04-16T16:06:14.000+02:00
diff --git a/Core/Core/Features/Modules/APIModule.swift b/Core/Core/Features/Modules/APIModule.swift
@@ -414,7 +414,7 @@ public struct GetModuleItemRequest: APIRequestable {
     public typealias Response = APIModuleItem
 
     public enum Include: String {
-        case content_details
+        case content_details, estimated_durations
     }
 
     public let courseID: String
diff --git a/Core/Core/Features/Modules/GetModuleItem.swift b/Core/Core/Features/Modules/GetModuleItem.swift
@@ -30,11 +30,16 @@ public class GetModuleItem: APIUseCase {
     public let scope: Scope
     public let cacheKey: String?
 
-    public init(courseID: String, moduleID: String, itemID: String) {
+    public init(
+        courseID: String,
+        moduleID: String,
+        itemID: String,
+        include: [GetModuleItemRequest.Include] = [.content_details]
+    ) {
         self.courseID = courseID
         self.moduleID = moduleID
         self.itemID = itemID
-        request = GetModuleItemRequest(courseID: courseID, moduleID: moduleID, itemID: itemID, include: [.content_details])
+        request = GetModuleItemRequest(courseID: courseID, moduleID: moduleID, itemID: itemID, include: include)
         let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [
             NSPredicate(key: #keyPath(ModuleItem.courseID), equals: courseID),
             NSPredicate(key: #keyPath(ModuleItem.id), equals: itemID)
diff --git a/Horizon/Horizon/Resources/Localizable.xcstrings b/Horizon/Horizon/Resources/Localizable.xcstrings
@@ -245,6 +245,9 @@
     },
     "Confusing" : {
 
+    },
+    "Congrats! You've completed your course." : {
+
     },
     "Copenhagen (+01:00/+02:00)" : {
 
@@ -905,6 +908,9 @@
     },
     "View Submission" : {
 
+    },
+    "View your progress and scores on the Learn page." : {
+
     },
     "Vilnius (+02:00/+03:00)" : {
 
@@ -944,6 +950,9 @@
     },
     "You are submitting an uploaded file. Any content in the text field will be deleted upon submission. Once you submit this attempt, you won’t be able to make any changes." : {
 
+    },
+    "You aren’t currently enrolled in a course." : {
+
     },
     "Your Courses" : {
 
diff --git a/Horizon/Horizon/Sources/Common/Domain/GetCoursesInteractor.swift b/Horizon/Horizon/Sources/Common/Domain/GetCoursesInteractor.swift
@@ -108,6 +108,11 @@ final class GetCoursesInteractorLive: GetCoursesInteractor {
                             .collect()
                     }
             }
+            .map { courses in
+                courses.sorted {
+                    ($0.learningObjectCardViewModel != nil) && ($1.learningObjectCardViewModel == nil)
+                }
+            }
             .eraseToAnyPublisher()
     }
 
@@ -135,22 +140,30 @@ private extension CDDashboardCourse {
         let progress = completionPercentage / 100.0
 
         guard let nextModuleID, let nextModuleItemID else {
-            return Just(nil)
-                .eraseToAnyPublisher()
+            return Just(
+                DashboardCourse(
+                    name: name,
+                    progress: progress,
+                    courseId: courseID,
+                    learningObjectCardViewModel: nil
+                )
+            )
+            .eraseToAnyPublisher()
         }
 
         return ReactiveStore(
             useCase: GetModuleItem(
                 courseID: courseID,
                 moduleID: nextModuleID,
-                itemID: nextModuleItemID
+                itemID: nextModuleItemID,
+                include: [.content_details, .estimated_durations]
             )
         )
         .getEntities(ignoreCache: true)
         .replaceError(with: [])
         .compactMap { $0.first }
         .map { HModuleItem(from: $0) }
-        .map { item in
+        .map { [courseID] item in
             let moduleItem = LearningObjectCard(
                 moduleTitle: item.moduleName ?? "",
                 learningObjectName: item.title,
@@ -163,6 +176,7 @@ private extension CDDashboardCourse {
             return DashboardCourse(
                 name: name,
                 progress: progress,
+                courseId: courseID,
                 learningObjectCardViewModel: moduleItem
             )
         }
diff --git a/Horizon/Horizon/Sources/Common/Domain/GetCoursesInteractorPreview.swift b/Horizon/Horizon/Sources/Common/Domain/GetCoursesInteractorPreview.swift
@@ -27,6 +27,7 @@ class GetCoursesInteractorPreview: GetCoursesInteractor {
             [.init(
                 name: "AI Introductions",
                 progress: 0.2,
+                courseId: "11",
                 learningObjectCardViewModel: nil
             )
             ]
diff --git a/Horizon/Horizon/Sources/Features/Dashboard/Data/DashboardCourse.swift b/Horizon/Horizon/Sources/Features/Dashboard/Data/DashboardCourse.swift
@@ -21,6 +21,7 @@ import Foundation
 struct DashboardCourse: Identifiable {
     let name: String
     let progress: Double
+    let courseId: String
     let learningObjectCardViewModel: LearningObjectCard?
     var id: String { name }
 }
diff --git a/Horizon/Horizon/Sources/Features/Dashboard/View/DashboardView.swift b/Horizon/Horizon/Sources/Features/Dashboard/View/DashboardView.swift
@@ -41,54 +41,96 @@ struct DashboardView: View {
             refreshAction: viewModel.reload
         ) { _ in
             LazyVStack(spacing: .zero) {
-                ForEach(viewModel.nextUpViewModels) { nextUpViewModel in
-                    VStack(alignment: .leading, spacing: .zero) {
-                        Text(nextUpViewModel.name)
-                            .huiTypography(.h1)
-                            .foregroundStyle(Color.huiColors.text.title)
-                            .padding(.top, .huiSpaces.space48)
-                            .padding(.bottom, .huiSpaces.space16)
+                if viewModel.courses.isEmpty, viewModel.state == .data {
+                    Text("You aren’t currently enrolled in a course.", bundle: .horizon)
+                        .padding(.huiSpaces.space24)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .foregroundStyle(Color.huiColors.text.body)
+                        .huiTypography(.h3)
 
-                        HorizonUI.ProgressBar(
-                            progress: nextUpViewModel.progress,
-                            size: .medium,
-                            numberPosition: .outside
-                        )
-
-                        if let learningObjectCardViewModel = nextUpViewModel.learningObjectCardViewModel {
-                            Text("Resume Learning", bundle: .horizon)
-                                .huiTypography(.h3)
-                                .foregroundStyle(Color.huiColors.text.title)
-                                .padding(.top, .huiSpaces.space36)
-                                .padding(.bottom, .huiSpaces.space12)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                            Button {
-                                if let url = learningObjectCardViewModel.url {
-                                    viewModel.navigateToCourseDetails(url: url, viewController: viewController)
-                                }
-                            } label: {
-                                HorizonUI.LearningObjectCard(
-                                    status: viewModel.getStatus(percent: nextUpViewModel.progress),
-                                    moduleTitle: learningObjectCardViewModel.moduleTitle,
-                                    learningObjectName: learningObjectCardViewModel.learningObjectName,
-                                    duration: learningObjectCardViewModel.estimatedTime,
-                                    type: learningObjectCardViewModel.type,
-                                    dueDate: learningObjectCardViewModel.dueDate
-                                )
-                            }
-                        }
-                    }
-                    .padding(.horizontal, .huiSpaces.space24)
+                } else {
+                    contentView(courses: viewModel.courses)
+                        .padding(.bottom, .huiSpaces.space16)
                 }
             }
-            .padding(.bottom, .huiSpaces.space16)
         }
         .toolbar(.hidden)
         .safeAreaInset(edge: .top, spacing: .zero) { navigationBar }
         .scrollIndicators(.hidden, axes: .vertical)
         .background(Color.huiColors.surface.pagePrimary)
     }
 
+    private func contentView(courses: [DashboardCourse]) -> some View {
+        ForEach(courses) { course in
+            VStack(alignment: .leading, spacing: .zero) {
+                courseProgressionView(course: course)
+                    .contentShape(Rectangle())
+                    .onTapGesture {
+                        viewModel.navigateToCourseDetails(
+                            id: course.courseId,
+                            viewController: viewController
+                        )
+                    }
+
+                if let learningObjectCardViewModel = course.learningObjectCardViewModel {
+                    learningObjectCard(model: learningObjectCardViewModel, progress: course.progress)
+                } else {
+                    Text("Congrats! You've completed your course.", bundle: .horizon)
+                        .huiTypography(.h3)
+                        .foregroundStyle(Color.huiColors.text.title)
+                        .padding(.top, .huiSpaces.space32)
+                    Text("View your progress and scores on the Learn page.", bundle: .horizon)
+                        .huiTypography(.p1)
+                        .foregroundStyle(Color.huiColors.text.title)
+                        .padding(.top, .huiSpaces.space12)
+                }
+            }
+            .padding(.horizontal, .huiSpaces.space24)
+        }
+    }
+
+    private func courseProgressionView(course: DashboardCourse) -> some View {
+        Group {
+            Text(course.name)
+                .huiTypography(.h1)
+                .foregroundStyle(Color.huiColors.text.title)
+                .padding(.top, .huiSpaces.space48)
+                .padding(.bottom, .huiSpaces.space16)
+
+            HorizonUI.ProgressBar(
+                progress: course.progress,
+                size: .medium,
+                numberPosition: .outside
+            )
+        }
+    }
+
+    private func learningObjectCard(model: LearningObjectCard, progress: Double) -> some View {
+        VStack(alignment: .leading, spacing: .zero) {
+            Text("Resume Learning", bundle: .horizon)
+                .huiTypography(.h3)
+                .foregroundStyle(Color.huiColors.text.title)
+                .padding(.top, .huiSpaces.space36)
+                .padding(.bottom, .huiSpaces.space12)
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+            Button {
+                if let url = model.url {
+                    viewModel.navigateToItemSequence(url: url, viewController: viewController)
+                }
+            } label: {
+                HorizonUI.LearningObjectCard(
+                    status: viewModel.getStatus(percent: progress),
+                    moduleTitle: model.moduleTitle,
+                    learningObjectName: model.learningObjectName,
+                    duration: model.estimatedTime,
+                    type: model.type,
+                    dueDate: model.dueDate
+                )
+            }
+        }
+    }
+
     private var navigationBar: some View {
         HStack(spacing: .zero) {
             HorizonUI.NavigationBar.Leading(logoURL: logoURL)
@@ -101,7 +143,7 @@ struct DashboardView: View {
                 viewModel.mailDidTap(viewController: viewController)
             }
         }
-        .padding(.horizontal, .huiSpaces.space10)
+        .padding(.horizontal, .huiSpaces.space24)
         .padding(.top, .huiSpaces.space10)
         .padding(.bottom, .huiSpaces.space4)
         .background(Color.huiColors.surface.pagePrimary)
diff --git a/Horizon/Horizon/Sources/Features/Dashboard/View/DashboardViewModel.swift b/Horizon/Horizon/Sources/Features/Dashboard/View/DashboardViewModel.swift
@@ -27,7 +27,7 @@ class DashboardViewModel {
 
     private(set) var state: InstUI.ScreenState = .loading
     var title: String = ""
-    var nextUpViewModels: [DashboardCourse] = []
+    var courses: [DashboardCourse] = []
 
     // MARK: - Dependencies
 
@@ -67,7 +67,7 @@ class DashboardViewModel {
 
         getDashboardCoursesCancellable = getCoursesInteractor.getDashboardCourses(ignoreCache: ignoreCache)
             .sink { [weak self] items in
-                self?.nextUpViewModels = items
+                self?.courses = items
                 self?.state = .data
                 completion?()
             }
@@ -90,10 +90,14 @@ class DashboardViewModel {
         router.route(to: "/conversations", from: viewController)
     }
 
-    func navigateToCourseDetails(url: URL, viewController: WeakViewController) {
+    func navigateToItemSequence(url: URL, viewController: WeakViewController) {
         router.route(to: url, from: viewController)
     }
 
+    func navigateToCourseDetails(id: String, viewController: WeakViewController) {
+        router.route(to: "/courses/\(id)", from: viewController)
+    }
+
     func reload(completion: @escaping () -> Void) {
         getCourses(
             ignoreCache: true,
diff --git a/Horizon/Horizon/Sources/Features/HorizonTabBarController.swift b/Horizon/Horizon/Sources/Features/HorizonTabBarController.swift
@@ -82,7 +82,7 @@ final class HorizonTabBarController: UITabBarController, UITabBarControllerDeleg
 
     private func learnTab() -> UIViewController {
         let vc = CoreNavigationController(
-            rootViewController: CoreHostingController(LearnAssembly.makeCoursesView())
+            rootViewController: LearnAssembly.makeLearnView()
         )
         vc.tabBarItem.title = String(localized: "Learn", bundle: .horizon)
         vc.tabBarItem.image = getHorizonImage(name: "book_2")
diff --git a/Horizon/Horizon/Sources/Features/Learn/CourseDetails/View/CourseDetailsView.swift b/Horizon/Horizon/Sources/Features/Learn/CourseDetails/View/CourseDetailsView.swift
@@ -21,14 +21,24 @@ import HorizonUI
 import SwiftUI
 
 struct CourseDetailsView: View {
-    @Bindable private var viewModel: CourseDetailsViewModel
+    @State private var viewModel: CourseDetailsViewModel
     @Environment(\.viewController) private var viewController
-    @State var selectedTabIndex: Int = 0
+    @Environment(\.dismiss) private var dismiss
+    @State private var selectedTabIndex: Int = 0
+
+    // MARK: - Dependencies
 
     private let notebookView: NotebookView
+    private let isBackButtonVisible: Bool
+
+    // MARK: - Init
 
-    init(viewModel: CourseDetailsViewModel) {
+    init(
+        viewModel: CourseDetailsViewModel,
+        isBackButtonVisible: Bool = true
+    ) {
         self.viewModel = viewModel
+        self.isBackButtonVisible = isBackButtonVisible
         self.notebookView = NotebookAssembly.makeView(courseId: viewModel.courseID)
     }
 
@@ -41,13 +51,33 @@ struct CourseDetailsView: View {
         .hidden(viewModel.isLoaderVisible)
         .background(Color.huiColors.surface.pagePrimary)
         .onAppear { viewModel.showTabBar() }
+        .safeAreaInset(edge: .top, spacing: .zero) { navigationBar }
+        .toolbar(.hidden)
         .overlay {
             if viewModel.isLoaderVisible {
                 HorizonUI.Spinner(size: .small, showBackground: true)
             }
         }
     }
 
+    @ViewBuilder
+    private var navigationBar: some View {
+        if isBackButtonVisible {
+            HStack {
+                Button {
+                    dismiss()
+                } label: {
+                    Image.huiIcons.arrowBack
+                        .foregroundStyle(Color.huiColors.icon.default)
+                        .frame(width: 44, height: 44, alignment: .leading)
+
+                }
+                Spacer()
+            }
+            .padding(.horizontal, .huiSpaces.space24)
+        }
+    }
+
     private var headerView: some View {
         VStack(alignment: .leading, spacing: .huiSpaces.space16) {
             Text(viewModel.course.name)
diff --git a/Horizon/Horizon/Sources/Features/Learn/Learn/View/LearnView.swift b/Horizon/Horizon/Sources/Features/Learn/Learn/View/LearnView.swift
diff --git a/Horizon/Horizon/Sources/Features/Learn/Learn/View/LearnViewModel.swift b/Horizon/Horizon/Sources/Features/Learn/Learn/View/LearnViewModel.swift
diff --git a/Horizon/Horizon/Sources/Features/Learn/LearnAssembly.swift b/Horizon/Horizon/Sources/Features/Learn/LearnAssembly.swift

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ public struct GetModuleItemRequest: APIRequestable {`
`414`	`414`	`public typealias Response = APIModuleItem`
`415`	`415`
`416`	`416`	`public enum Include: String {`
`417`		`- case content_details`
	`417`	`+ case content_details, estimated_durations`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`public let courseID: String`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ class GetCoursesInteractorPreview: GetCoursesInteractor {`
`27`	`27`	`[.init(`
`28`	`28`	`name: "AI Introductions",`
`29`	`29`	`progress: 0.2,`
	`30`	`+ courseId: "11",`
`30`	`31`	`learningObjectCardViewModel: nil`
`31`	`32`	`)`
`32`	`33`	`]`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import Foundation`
`21`	`21`	`struct DashboardCourse: Identifiable {`
`22`	`22`	`let name: String`
`23`	`23`	`let progress: Double`
	`24`	`+ let courseId: String`
`24`	`25`	`let learningObjectCardViewModel: LearningObjectCard?`
`25`	`26`	`var id: String { name }`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ final class HorizonTabBarController: UITabBarController, UITabBarControllerDeleg`
`82`	`82`
`83`	`83`	`private func learnTab() -> UIViewController {`
`84`	`84`	`let vc = CoreNavigationController(`
`85`		`- rootViewController: CoreHostingController(LearnAssembly.makeCoursesView())`
	`85`	`+ rootViewController: LearnAssembly.makeLearnView()`
`86`	`86`	`)`
`87`	`87`	`vc.tabBarItem.title = String(localized: "Learn", bundle: .horizon)`
`88`	`88`	`vc.tabBarItem.image = getHorizonImage(name: "book_2")`