Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions Horizon/Horizon/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,9 @@
},
"View your progress and scores on the Learn page." : {

},
"VIEWING ATTEMPT" : {

},
"Vilnius (+02:00/+03:00)" : {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ struct AssignmentDetails: View {
var body: some View {
ScrollViewReader { proxy in
ScrollView(showsIndicators: false) {
if let submission = viewModel.submission, viewModel.shouldShowViewAttempts {
viewAttemptText(attempt: submission.attempt)
}
topView
VStack(spacing: .huiSpaces.space24) {
topView
startQuizButton
introView
.id(viewModel.courseID)
Expand Down Expand Up @@ -81,6 +84,18 @@ struct AssignmentDetails: View {
}
}

private func viewAttemptText(attempt: Int) -> some View {
HStack(spacing: .huiSpaces.space2) {
Text("VIEWING ATTEMPT", bundle: .horizon)
Text(attempt.description)
}
.frame(maxWidth: .infinity)
.padding(.vertical, .huiSpaces.space8)
.foregroundStyle(Color.huiColors.surface.institution)
.background(Color.huiColors.surface.pagePrimary)
.huiTypography(.p2)
}

@ViewBuilder
private func mainContentView(proxy: ScrollViewProxy) -> some View {
if let submission = viewModel.submission, viewModel.hasSubmittedBefore {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ final class AssignmentDetailsViewModel {
private(set) var selectedSubmission: AssignmentSubmissionType = .text
private(set) var externalURL: URL?
private(set) var submissionProperties: SubmissionProperties?
private(set) var shouldShowViewAttempts = false
var isStartTyping = false
var assignmentPreference: AssignmentPreferenceKeyType?
var isSubmitButtonHidden: Bool {
Expand Down Expand Up @@ -169,6 +170,7 @@ final class AssignmentDetailsViewModel {
}
hasSubmittedBefore = true
submission = selectedSubmission
shouldShowViewAttempts = selectedSubmission != submissions.first
submissionProperties?.hasUnreadComments = hasUnreadComments(for: selectedSubmission?.attempt)
didLoadAssignment(submissionProperties)
}
Expand Down