Skip to content

[MBL-19382][S] Student annotation toolbar #3860

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
vargaat merged 2 commits into from
Jan 27, 2026
Merged

[MBL-19382][S] Student annotation toolbar #3860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dfdc32
Use toolbar foregroundStyle
petkybenedek Jan 26, 2026
096ae34
Remove newline
petkybenedek Jan 26, 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
25 changes: 10 additions & 15 deletions ...ent/Student/Submissions/StudentAnnotationSubmission/StudentAnnotationSubmissionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,19 @@ public struct StudentAnnotationSubmissionView: View {
}

private var closeButton: some View {
Button(action: viewModel.closeTapped, label: {
Button(action: viewModel.closeTapped) {
Text(viewModel.navBar.closeButtonTitle)
.foregroundColor(.textLightest.variantForLightMode)
})
.toolbarItemForegroundStyle(.textLightest.variantForLightMode)
}
}

private var doneButton: some View {
Button(action: viewModel.postSubmission, label: {
// TODO: SwiftUIWorkaround
// If we use Text alone here then its font weight will be overridden by the nav bar but
// if we wrap it in a stack and add an image next to it we can customize the appearance.
HStack {
Image.assignmentLine.frame(width: 0, height: 0).clipped() // We don't want this image to be visible
Text(viewModel.doneButton.title)
.fontWeight(.semibold)
.foregroundColor(.textLightest.variantForLightMode)
.opacity(viewModel.doneButton.opacity)
}
}).disabled(viewModel.doneButton.isDisabled)
Button(action: viewModel.postSubmission) {
Text(viewModel.doneButton.title)
.fontWeight(.semibold)
.toolbarItemForegroundStyle(.textLightest.variantForLightMode)
.opacity(viewModel.doneButton.opacity)
}
.disabled(viewModel.doneButton.isDisabled)
}
}