Unit progress navigation style #258

rnr · 2024-01-25T12:43:22Z

This PR is for next issues:

Added a progress bar at the top of the content screen. Each block can have one of four states:

selected completed
selected incomplete
completed unselected
incomplete unselected

If the progress line is present, the navigation style changes from vertical to horizontal.
This was done with COURSE_UNIT_PROGRESS_ENABLED FF - please use the configuration branch https://github.com/edx/edx-mobile-config/tree/saeed/openedX

Screen.Recording.2024-01-25.at.13.37.01.mov

# Conflicts: # Core/Core/Configuration/Config/UIComponentsConfig.swift # Course/Course.xcodeproj/project.pbxproj

# Conflicts: # Core/Core.xcodeproj/project.pbxproj # Core/Core/Configuration/Config/UIComponentsConfig.swift # Core/Core/View/Base/WebUnitView.swift # Core/Core/View/Base/Webview/WebView.swift # Course/Course/Presentation/Unit/CourseUnitView.swift # Course/Course/Presentation/Unit/Subviews/WebView.swift # Theme/Theme/Theme.swift

chore: added one more state and change inset what fixes dark mode

set next and prev buttons in unit content to be horizontal if COURSE_UNIT_PROGRESS_ENABLED key is true

set next and prev animation in unit content to be horizontal if COURSE_UNIT_PROGRESS_ENABLED key is true

Feat/unit animation

…ps://github.com/touchapp/openedx-app-ios into fixed_rounded_corners_and_progress_line_padding

…ss_line_padding Fixed rounded corners and progress line padding

saeedbashir

Shouldn't the arrow icon on the previous button in the unit navigation be on the left side of the text?

saeedbashir · 2024-01-30T13:14:41Z

Core/Core/Configuration/Config/UIComponentsConfig.swift

    public var courseTopTabBarEnabled: Bool

    init(dictionary: [String: Any]) {
        courseNestedListEnabled = dictionary[Keys.courseNestedListEnabled.rawValue] as? Bool ?? false
        courseBannerEnabled = dictionary[Keys.courseBannerEnabled.rawValue] as? Bool ?? false
+        courseUnitProgressEnabled = dictionary[Keys.courseUnitProgressEnabled.rawValue] as? Bool ?? false


The Keys enum can implement protocol RawStringExtractable so that values can be extracted without mentioning the .rawValue from dictionary.

saeedbashir · 2024-01-30T13:17:47Z

Core/Core/Providers/Ajax/AjaxProvider.swift

+public extension NSNotification {
+    static let blockCompletion = Notification.Name.init("block_completion")
+}


Notifications are centralized in Core/Notification.swift. Can you please move this notification to there as well.

saeedbashir · 2024-01-30T13:24:45Z

Core/Core/View/Base/Webview/WebView.swift

@@ -34,61 +35,134 @@ public struct WebView: UIViewRepresentable {
    var webViewNavDelegate: WebViewNavigationDelegate?

    var refreshCookies: () async -> Void
-
+    var isAddAjaxCallbackScript: Bool


How about renaming it to addAjaxCallbackScript thoughts?

saeedbashir · 2024-01-30T13:27:54Z

Core/Core/View/Base/Webview/WebView.swift

@@ -20,6 +20,7 @@ public struct WebView: UIViewRepresentable {

        @Published var url: String
        let baseURL: String
+        let ajaxProvider = AjaxProvider()


I'm not sure whether we need to specify access levelfileprivate here or not because we are not using it for other variables, what do you think?

saeedbashir · 2024-01-30T13:30:11Z

Course/Course/Presentation/Unit/CourseUnitView.swift

+public extension NSNotification {
+    static let blockChanged = Notification.Name.init("block_changed")
+}
+


Please move this notification to Core/Notifications.

saeedbashir · 2024-01-30T13:35:26Z

Course/Course/Presentation/Video/VideoPlayerViewModel.swift

@@ -31,7 +31,9 @@ public class VideoPlayerViewModel: ObservableObject {
            showError = errorMessage != nil
        }
    }
-
+
+    public var didUnitCompletion: (() -> Void)?


Unused code can be removed.

fix: previous button for horizontal navigation

rnr · 2024-01-30T20:22:27Z

Shouldn't the arrow icon on the `previous` button in the unit navigation be on the left side of the text?

thank you for the highlighting
fixed

Chore/ajax refactor

saeedbashir · 2024-02-01T11:44:14Z

The progress gets lost in the same run if go back and come to the same screen.

Screen.Recording.2024-02-01.at.4.42.05.PM.mov

# Conflicts: # Podfile.lock # Theme/Theme/SwiftGen/ThemeAssets.swift # Theme/Theme/Theme.swift

# Conflicts: # Core/Core/Domain/Model/CourseBlockModel.swift # Course/Course.xcodeproj/project.pbxproj # Course/Course/Presentation/Container/CourseContainerViewModel.swift # Course/Course/Presentation/Outline/CourseOutlineView.swift # Course/Course/Presentation/Unit/CourseUnitView.swift

saeedbashir · 2024-02-02T04:48:55Z

Course/Course/Presentation/Unit/CourseUnitView.swift

+                        if viewModel.blockChanged {
+                            NotificationCenter.default.post(
+                                name: .onRefreshCourse,
+                                object: nil
+                            )
+                        }


@eyatsenkoperpetio In which case this notification gets posted, I've checked this isn't calling when setting the blockChanged = true?

saeedbashir

LGTM 👍

volodymyr-chekyrta · 2024-02-02T14:11:19Z

🚀 🚀 🚀

eyatsenkoperpetio and others added 21 commits December 11, 2023 13:26

chore: add lesson line progress view

ab96cc7

chore: add colors and config to course unit view model

33b59a1

chore: add ajax provider and refactor code, fix crash on Config resolve

4507540

Merge branch 'develop' into feat/unit_progress

4de4be1

# Conflicts: # Core/Core/Configuration/Config/UIComponentsConfig.swift # Course/Course.xcodeproj/project.pbxproj

chore: update when back if some changed

bafaff0

chore: hide progress dots when line show

3352528

chore: padding and separate views

ededc14

chore: added one more state and change inset what fixes dark mode

fd16f64

Merge pull request #7 from touchapp/feat/unit_progress_line_improvements

96e5d72

chore: added one more state and change inset what fixes dark mode

fix: arrow buttons in unit content

9154c48

set next and prev buttons in unit content to be horizontal if COURSE_UNIT_PROGRESS_ENABLED key is true

fix: animation

ee9723e

set next and prev animation in unit content to be horizontal if COURSE_UNIT_PROGRESS_ENABLED key is true

fix: different navigation stacks

5cf0197

fix: offset in landscape mode

1a31646

fix: offset on orientation change

7f3c4a2

fix: unit tests

bfd5507

Merge pull request #8 from touchapp/feat/unit-animation

9079d30

Feat/unit animation

Merge branch 'develop' into feat/unit_progress

1fc1863

chore: fixed warnings

5c5ba04

chore: fixed warnings

462fa00

Merge branch 'develop' into feat/unit_progress

c0a6184

rnr requested review from saeedbashir and volodymyr-chekyrta January 25, 2024 12:43

rnr and others added 7 commits January 26, 2024 17:22

chore: fixed rounded corners and padding for progress line

5d18fdf

fix: paddings

9ff5efa

Merge pull request #9 from touchapp/fix/unit_progress

2f85376

chore: moved rounded corners to view extension

1b01de7

chore: delete unused code

59ea2f7

fix: use full width if we are using horizontal navigation

d88becc

Merge branch 'fixed_rounded_corners_and_progress_line_padding' of htt…

b939721

…ps://github.com/touchapp/openedx-app-ios into fixed_rounded_corners_and_progress_line_padding

rnr and others added 4 commits January 29, 2024 11:46

Merge pull request #10 from touchapp/fixed_rounded_corners_and_progre…

cce4537

…ss_line_padding Fixed rounded corners and progress line padding

chore: refactor of ajax completion handler

23cb12f

chore: warning fix

d2abb01

chore: added forMainFrameOnly parameter

18d6f44

saeedbashir requested changes Jan 30, 2024

View reviewed changes

forgotvas and others added 2 commits January 30, 2024 17:24

fix: previous button for horizontal navigation

ca3b9cf

Merge pull request #12 from touchapp/fix/prev-button

d2adf89

fix: previous button for horizontal navigation

Merge pull request #11 from touchapp/chore/ajax-refactor

b7c45a7

Chore/ajax refactor

eyatsenkoperpetio added 5 commits February 1, 2024 13:26

chore: resolve PR comments

554c4e5

chore: update course struct after complete unit

e5af1a7

Merge branch 'develop' into feat/unit_progress

3524328

# Conflicts: # Podfile.lock # Theme/Theme/SwiftGen/ThemeAssets.swift # Theme/Theme/Theme.swift

chore: down up dropdown button

b91cf6d

saeedbashir reviewed Feb 2, 2024

View reviewed changes

chore: remove refresh course

79378bc

saeedbashir approved these changes Feb 2, 2024

View reviewed changes

volodymyr-chekyrta approved these changes Feb 2, 2024

View reviewed changes

volodymyr-chekyrta merged commit 02fcec9 into openedx:develop Feb 2, 2024
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unit progress navigation style #258

Unit progress navigation style #258

rnr commented Jan 25, 2024 •

edited

Loading

saeedbashir left a comment

saeedbashir Jan 30, 2024 •

edited

Loading

saeedbashir Jan 30, 2024

saeedbashir Jan 30, 2024

saeedbashir Jan 30, 2024

saeedbashir Jan 30, 2024

saeedbashir Jan 30, 2024

rnr commented Jan 30, 2024

saeedbashir commented Feb 1, 2024

saeedbashir Feb 2, 2024

saeedbashir left a comment

volodymyr-chekyrta commented Feb 2, 2024

Unit progress navigation style #258

Unit progress navigation style #258

Conversation

rnr commented Jan 25, 2024 • edited Loading

saeedbashir left a comment

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024 • edited Loading

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024

Choose a reason for hiding this comment

saeedbashir Jan 30, 2024

Choose a reason for hiding this comment

rnr commented Jan 30, 2024

saeedbashir commented Feb 1, 2024

saeedbashir Feb 2, 2024

Choose a reason for hiding this comment

saeedbashir left a comment

Choose a reason for hiding this comment

volodymyr-chekyrta commented Feb 2, 2024

rnr commented Jan 25, 2024 •

edited

Loading

saeedbashir Jan 30, 2024 •

edited

Loading