firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests 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
commit d2d36c3d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -43,7 +43,7 @@ Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a relea
**vrolandd, TMarccci:** head developer **vrolandd, TMarccci:** head developer
**dwe., xou, SebRHQ:** designer **dwe., xou:** designer
**Péter:** video editor **Péter:** video editor

1
filcnaplo/.gitignore vendored
View File

@ -27,6 +27,7 @@ migrate_working_dir/
.dart_tool/ .dart_tool/
.flutter-plugins .flutter-plugins
.flutter-plugins-dependencies .flutter-plugins-dependencies
.packages
.pub-cache/ .pub-cache/
.pub/ .pub/
/build/ /build/

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

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

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

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

8
filcnaplo/lib/api/providers/live_card_provider.dart
View File

@ -88,7 +88,7 @@ class LiveCardProvider extends ChangeNotifier {
// Debugging // Debugging
static DateTime _now() { static DateTime _now() {
// return DateTime(2023, 8, 31, 8, 0); // return DateTime(2023, 9, 27, 9, 30);
return DateTime.now(); return DateTime.now();
} }
@ -120,7 +120,7 @@ class LiveCardProvider extends ChangeNotifier {
"index": "index":
currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "", currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "",
"title": currentLesson != null "title": currentLesson != null
? ShortSubject.resolve(subject: currentLesson?.subject).capital() ? currentLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: currentLesson?.subject).capital()
: "", : "",
"subtitle": currentLesson?.room.replaceAll("_", " ") ?? "", "subtitle": currentLesson?.room.replaceAll("_", " ") ?? "",
"description": currentLesson?.description ?? "", "description": currentLesson?.description ?? "",
@ -131,7 +131,7 @@ class LiveCardProvider extends ChangeNotifier {
_delay.inMilliseconds) _delay.inMilliseconds)
.toString(), .toString(),
"nextSubject": nextLesson != null "nextSubject": nextLesson != null
? ShortSubject.resolve(subject: nextLesson?.subject).capital() ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
: "", : "",
"nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "", "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
}; };
@ -160,7 +160,7 @@ class LiveCardProvider extends ChangeNotifier {
_delay.inMilliseconds) _delay.inMilliseconds)
.toString(), .toString(),
"nextSubject": (nextLesson != null "nextSubject": (nextLesson != null
? ShortSubject.resolve(subject: nextLesson?.subject) ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
: "") : "")
.capital(), .capital(),
"nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "", "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",