Skip to content
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

Jump to bottom

fix: shift due dates banner overlap #55

Merged
merged 2 commits into from
Jul 30, 2024
Merged

fix: shift due dates banner overlap #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c449a00
fix: shift due dates banner overlap
forgotvas Jul 29, 2024
89e92c0
chore: fix settings button for iOS 15
forgotvas Jul 29, 2024
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
3 changes: 2 additions & 1 deletion Course/Course/Presentation/Outline/CourseOutlineView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ public struct CourseOutlineView: View {
if let courseDeadlineInfo = viewModel.courseDeadlineInfo,
courseDeadlineInfo.datesBannerInfo.status == .resetDatesBanner,
!courseDeadlineInfo.hasEnded,
!isVideo {
!isVideo,
!viewModel.isShowProgress {
DatesStatusInfoView(
datesBannerInfo: courseDeadlineInfo.datesBannerInfo,
courseID: courseID,
Expand Down
4 changes: 3 additions & 1 deletion OpenEdX/View/MainScreenView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ struct MainScreenView: View {
}
.accentColor(Theme.Colors.accentXColor)
.introspect(.viewController, on: .iOS(.v15)) { controller in
controller.navigationController?.setNavigationBarHidden(true, animated: false)
if viewModel.selection != .profile {
controller.navigationController?.setNavigationBarHidden(true, animated: false)
}
Comment on lines +191 to +193
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forgotvas Is this change related to the mentioned issue?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that change related to profile icon issue on profile tab on iOS 15 it disappears when you go to settings and then go back to profile. So just fixed in that PR too. Added to description.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the issue is also with the parsing, app is expecting, "account_privacy": "private" but server is returning "account_privacy": "PRIVATE".

Can you look into it under the same PR or should create a separate ticket for it.

Credentials: rtester97/Fedx1234

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added in #59

}
}

Expand Down
Loading