diff --git a/filcnaplo/ios/Podfile.lock b/filcnaplo/ios/Podfile.lock index dbad45e..11f2eb0 100644 --- a/filcnaplo/ios/Podfile.lock +++ b/filcnaplo/ios/Podfile.lock @@ -39,10 +39,6 @@ PODS: - Flutter (1.0.0) - flutter_custom_tabs (0.0.1): - Flutter - - flutter_foreground_task (0.0.1): - - Flutter - - flutter_local_notifications (0.0.1): - - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) @@ -62,8 +58,6 @@ PODS: - SDWebImage/Core (5.13.2) - share_plus (0.0.1): - Flutter - - shared_preferences_ios (0.0.1): - - Flutter - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) @@ -77,15 +71,12 @@ DEPENDENCIES: - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - flutter_custom_tabs (from `.symlinks/plugins/flutter_custom_tabs/ios`) - - flutter_foreground_task (from `.symlinks/plugins/flutter_foreground_task/ios`) - - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - live_activities (from `.symlinks/plugins/live_activities/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -108,10 +99,6 @@ EXTERNAL SOURCES: :path: Flutter flutter_custom_tabs: :path: ".symlinks/plugins/flutter_custom_tabs/ios" - flutter_foreground_task: - :path: ".symlinks/plugins/flutter_foreground_task/ios" - flutter_local_notifications: - :path: ".symlinks/plugins/flutter_local_notifications/ios" live_activities: :path: ".symlinks/plugins/live_activities/ios" open_file: @@ -124,8 +111,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/quick_actions_ios/ios" share_plus: :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher_ios: @@ -143,18 +128,15 @@ SPEC CHECKSUMS: file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89 - flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 - flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce - quick_actions_ios: 5ec8f5f1ae81512ac803fe10c197ebb875767a9e + quick_actions_ios: 56c03753992beabaa6c598e470e12d430d6e5e2f ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de diff --git a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj index f372c0d..53e3853 100644 --- a/filcnaplo/ios/Runner.xcodeproj/project.pbxproj +++ b/filcnaplo/ios/Runner.xcodeproj/project.pbxproj @@ -498,6 +498,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MYUTW2GF6J; @@ -518,6 +519,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo.livecard; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; @@ -537,6 +539,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MYUTW2GF6J; @@ -556,6 +559,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo.livecard; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -574,6 +578,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MYUTW2GF6J; @@ -593,6 +598,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo.livecard; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/filcnaplo/ios/Runner/AppDelegate.swift b/filcnaplo/ios/Runner/AppDelegate.swift index e265c10..2c4c46e 100644 --- a/filcnaplo/ios/Runner/AppDelegate.swift +++ b/filcnaplo/ios/Runner/AppDelegate.swift @@ -10,7 +10,7 @@ import Flutter GeneratedPluginRegistrant.register(with: self) // here, Without this code the task will not work. - SwiftFlutterForegroundTaskPlugin.setPluginRegistrantCallback(registerPlugins) + //SwiftFlutterForegroundTaskPlugin.setPluginRegistrantCallback(registerPlugins) if #available(iOS 10.0, *) { UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate } @@ -22,4 +22,4 @@ import Flutter // here func registerPlugins(registry: FlutterPluginRegistry) { GeneratedPluginRegistrant.register(with: registry) -} \ No newline at end of file +} diff --git a/filcnaplo/ios/Runner/Runner-Bridging-Header.h b/filcnaplo/ios/Runner/Runner-Bridging-Header.h index 10e9f02..308a2a5 100644 --- a/filcnaplo/ios/Runner/Runner-Bridging-Header.h +++ b/filcnaplo/ios/Runner/Runner-Bridging-Header.h @@ -1,2 +1 @@ #import "GeneratedPluginRegistrant.h" -#import diff --git a/filcnaplo/lib/ui/filter/widgets/grades.dart b/filcnaplo/lib/ui/filter/widgets/grades.dart index 111826b..888c45d 100644 --- a/filcnaplo/lib/ui/filter/widgets/grades.dart +++ b/filcnaplo/lib/ui/filter/widgets/grades.dart @@ -8,7 +8,7 @@ import 'package:filcnaplo_desktop_ui/common/widgets/grade/grade_viewable.dart' a List getWidgets(List providerGrades, DateTime? lastSeenDate) { List items = []; for (var grade in providerGrades) { - if (grade.type == GradeType.midYear && !(lastSeenDate != null && grade.date.isAfter(lastSeenDate))) { + if (grade.type == GradeType.midYear && (!(lastSeenDate != null && grade.date.isAfter(lastSeenDate)) || grade.value.value == 0)) { items.add(DateWidget( key: grade.id, date: grade.date, @@ -23,7 +23,7 @@ List getNewWidgets(List providerGrades, DateTime? lastSeenDat List items = []; List newGrades = []; for (var grade in providerGrades) { - if (grade.type == GradeType.midYear && !(lastSeenDate != null && !grade.date.isAfter(lastSeenDate))) { + if (grade.type == GradeType.midYear && !(lastSeenDate != null && !grade.date.isAfter(lastSeenDate)) && grade.value.value != 0) { newGrades.add(grade); } }