Skip to content

Stabilize substitutions row alignment and dynamic sizing on class switch #5

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

Draft
Copilot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Stabilize substitutions row alignment and dynamic sizing on class switch #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions EffnerApp/Views/ContentViews/SubstitutionsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ struct SubstitutionRowView: View {
let isLast: Bool

var body: some View {
VStack() {
VStack(alignment: .leading, spacing: 4) {
HStack(alignment: .center) {
// Stunde
Text("\(substitution.period).")
.font(.title2)
.fontWeight(.bold)
.padding(.trailing, 4)
.frame(width: 40, alignment: .leading)

VStack(alignment: .leading, spacing: 2) {
// Lehrer und Vertretung
Expand Down Expand Up @@ -232,13 +232,15 @@ struct SubstitutionRowView: View {
}
}

if(substitution.klassName != session.user?.klasses.first) {
Spacer()
Spacer(minLength: 0)

if substitution.klassName != session.user?.primaryClass {
Text("\(substitution.klassName)")
.font(.callout)
.padding(.leading, 2)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 4)

if !isLast {
Expand Down