balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

LiveActivities design fix 2.0

Browse Source
This commit is contained in:
Geryy 2024-05-06 15:25:54 +02:00 committed by GitHub
parent 7cec2ff525
commit 9901251cfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 89 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
refilc/ios/livecard/livecard.swift
View File

@ -57,6 +57,12 @@ struct LockScreenLiveActivityView: View {
.font(.system(size: 15)) .font(.system(size: 15))
.bold() .bold()
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
} else if(context.state.title == "Szünet") {
Text(context.state.title)
.font(.body)
.bold()
.padding(.trailing, 90)
} else { } else {
Text(context.state.index + " " + context.state.title) Text(context.state.index + " " + context.state.title)
.font(.body) .font(.body)
@ -68,7 +74,7 @@ struct LockScreenLiveActivityView: View {
if (!context.state.subtitle.isEmpty) { if (!context.state.subtitle.isEmpty) {
Text(context.state.subtitle) Text(context.state.subtitle)
.italic() .italic()
.font(.caption) .font(.system(size: 13))
} }
} }
@ -79,6 +85,7 @@ struct LockScreenLiveActivityView: View {
} }
// Következő óra // Következő óra
if(context.state.nextSubject != "" && context.state.nextRoom != "") {
HStack { HStack {
Image(systemName: "arrow.right") Image(systemName: "arrow.right")
.resizable() .resizable()
@ -90,6 +97,12 @@ struct LockScreenLiveActivityView: View {
.font(.caption2) .font(.caption2)
} }
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
} else {
Spacer(minLength: 5)
Text("Ez az utolsó óra! Kitartást!")
.font(.system(size: 15))
}
} }
.padding(15) .padding(15)
@ -143,47 +156,80 @@ struct LiveCardWidget: Widget {
).progressViewStyle(.circular) ).progressViewStyle(.circular)
} }
} }
DynamicIslandExpandedRegion(.center) { DynamicIslandExpandedRegion(.center) {
VStack(alignment: .center) { VStack(alignment: .center) {
if(context.state.title.contains("Az első órádig")) { // Első óra előtti expanded DynamicIsland
Text("Az első órád:") if(context.state.title.contains("Az első órádig")) {
.font(.body) Text("Az első órád:")
.bold() .font(.body)
.padding(.leading, 15) .bold()
Text(context.state.nextSubject) .padding(.leading, 15)
.font(.body) Text(context.state.nextSubject)
.padding(.leading, 15) .font(.body)
.padding(.leading, 15)
Text("Ebben a teremben:") Text("Ebben a teremben:")
.font(.body) .font(.body)
.bold() .bold()
.padding(.leading, 15) .padding(.leading, 15)
Text(context.state.nextRoom) Text(context.state.nextRoom)
.font(.body) .font(.body)
.padding(.leading, 15) .padding(.leading, 15)
} else { } else if(context.state.title == "Szünet") {
Text(context.state.index + context.state.title) // Amikor szünet van, expanded DynamicIsland
.lineLimit(1) Text(context.state.title)
.font(.body) .lineLimit(1)
.bold() .font(.body)
.bold()
.padding(.leading, 15)
Text(context.state.subtitle) Spacer(minLength: 5)
.lineLimit(1) Text("Következő óra és terem:")
.font(.subheadline) .font(.system(size: 13))
Spacer(minLength: 5) .padding(.leading, 25)
Text(context.state.nextSubject)
.font(.caption)
.padding(.leading, 15)
Text(context.state.nextRoom)
.font(.caption2)
.padding(.leading, 15)
Text("Következő óra és terem:") } else {
.font(.system(size: 13)) // Amikor óra van, expanded DynamicIsland
Text(context.state.nextSubject) Text(context.state.index + context.state.title)
.font(.caption) .lineLimit(1)
Text(context.state.nextRoom) .font(.body)
.font(.caption2) .bold()
} .padding(.trailing, -35)
Text(context.state.subtitle)
.lineLimit(1)
.font(.subheadline)
.padding(.trailing, -50)
Spacer(minLength: 5)
if(context.state.nextRoom != "" && context.state.nextSubject != "") {
Text("Következő óra és terem:")
.font(.system(size: 13))
.padding(.trailing, -35)
Text(context.state.nextSubject)
.font(.caption)
.padding(.trailing, -35)
Text(context.state.nextRoom)
.font(.caption2)
.padding(.trailing, -35)
} else {
Text("Ez az utolsó óra! Kitartást!")
.font(.system(size: 14))
.padding(.trailing, -30)
}
}
}.padding(EdgeInsets(top: 0.0, leading: 5.0, bottom: 0.0, trailing: 0.0)) }.padding(EdgeInsets(top: 0.0, leading: 5.0, bottom: 0.0, trailing: 0.0))
} }
/// Compact /// Compact
} compactLeading: { } compactLeading: {