feat: [FC-0047] Course progress and collapsing sections #446

IvanStepanok · 2024-05-31T13:21:22Z

Quick Preview

Screen.Recording.2024-05-31.at.18.31.30.mov

Pay attention ⚠️

❌ "COURSE_NESTED_LIST_ENABLED" removed
✅ "COURSE_DROPDOWN_NAVIGATION_ENABLED" added

Old implementations in CourseStructureNestedListView.swift and CourseStructureView.swift are removed.

Design:
https://www.figma.com/design/iZ56YMjbRMShCCDxqrqRrR/Open-edX-Mobile-App-All-Screens-v2.1?node-id=9177-44208&t=kHcQmxzck33FVrAT-0

openedx-webhooks · 2024-05-31T13:21:26Z

Thanks for the pull request, @IvanStepanok! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

supporting documentation
Open edX discussion forum threads
timeline information ("this must be merged by XX date", and why that is)
partner information ("this is a course on edx.org")
any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

volodymyr-chekyrta · 2024-05-31T13:53:28Z

The arrow is pointing in the wrong direction

volodymyr-chekyrta · 2024-05-31T14:09:53Z

By design, arrows should be displayed only in sections with assignments.

Design	Device

volodymyr-chekyrta

Good overall; please address the following feedback

volodymyr-chekyrta · 2024-05-31T13:55:44Z

Course/Course/Presentation/Outline/CourseOutlineView.swift

+                Task {
+                    await viewModel.getCourseBlocks(courseID: courseID, withProgress: false)
+                }
+                viewModel.updateCourseProgress = false


The View shouldn't update Published variables; please encapsulate this logic to the VM function, let's say updateCourseIfNeeded()

volodymyr-chekyrta · 2024-05-31T13:56:20Z

Course/Course/Presentation/Subviews/CourseProgressView.swift

+public struct CourseProgressView: View {
+    private var progress: CourseProgress
+
+    public  init(progress: CourseProgress) {


Please remove extra space
public init(progress: CourseProgress) -> public init(progress: CourseProgress)

volodymyr-chekyrta · 2024-05-31T13:57:11Z

Course/Course/Presentation/Subviews/CourseProgressView.swift

+            }
+
+            .cornerRadius(10)


Please remove extra line

} .cornerRadius(10)

volodymyr-chekyrta · 2024-05-31T14:00:27Z

Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift

+                                        Button(action: {
+                                            if let chapterIndex, let sequentialIndex {
+                                                viewModel.trackSequentialClicked(sequential)
+                                                viewModel.router.showCourseVerticalView(
+                                                    courseID: viewModel.courseStructure?.id ?? "",
+                                                    courseName: viewModel.courseStructure?.displayName ?? "",
+                                                    title: sequential.displayName,
+                                                    chapters: course.childs,
+                                                    chapterIndex: chapterIndex,
+                                                    sequentialIndex: sequentialIndex
+                                                )
+                                            }
+                                        }, label: {


Please format Button to the "each param on own line" style.

Button( action: { ... , label: { ...

volodymyr-chekyrta · 2024-05-31T14:21:18Z

It's not really critical, but the animation works weird when there is only 1 element in it.
The element appears before the container is resized.

Screen.Recording.2024-05-31.at.17.18.45.mov

IvanStepanok · 2024-05-31T15:34:47Z

@volodymyr-chekyrta Thanks for the review! All requested changes have been made🙌

volodymyr-chekyrta

Looks good to me.
PR is ready for product/design review.

sdaitzman · 2024-06-03T17:43:23Z

Hi @IvanStepanok, this looks great overall! A couple of design questions/feedback I wanted to check on:

In light mode, sections should use the light theme shade color #F9FAFB as their background color. It looks like this might be missing from the video
In dark mode, the download icon should use the lighter dark theme accent text color #879FF5 for contrast/accessibility reasons

Both of these are color-related, and the video compression makes it a bit ambiguous whether these colors are already being used, so I wanted to confirm

IvanStepanok · 2024-06-04T20:38:40Z

Hi @sdaitzman and thanks for paying so much attention to details!
Please, take a look at my changes. The download icon had the wrong color, but in the light theme, not in the dark☺️

sdaitzman · 2024-06-05T14:37:25Z

Thanks so much @IvanStepanok! Just to confirm, is the download icon in dark mode using #879FF5? In that screenshot, I see a value of #5378F8, but it's possible that's just an image encoding/color space variation.

Other than that, everything looks great to me/ready to merge from a design standpoint, thanks for these updates!

IvanStepanok · 2024-06-05T20:04:54Z

Hi, @sdaitzman
For some reason when you load icons and make a screenshot, they have a little difference in color measurement. I think is because of different color profiles used on real device and the simulator. I found a topic about this, but anyway, I think all we can do is just accept the rules🙌

rnr · 2024-06-06T11:57:31Z

Course/Course/Data/Model/Data_CourseOutlineResponse.swift

@@ -60,6 +64,7 @@ public extension DataLayer {
            certificate = try values.decode(Certificate.self, forKey: .certificate)
            org = try values.decode(String.self, forKey: .org)
            isSelfPaced = try values.decode(Bool.self, forKey: .isSelfPaced)
+            courseProgress = try values.decode(DataLayer.CourseProgress.self, forKey: .courseProgress)


please add ? after try since this parameter is optional

rnr · 2024-06-06T12:51:25Z

Course/Course/Presentation/Outline/CourseOutlineView.swift

@@ -108,21 +107,19 @@ public struct CourseOutlineView: View {
                                ? viewModel.courseVideosStructure
                                : viewModel.courseStructure {

-                                // MARK: - Sections
-                                if viewModel.config.uiComponents.courseNestedListEnabled {


@IvanStepanok
we had logic when courseNestedListEnabled==true we skip VerticalsView and go to content directly. Could you please add the same? Thank you

rnr · 2024-06-07T11:10:38Z

OpenEdX/Router.swift


        var controllers = navigationController.viewControllers

-        if isCourseNestedListEnabled || currentCourseTabSelection == CourseTab.dates.rawValue {


this condition should be present. please use new added flag here. Thank you

rnr · 2024-06-07T11:12:50Z

OpenEdX/Managers/PipManager.swift

@@ -114,7 +111,7 @@ public class PipManager: PipManagerProtocol {
            viewControllers.append(try await containerController(for: holder))
        }

-        if !isNestedListEnabled && holder.selectedCourseTab != CourseTab.dates.rawValue {


the same here - please use here new added flag. Thank you

openedx-webhooks · 2024-06-07T12:18:51Z

@IvanStepanok 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

feat: course home navigation

45ed687

openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label May 31, 2024

volodymyr-chekyrta requested changes May 31, 2024

View reviewed changes

volodymyr-chekyrta changed the title ~~feat: course home navigation~~ feat: [FC-0047] Course progress and collapsing sections May 31, 2024

IvanStepanok added 2 commits May 31, 2024 17:53

fix: address feedback

99edb6b

Merge branch 'develop' into feat/course-home-navigation

aaa7086

IvanStepanok requested a review from volodymyr-chekyrta May 31, 2024 14:59

volodymyr-chekyrta previously approved these changes May 31, 2024

View reviewed changes

volodymyr-chekyrta marked this pull request as ready for review May 31, 2024 15:35

IvanStepanok added 2 commits June 3, 2024 11:51

Merge branch 'develop' into feat/course-home-navigation

3f899a7

fix: merge conflicts

9462af1

IvanStepanok dismissed volodymyr-chekyrta’s stale review via 9462af1 June 3, 2024 09:07

fix: address feedback

574d560

volodymyr-chekyrta requested review from rnr and saeedbashir June 6, 2024 09:31

fix: address feedback

68a73de

rnr requested changes Jun 6, 2024

View reviewed changes

IvanStepanok added 3 commits June 7, 2024 12:17

fix: address feedback

1a2b298

fix: address feedback

0eaecbb

fix: address feedback

cc0f7d3

rnr requested changes Jun 7, 2024

View reviewed changes

IvanStepanok added 3 commits June 7, 2024 14:31

fix: address feedback

e28415e

fix: address feedback

d8dbccb

fix: address feedback

8c65f45

rnr approved these changes Jun 7, 2024

View reviewed changes

volodymyr-chekyrta merged commit d380551 into openedx:develop Jun 7, 2024
3 checks passed

GlugovGrGlib mentioned this pull request Jun 13, 2024

feat: [FC-0047] Extend mobile API with course progress and primary courses on dashboard view openedx/edx-platform#34848

Merged

IvanStepanok mentioned this pull request Nov 6, 2024

Develop to main. Release v2 #538

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: [FC-0047] Course progress and collapsing sections #446

feat: [FC-0047] Course progress and collapsing sections #446

IvanStepanok commented May 31, 2024 •

edited

Loading

openedx-webhooks commented May 31, 2024 •

edited

Loading

volodymyr-chekyrta commented May 31, 2024

volodymyr-chekyrta commented May 31, 2024

volodymyr-chekyrta left a comment

volodymyr-chekyrta May 31, 2024

volodymyr-chekyrta May 31, 2024

volodymyr-chekyrta May 31, 2024

volodymyr-chekyrta May 31, 2024

volodymyr-chekyrta commented May 31, 2024

IvanStepanok commented May 31, 2024

volodymyr-chekyrta left a comment

sdaitzman commented Jun 3, 2024

IvanStepanok commented Jun 4, 2024

sdaitzman commented Jun 5, 2024

IvanStepanok commented Jun 5, 2024

rnr Jun 6, 2024

rnr Jun 6, 2024

rnr Jun 7, 2024

rnr Jun 7, 2024

openedx-webhooks commented Jun 7, 2024


		var controllers = navigationController.viewControllers

		if isCourseNestedListEnabled \|\| currentCourseTabSelection == CourseTab.dates.rawValue {

feat: [FC-0047] Course progress and collapsing sections #446

feat: [FC-0047] Course progress and collapsing sections #446

Conversation

IvanStepanok commented May 31, 2024 • edited Loading

Quick Preview

Pay attention ⚠️

openedx-webhooks commented May 31, 2024 • edited Loading

volodymyr-chekyrta commented May 31, 2024

volodymyr-chekyrta commented May 31, 2024

volodymyr-chekyrta left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

volodymyr-chekyrta commented May 31, 2024

IvanStepanok commented May 31, 2024

volodymyr-chekyrta left a comment

Choose a reason for hiding this comment

sdaitzman commented Jun 3, 2024

IvanStepanok commented Jun 4, 2024

sdaitzman commented Jun 5, 2024

IvanStepanok commented Jun 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openedx-webhooks commented Jun 7, 2024

IvanStepanok commented May 31, 2024 •

edited

Loading

openedx-webhooks commented May 31, 2024 •

edited

Loading