Skip to content

Fix issues 640, 641, 652 #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IvanStepanok merged 28 commits into from
May 28, 2026
Merged

Fix issues 640, 641, 652 #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b73c0c3
fix: resolve issue 581
Demian-Yushyn Jul 30, 2025
cc0e655
fix: update adjustments
Demian-Yushyn Jul 30, 2025
84a2156
fix: add timeout constant
Demian-Yushyn Jul 30, 2025
cd349b3
fix: adjust naming
Demian-Yushyn Jul 30, 2025
5aa8e55
fix: update connectivity
Demian-Yushyn Jul 30, 2025
64c59a1
fix: remove unused functions and hardcoded variables
Demian-Yushyn Jul 31, 2025
b4fcf31
fix: Removed unused functions and hardcoded variables
Demian-Yushyn Jul 31, 2025
253341d
Merge remote-tracking branch 'origin/fix/issue-581' into fix/issue-581
Demian-Yushyn Jul 31, 2025
6121c2a
fix: issue 581
Demian-Yushyn Jul 31, 2025
b26c3d7
fix: progress on issue 581
Demian-Yushyn Jul 31, 2025
f21a460
fix: apply updates
Demian-Yushyn Jul 31, 2025
14441a6
fix: update wi DI Config, thread fixes
Demian-Yushyn Jul 31, 2025
327bb30
fix: connectivity logic update
Demian-Yushyn Jul 31, 2025
a9074d0
fix: cacheValidity change
Demian-Yushyn Jul 31, 2025
dabc744
fix: unit tests update
Demian-Yushyn Aug 6, 2025
48d55bc
fix: removed team and coma
Demian-Yushyn Aug 6, 2025
786fa30
fix: removed extra comas
Demian-Yushyn Aug 6, 2025
a7475cd
Merge branch 'develop' into fix/issue-581
IvanStepanok Sep 16, 2025
0fce30b
fix: unit tests
Demian-Yushyn Sep 16, 2025
635c716
Merge branch 'develop' into fix/issue-581
Demian-Yushyn Oct 29, 2025
ad3f260
fix: removed state object warning
Demian-Yushyn Oct 29, 2025
39ace76
fix: update config
Demian-Yushyn Oct 29, 2025
8465734
Merge pull request #2 from raccoongang/fix/issue-581
IvanStepanok Nov 10, 2025
7196747
Merge branch 'openedx:develop' into develop
Demian-Yushyn Jan 28, 2026
b852394
Merge branch 'openedx:develop' into develop
Demian-Yushyn Feb 4, 2026
d702e00
Merge branch 'openedx:develop' into develop
Demian-Yushyn Mar 19, 2026
872b5ad
fix: ensure search field is focused on view appearance (issue-642)
Demian-Yushyn Apr 20, 2026
64efdc8
fix: improve tappable area for course vertical and sequential rows is…
Demian-Yushyn Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Course/Course/Presentation/Outline/CourseVertical/CourseVerticalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public struct CourseVerticalView: View {
// MARK: - Lessons list
ForEach(viewModel.verticals, id: \.id) { vertical in
if let index = viewModel.verticals.firstIndex(where: {$0.id == vertical.id}) {
HStack {
Button(action: {
let vertical = viewModel.verticals[index]
if let block = vertical.childs.first {
Expand All @@ -63,6 +62,7 @@ public struct CourseVerticalView: View {
)
}
}, label: {
HStack {
Group {
if vertical.completion == 1 {
CoreAssets.finished.swiftUIImage
Expand All @@ -81,15 +81,17 @@ public struct CourseVerticalView: View {
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity, alignment: .leading)
}.foregroundColor(Theme.Colors.textPrimary)
}).accessibilityElement(children: .ignore)
.accessibilityLabel(vertical.displayName)
Spacer()
Image(systemName: "chevron.right")
.flipsForRightToLeftLayoutDirection(true)
.flipsForRightToLeftLayoutDirection(true)
.padding(.vertical, 8)
}
.contentShape(Rectangle())
})
.accessibilityElement(children: .ignore)
.accessibilityLabel(vertical.displayName)
.padding(.horizontal, 36)
.padding(.vertical, 14)
.padding(.vertical, 14)
if index != viewModel.verticals.count - 1 {
Divider()
.frame(height: 1)
Expand Down
81 changes: 41 additions & 40 deletions Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,40 +222,40 @@ private struct SequentialRowView: View {

var body: some View {
VStack(alignment: .leading) {
HStack {
Button(
action: {
guard let courseVertical = sequential.childs.first else { return }
guard let block = courseVertical.childs.first else {
viewModel.router.showGatedContentError(url: courseVertical.webUrl)
return
}
viewModel.trackSequentialClicked(sequential)
if viewModel.config.uiComponents.courseDropDownNavigationEnabled {
viewModel.router.showCourseUnit(
courseName: viewModel.courseStructure?.displayName ?? "",
blockId: block.id,
courseID: viewModel.courseStructure?.id ?? "",
verticalIndex: 0,
chapters: course.childs,
chapterIndex: chapterIndex,
sequentialIndex: sequentialIndex,
showVideoNavigation: false,
courseVideoStructure: nil
)
} else {
viewModel.router.showCourseVerticalView(
courseID: viewModel.courseStructure?.id ?? "",
courseName: viewModel.courseStructure?.displayName ?? "",
title: sequential.displayName,
chapters: course.childs,
chapterIndex: chapterIndex,
sequentialIndex: sequentialIndex
)
}
},
label: {
Button(
action: {
guard let courseVertical = sequential.childs.first else { return }
guard let block = courseVertical.childs.first else {
viewModel.router.showGatedContentError(url: courseVertical.webUrl)
return
}

viewModel.trackSequentialClicked(sequential)
if viewModel.config.uiComponents.courseDropDownNavigationEnabled {
viewModel.router.showCourseUnit(
courseName: viewModel.courseStructure?.displayName ?? "",
blockId: block.id,
courseID: viewModel.courseStructure?.id ?? "",
verticalIndex: 0,
chapters: course.childs,
chapterIndex: chapterIndex,
sequentialIndex: sequentialIndex,
showVideoNavigation: false,
courseVideoStructure: nil
)
} else {
viewModel.router.showCourseVerticalView(
courseID: viewModel.courseStructure?.id ?? "",
courseName: viewModel.courseStructure?.displayName ?? "",
title: sequential.displayName,
chapters: course.childs,
chapterIndex: chapterIndex,
sequentialIndex: sequentialIndex
)
}
},
label: {
HStack {
VStack(alignment: .leading) {
HStack {
if sequential.completion == 1 {
Expand Down Expand Up @@ -286,14 +286,15 @@ private struct SequentialRowView: View {
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityElement(children: .ignore)
.accessibilityLabel(sequential.displayName)
Spacer()
if sequential.due != nil {
CoreAssets.chevronRight.swiftUIImage
.foregroundColor(Theme.Colors.textPrimary)
}
}
)
Spacer()
if sequential.due != nil {
CoreAssets.chevronRight.swiftUIImage
.foregroundColor(Theme.Colors.textPrimary)
.contentShape(Rectangle())
}
}
)
.padding(.vertical, 4)
}
}
Expand Down
7 changes: 5 additions & 2 deletions Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ public struct SearchView: View {
viewModel.isSearchActive = editing
}
).focused($focused)
.onAppear {
self.focused = true
.onFirstAppear {
Task { @MainActor in
try? await Task.sleep(for: .seconds(0.5))
self.focused = true
}
}
.foregroundColor(Theme.Colors.textInputTextColor)
.font(Theme.Fonts.bodyLarge)
Expand Down
Loading