devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Márton Kiss
2023-12-25 22:09:22 +01:00
committed by GitHub
parent 8ef2bee62e cd0c821bae
commit d2d36c3d0f
5 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filcnaplo/ios/Runner.xcodeproj/project.pbxproj
View File

@@ -253,9 +253,9 @@
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3127F74F28EAEC8A00C2EFB3 /* Embed Foundation Extensions */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
71459C0EB905E05018E3D78F /* [CP] Embed Pods Frameworks */,
3127F74F28EAEC8A00C2EFB3 /* Embed Foundation Extensions */,
);
buildRules = (
);

71
filcnaplo/ios/livecard/livecard.swift
View File

@@ -91,14 +91,15 @@ struct LockScreenLiveActivityView: View {
Text(timerInterval: lesson!.date, countsDown: true)
.multilineTextAlignment(.center)
.frame(width: 85)
.font(.title)
.font(.title2)
.monospacedDigit()
.padding(.trailing, CGFloat(24))
}
.activityBackgroundTint(
lesson!.color == "#676767"
? nil
: Color(hex: lesson!.color)
lesson!.color != "#676767"
? Color(hex: lesson!.color)
// Ha nem megy hat nem megy
: Color.clear
)
}
}
@@ -118,12 +119,22 @@ struct LiveCardWidget: Widget {
DynamicIslandExpandedRegion(.leading) {
VStack {
Spacer()
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(30), height: CGFloat(30))
.padding(.leading, CGFloat(6))
.padding(.bottom, CGFloat(6))
ProgressView(
timerInterval: lesson!.date,
countsDown: true,
label: {
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(32), height: CGFloat(32))
},
currentValueLabel: {
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(32), height: CGFloat(32))
}
).progressViewStyle(.circular)
}
}
DynamicIslandExpandedRegion(.center) {
@@ -136,7 +147,7 @@ struct LiveCardWidget: Widget {
Text(lesson!.description)
.lineLimit(2)
.font(.caption)
}
}.padding(EdgeInsets(top: 0.0, leading: 5.0, bottom: 0.0, trailing: 0.0))
}
DynamicIslandExpandedRegion(.trailing) {
VStack {
@@ -156,7 +167,8 @@ struct LiveCardWidget: Widget {
Image(systemName: lesson!.icon)
}
.font(.caption2)
} compactTrailing: {
}
compactTrailing: {
Text(timerInterval: lesson!.date, countsDown: true)
.multilineTextAlignment(.center)
.frame(width: 40)
@@ -164,22 +176,29 @@ struct LiveCardWidget: Widget {
/// Collapsed
} minimal: {
VStack(alignment: .center) {
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(12), height: CGFloat(12))
Text(timerInterval: lesson!.date, countsDown: true)
.multilineTextAlignment(.center)
.monospacedDigit()
.font(.system(size: CGFloat(10)))
}
VStack(alignment: .center, content: {
ProgressView(
timerInterval: lesson!.date,
countsDown: true,
label: {
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(12), height: CGFloat(12))
},
currentValueLabel: {
Image(systemName: lesson!.icon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: CGFloat(12), height: CGFloat(12))
}
).progressViewStyle(.circular)
})
}
.keylineTint(
lesson!.color == "#676767"
? nil
: Color(hex: lesson!.color)
lesson!.color != "#676767"
? Color(hex: lesson!.color)
: Color.clear
)
}
}