From 7d1f4e992cea59483ec1837637bd82e21f1b8fe2 Mon Sep 17 00:00:00 2001 From: Tihanyi Marcell Date: Wed, 27 Sep 2023 21:47:24 +0200 Subject: [PATCH] Fixes --- .../ios/Runner.xcodeproj/project.pbxproj | 26 +++---- filcnaplo/ios/Runner/Runner.entitlements | 2 +- filcnaplo/ios/livecard/lesson_model.swift | 2 +- filcnaplo/ios/livecard/livecard.entitlements | 2 +- filcnaplo/ios/livecard/livecard.swift | 71 ++++++++++++------- .../lib/api/providers/live_card_provider.dart | 12 ++-- 6 files changed, 67 insertions(+), 48 deletions(-) diff --git a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj index 482cacc..d93b9f7 100644 --- a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj +++ b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj @@ -221,9 +221,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 = ( ); @@ -478,7 +478,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -488,7 +488,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -510,7 +510,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -526,7 +526,7 @@ MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -552,7 +552,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -567,7 +567,7 @@ ); MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -592,7 +592,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = livecard/Info.plist; @@ -607,7 +607,7 @@ ); MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -736,7 +736,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -746,7 +746,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -764,7 +764,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 195; - DEVELOPMENT_TEAM = 48XS7JAZB7; + DEVELOPMENT_TEAM = 4DKAF249F3; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = reFilc; @@ -774,7 +774,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 3.6.0; - PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo; + PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/filcnaplo/ios/Runner/Runner.entitlements b/filcnaplo/ios/Runner/Runner.entitlements index 36e7279..8e1d462 100644 --- a/filcnaplo/ios/Runner/Runner.entitlements +++ b/filcnaplo/ios/Runner/Runner.entitlements @@ -6,7 +6,7 @@ development com.apple.security.application-groups - group.refilcnaplo.livecard + group.refilc2.livecard diff --git a/filcnaplo/ios/livecard/lesson_model.swift b/filcnaplo/ios/livecard/lesson_model.swift index 7ca85b0..3f9e2d0 100644 --- a/filcnaplo/ios/livecard/lesson_model.swift +++ b/filcnaplo/ios/livecard/lesson_model.swift @@ -14,7 +14,7 @@ class LessonData { var nextRoom: String init?() { - let sharedDefault = UserDefaults(suiteName: "group.refilc.livecard")! + let sharedDefault = UserDefaults(suiteName: "group.refilc2.livecard")! self.color = sharedDefault.string(forKey: "color")! self.icon = sharedDefault.string(forKey: "icon")! diff --git a/filcnaplo/ios/livecard/livecard.entitlements b/filcnaplo/ios/livecard/livecard.entitlements index 36e7279..8e1d462 100644 --- a/filcnaplo/ios/livecard/livecard.entitlements +++ b/filcnaplo/ios/livecard/livecard.entitlements @@ -6,7 +6,7 @@ development com.apple.security.application-groups - group.refilcnaplo.livecard + group.refilc2.livecard diff --git a/filcnaplo/ios/livecard/livecard.swift b/filcnaplo/ios/livecard/livecard.swift index ab37a77..f873311 100644 --- a/filcnaplo/ios/livecard/livecard.swift +++ b/filcnaplo/ios/livecard/livecard.swift @@ -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 ) } } diff --git a/filcnaplo/lib/api/providers/live_card_provider.dart b/filcnaplo/lib/api/providers/live_card_provider.dart index 7f126d4..b21691f 100644 --- a/filcnaplo/lib/api/providers/live_card_provider.dart +++ b/filcnaplo/lib/api/providers/live_card_provider.dart @@ -55,7 +55,7 @@ class LiveCardProvider extends ChangeNotifier { } if (value) { - _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard"); + _liveActivitiesPlugin.init(appGroupId: "group.refilc2.livecard"); _liveActivitiesPlugin.getAllActivitiesIds().then((value) { _latestActivityId = value.isNotEmpty ? value.first : null; @@ -88,8 +88,8 @@ class LiveCardProvider extends ChangeNotifier { // Debugging static DateTime _now() { - // return DateTime(2023, 8, 31, 8, 0); - return DateTime.now(); + return DateTime(2023, 9, 27, 9, 30); + // return DateTime.now(); } String getFloorDifference() { @@ -120,7 +120,7 @@ class LiveCardProvider extends ChangeNotifier { "index": currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "", "title": currentLesson != null - ? ShortSubject.resolve(subject: currentLesson?.subject).capital() + ? currentLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: currentLesson?.subject).capital() : "", "subtitle": currentLesson?.room.replaceAll("_", " ") ?? "", "description": currentLesson?.description ?? "", @@ -131,7 +131,7 @@ class LiveCardProvider extends ChangeNotifier { _delay.inMilliseconds) .toString(), "nextSubject": nextLesson != null - ? ShortSubject.resolve(subject: nextLesson?.subject).capital() + ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital() : "", "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "", }; @@ -160,7 +160,7 @@ class LiveCardProvider extends ChangeNotifier { _delay.inMilliseconds) .toString(), "nextSubject": (nextLesson != null - ? ShortSubject.resolve(subject: nextLesson?.subject) + ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital() : "") .capital(), "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",