diff --git a/.github/workflows/default_workflow.yml b/.github/workflows/default_workflow.yml index 83317d6..a20d262 100644 --- a/.github/workflows/default_workflow.yml +++ b/.github/workflows/default_workflow.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.x' + flutter-version: '3.19' channel: 'stable' cache: true diff --git a/android/app/build.gradle b/android/app/build.gradle index 30d9c17..e99dc19 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -12,11 +18,6 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -27,12 +28,8 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 33 + compileSdkVersion 34 ndkVersion flutter.ndkVersion compileOptions { @@ -51,7 +48,7 @@ android { defaultConfig { applicationId "com.opennutritracker.ont.opennutritracker" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -77,5 +74,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" } diff --git a/android/build.gradle b/android/build.gradle index e394c2e..bc157bd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.8.22' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cb24abd..ceccc3a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bc..07a4ad1 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,26 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.1.2" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false +} + +include ":app" diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/ios/Podfile b/ios/Podfile index 3c6dbb6..c236dc0 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f94ecee..1fd8270 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -6,10 +6,7 @@ PODS: - Flutter - flutter_secure_storage (6.0.0): - Flutter - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - GoogleDataTransport (9.2.5): + - GoogleDataTransport (9.3.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) @@ -30,11 +27,11 @@ PODS: - GoogleToolboxForMac/Defines (= 2.3.2) - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)" - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)" - - GoogleUtilities/Environment (7.11.5): + - GoogleUtilities/Environment (7.12.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.5): + - GoogleUtilities/Logger (7.12.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (7.11.5): + - GoogleUtilities/UserDefaults (7.12.0): - GoogleUtilities/Logger - GoogleUtilitiesComponents (1.1.0): - GoogleUtilities/Logger @@ -57,27 +54,27 @@ PODS: - GTMSessionFetcher/Core (< 3.0, >= 1.1) - MLImage (= 1.0.0-beta4) - MLKitCommon (~> 9.0) - - mobile_scanner (3.2.0): + - mobile_scanner (3.5.6): - Flutter - GoogleMLKit/BarcodeScanning (~> 4.0.0) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) + - nanopb (2.30909.1): + - nanopb/decode (= 2.30909.1) + - nanopb/encode (= 2.30909.1) + - nanopb/decode (2.30909.1) + - nanopb/encode (2.30909.1) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - PromisesObjC (2.3.1) - - Sentry/HybridSDK (8.9.1): - - SentryPrivate (= 8.9.1) + - Sentry/HybridSDK (8.20.0): + - SentryPrivate (= 8.20.0) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.9.1) - - SentryPrivate (8.9.1) + - Sentry/HybridSDK (= 8.20.0) + - SentryPrivate (8.20.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -85,7 +82,7 @@ PODS: - Flutter - sqflite (0.0.3): - Flutter - - FMDB (>= 2.7.5) + - FlutterMacOS - url_launcher_ios (0.0.1): - Flutter - webview_flutter_wkwebview (0.0.1): @@ -102,13 +99,12 @@ DEPENDENCIES: - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) + - sqflite (from `.symlinks/plugins/sqflite/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) SPEC REPOS: trunk: - - FMDB - GoogleDataTransport - GoogleMLKit - GoogleToolboxForMac @@ -146,7 +142,7 @@ EXTERNAL SOURCES: sign_in_with_apple: :path: ".symlinks/plugins/sign_in_with_apple/ios" sqflite: - :path: ".symlinks/plugins/sqflite/ios" + :path: ".symlinks/plugins/sqflite/darwin" url_launcher_ios: :path: ".symlinks/plugins/url_launcher_ios/ios" webview_flutter_wkwebview: @@ -154,34 +150,33 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875 - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 + GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 - GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 + GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505 MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390 MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49 - mobile_scanner: 47056db0c04027ea5f41a716385542da28574662 - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + mobile_scanner: 38dcd8a49d7d485f632b7de65e4900010187aef2 + nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 + package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - Sentry: e3203780941722a1fcfee99e351de14244c7f806 - sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c - SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + Sentry: a8d7b373b9f9868442b02a0c425192f693103cbf + sentry_flutter: 03e7660857a8cdb236e71456a7e8447b65c8a788 + SentryPrivate: 006b24af16828441f70e2ab6adf241bd0a8ad130 + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 - sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 - webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a + sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec + url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 -PODFILE CHECKSUM: aa3b1d9cb94e8055dc6468141196cf9e4c8e33df +PODFILE CHECKSUM: e60e17f8bfffff789408fce3f968c37c5c63400e -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d828e5c..c0b7414 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -342,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -428,7 +428,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -477,7 +477,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a..5e31d3d 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ createState() => _MainScreenState(); diff --git a/lib/core/presentation/widgets/activity_vertial_list.dart b/lib/core/presentation/widgets/activity_vertial_list.dart index 39590bf..02e69fa 100644 --- a/lib/core/presentation/widgets/activity_vertial_list.dart +++ b/lib/core/presentation/widgets/activity_vertial_list.dart @@ -12,12 +12,11 @@ class ActivityVerticalList extends StatelessWidget { final Function(BuildContext, UserActivityEntity) onItemLongPressedCallback; const ActivityVerticalList( - {Key? key, + {super.key, required this.day, required this.title, required this.userActivityList, - required this.onItemLongPressedCallback}) - : super(key: key); + required this.onItemLongPressedCallback}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/add_item_bottom_sheet.dart b/lib/core/presentation/widgets/add_item_bottom_sheet.dart index 55b9ca0..5037d93 100644 --- a/lib/core/presentation/widgets/add_item_bottom_sheet.dart +++ b/lib/core/presentation/widgets/add_item_bottom_sheet.dart @@ -10,7 +10,7 @@ import 'package:opennutritracker/generated/l10n.dart'; class AddItemBottomSheet extends StatelessWidget { final DateTime day; - const AddItemBottomSheet({Key? key, required this.day}) : super(key: key); + const AddItemBottomSheet({super.key, required this.day}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/app_banner_version.dart b/lib/core/presentation/widgets/app_banner_version.dart index b49bfe2..0f3170f 100644 --- a/lib/core/presentation/widgets/app_banner_version.dart +++ b/lib/core/presentation/widgets/app_banner_version.dart @@ -5,8 +5,7 @@ import 'package:opennutritracker/generated/l10n.dart'; class AppBannerVersion extends StatelessWidget { final String versionNumber; - const AppBannerVersion({Key? key, required this.versionNumber}) - : super(key: key); + const AppBannerVersion({super.key, required this.versionNumber}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/delete_dialog.dart b/lib/core/presentation/widgets/delete_dialog.dart index 8958cee..8aefafc 100644 --- a/lib/core/presentation/widgets/delete_dialog.dart +++ b/lib/core/presentation/widgets/delete_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:opennutritracker/generated/l10n.dart'; class DeleteDialog extends StatelessWidget { - const DeleteDialog({Key? key}) : super(key: key); + const DeleteDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/disclaimer_dialog.dart b/lib/core/presentation/widgets/disclaimer_dialog.dart index 8636c07..f26cd47 100644 --- a/lib/core/presentation/widgets/disclaimer_dialog.dart +++ b/lib/core/presentation/widgets/disclaimer_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:opennutritracker/generated/l10n.dart'; class DisclaimerDialog extends StatelessWidget { - const DisclaimerDialog({Key? key}) : super(key: key); + const DisclaimerDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/error_dialog.dart b/lib/core/presentation/widgets/error_dialog.dart index b2ba9a9..9ecbd13 100644 --- a/lib/core/presentation/widgets/error_dialog.dart +++ b/lib/core/presentation/widgets/error_dialog.dart @@ -6,8 +6,7 @@ class ErrorDialog extends StatelessWidget { final VoidCallback onRefreshPressed; const ErrorDialog( - {Key? key, required this.errorText, required this.onRefreshPressed}) - : super(key: key); + {super.key, required this.errorText, required this.onRefreshPressed}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/home_appbar.dart b/lib/core/presentation/widgets/home_appbar.dart index 9569e47..5e541f6 100644 --- a/lib/core/presentation/widgets/home_appbar.dart +++ b/lib/core/presentation/widgets/home_appbar.dart @@ -4,7 +4,7 @@ import 'package:opennutritracker/core/utils/navigation_options.dart'; import 'package:opennutritracker/generated/l10n.dart'; class HomeAppbar extends StatelessWidget implements PreferredSizeWidget { - const HomeAppbar({Key? key}) : super(key: key); + const HomeAppbar({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/info_dialog.dart b/lib/core/presentation/widgets/info_dialog.dart index bffccbe..bbb2a01 100644 --- a/lib/core/presentation/widgets/info_dialog.dart +++ b/lib/core/presentation/widgets/info_dialog.dart @@ -5,8 +5,7 @@ class InfoDialog extends StatelessWidget { final String title; final String body; - const InfoDialog({Key? key, required this.title, required this.body}) - : super(key: key); + const InfoDialog({super.key, required this.title, required this.body}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/intake_card.dart b/lib/core/presentation/widgets/intake_card.dart index cbbdeb2..b8414d9 100644 --- a/lib/core/presentation/widgets/intake_card.dart +++ b/lib/core/presentation/widgets/intake_card.dart @@ -11,11 +11,10 @@ class IntakeCard extends StatelessWidget { final bool firstListElement; const IntakeCard( - {required Key? key, + {required super.key, required this.intake, required this.onItemLongPressed, - required this.firstListElement}) - : super(key: key); + required this.firstListElement}); @override Widget build(BuildContext context) { diff --git a/lib/core/presentation/widgets/main_appbar.dart b/lib/core/presentation/widgets/main_appbar.dart index 3586922..78ca754 100644 --- a/lib/core/presentation/widgets/main_appbar.dart +++ b/lib/core/presentation/widgets/main_appbar.dart @@ -5,8 +5,7 @@ class MainAppbar extends StatelessWidget implements PreferredSizeWidget { final String title; final IconData iconData; - const MainAppbar({Key? key, required this.title, required this.iconData}) - : super(key: key); + const MainAppbar({super.key, required this.title, required this.iconData}); @override Widget build(BuildContext context) { diff --git a/lib/core/utils/custom_icons.dart b/lib/core/utils/custom_icons.dart index 42eb16b..352a135 100644 --- a/lib/core/utils/custom_icons.dart +++ b/lib/core/utils/custom_icons.dart @@ -18,6 +18,7 @@ /// Homepage: https://design.google.com/icons/ /// // ignore_for_file: constant_identifier_names +// ignore_for_file: dangling_library_doc_comments import 'package:flutter/widgets.dart'; diff --git a/lib/features/activity_detail/activity_detail_screen.dart b/lib/features/activity_detail/activity_detail_screen.dart index 4bc69e0..7117c71 100644 --- a/lib/features/activity_detail/activity_detail_screen.dart +++ b/lib/features/activity_detail/activity_detail_screen.dart @@ -15,7 +15,7 @@ import 'package:opennutritracker/features/home/presentation/bloc/home_bloc.dart' import 'package:opennutritracker/generated/l10n.dart'; class ActivityDetailScreen extends StatefulWidget { - const ActivityDetailScreen({Key? key}) : super(key: key); + const ActivityDetailScreen({super.key}); @override State createState() => _ActivityDetailScreenState(); diff --git a/lib/features/activity_detail/presentation/widget/activity_detail_bottom_sheet.dart b/lib/features/activity_detail/presentation/widget/activity_detail_bottom_sheet.dart index af378f3..720c4f9 100644 --- a/lib/features/activity_detail/presentation/widget/activity_detail_bottom_sheet.dart +++ b/lib/features/activity_detail/presentation/widget/activity_detail_bottom_sheet.dart @@ -11,12 +11,11 @@ class ActivityDetailBottomSheet extends StatefulWidget { final ActivityDetailBloc activityDetailBloc; const ActivityDetailBottomSheet( - {Key? key, + {super.key, required this.onAddButtonPressed, required this.quantityTextController, required this.activityEntity, - required this.activityDetailBloc}) - : super(key: key); + required this.activityDetailBloc}); @override State createState() => diff --git a/lib/features/activity_detail/presentation/widget/activity_info_button.dart b/lib/features/activity_detail/presentation/widget/activity_info_button.dart index a95f5ce..7104ce7 100644 --- a/lib/features/activity_detail/presentation/widget/activity_info_button.dart +++ b/lib/features/activity_detail/presentation/widget/activity_info_button.dart @@ -4,7 +4,7 @@ import 'package:opennutritracker/generated/l10n.dart'; import 'package:url_launcher/url_launcher.dart'; class ActivityInfoButton extends StatelessWidget { - const ActivityInfoButton({Key? key}) : super(key: key); + const ActivityInfoButton({super.key}); final url = URLConst.paCompendium2011URL; diff --git a/lib/features/add_activity/presentation/add_activity_screen.dart b/lib/features/add_activity/presentation/add_activity_screen.dart index 9080a8f..1b53e14 100644 --- a/lib/features/add_activity/presentation/add_activity_screen.dart +++ b/lib/features/add_activity/presentation/add_activity_screen.dart @@ -9,7 +9,7 @@ import 'package:opennutritracker/features/add_meal/presentation/widgets/no_resul import 'package:opennutritracker/generated/l10n.dart'; class AddActivityScreen extends StatefulWidget { - const AddActivityScreen({Key? key}) : super(key: key); + const AddActivityScreen({super.key}); @override State createState() => _AddActivityScreenState(); diff --git a/lib/features/add_activity/presentation/widgets/activity_item_card.dart b/lib/features/add_activity/presentation/widgets/activity_item_card.dart index 9084264..7af04a9 100644 --- a/lib/features/add_activity/presentation/widgets/activity_item_card.dart +++ b/lib/features/add_activity/presentation/widgets/activity_item_card.dart @@ -9,8 +9,7 @@ class ActivityItemCard extends StatelessWidget { final DateTime day; const ActivityItemCard( - {Key? key, required this.physicalActivityEntity, required this.day}) - : super(key: key); + {super.key, required this.physicalActivityEntity, required this.day}); @override Widget build(BuildContext context) { diff --git a/lib/features/add_meal/data/data_sources/sp_fdc_data_source.dart b/lib/features/add_meal/data/data_sources/sp_fdc_data_source.dart index 71999cf..6a14ce3 100644 --- a/lib/features/add_meal/data/data_sources/sp_fdc_data_source.dart +++ b/lib/features/add_meal/data/data_sources/sp_fdc_data_source.dart @@ -20,7 +20,7 @@ class SpFdcDataSource { final response = await supaBaseClient .from(SPConst.fdcFoodTableName) - .select>>( + .select( '''fdc_id, $queryDescriptionColumn, fdc_portions ( measure_unit_id, amount, gram_weight ), fdc_nutrients ( nutrient_id, amount )''') .textSearch(queryDescriptionColumn, searchString, type: TextSearchType.websearch) diff --git a/lib/features/add_meal/presentation/add_meal_screen.dart b/lib/features/add_meal/presentation/add_meal_screen.dart index 91b9cb0..7502f4d 100644 --- a/lib/features/add_meal/presentation/add_meal_screen.dart +++ b/lib/features/add_meal/presentation/add_meal_screen.dart @@ -17,7 +17,7 @@ import 'package:opennutritracker/features/scanner/scanner_screen.dart'; import 'package:opennutritracker/generated/l10n.dart'; class AddMealScreen extends StatefulWidget { - const AddMealScreen({Key? key}) : super(key: key); + const AddMealScreen({super.key}); @override State createState() => _AddMealScreenState(); diff --git a/lib/features/add_meal/presentation/widgets/default_results_widget.dart b/lib/features/add_meal/presentation/widgets/default_results_widget.dart index 118ae32..e93afa3 100644 --- a/lib/features/add_meal/presentation/widgets/default_results_widget.dart +++ b/lib/features/add_meal/presentation/widgets/default_results_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:opennutritracker/generated/l10n.dart'; class DefaultsResultsWidget extends StatelessWidget { - const DefaultsResultsWidget({Key? key}) : super(key: key); + const DefaultsResultsWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/add_meal/presentation/widgets/meal_item_card.dart b/lib/features/add_meal/presentation/widgets/meal_item_card.dart index f96cf95..6e4ba96 100644 --- a/lib/features/add_meal/presentation/widgets/meal_item_card.dart +++ b/lib/features/add_meal/presentation/widgets/meal_item_card.dart @@ -15,11 +15,10 @@ class MealItemCard extends StatelessWidget { final MealEntity mealEntity; const MealItemCard( - {Key? key, + {super.key, required this.day, required this.mealEntity, - required this.addMealType}) - : super(key: key); + required this.addMealType}); @override Widget build(BuildContext context) { diff --git a/lib/features/add_meal/presentation/widgets/meal_search_bar.dart b/lib/features/add_meal/presentation/widgets/meal_search_bar.dart index 57f88c9..36a4f4d 100644 --- a/lib/features/add_meal/presentation/widgets/meal_search_bar.dart +++ b/lib/features/add_meal/presentation/widgets/meal_search_bar.dart @@ -10,11 +10,10 @@ class MealSearchBar extends StatelessWidget { final _searchTextController = TextEditingController(); MealSearchBar( - {Key? key, + {super.key, required this.searchStringListener, required this.onSearchSubmit, - required this.onBarcodePressed}) - : super(key: key); + required this.onBarcodePressed}); @override Widget build(BuildContext context) { diff --git a/lib/features/add_meal/presentation/widgets/no_results_widget.dart b/lib/features/add_meal/presentation/widgets/no_results_widget.dart index 7c4d472..5652a21 100644 --- a/lib/features/add_meal/presentation/widgets/no_results_widget.dart +++ b/lib/features/add_meal/presentation/widgets/no_results_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:opennutritracker/generated/l10n.dart'; class NoResultsWidget extends StatelessWidget { - const NoResultsWidget({Key? key}) : super(key: key); + const NoResultsWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/diary/diary_page.dart b/lib/features/diary/diary_page.dart index 8579f6a..fde9c00 100644 --- a/lib/features/diary/diary_page.dart +++ b/lib/features/diary/diary_page.dart @@ -12,7 +12,7 @@ import 'package:opennutritracker/features/diary/presentation/widgets/day_info_wi import 'package:opennutritracker/generated/l10n.dart'; class DiaryPage extends StatefulWidget { - const DiaryPage({Key? key}) : super(key: key); + const DiaryPage({super.key}); @override State createState() => _DiaryPageState(); @@ -119,7 +119,7 @@ class _DiaryPageState extends State with WidgetsBindingObserver { _diaryBloc.add(const LoadDiaryYearEvent()); _calendarDayBloc.add(LoadCalendarDayEvent(_selectedDate)); _diaryBloc.updateHomePage(); - if (context.mounted) { + if (mounted) { ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text(S.of(context).itemDeletedSnackbar))); } @@ -132,7 +132,7 @@ class _DiaryPageState extends State with WidgetsBindingObserver { _diaryBloc.add(const LoadDiaryYearEvent()); _calendarDayBloc.add(LoadCalendarDayEvent(_selectedDate)); _diaryBloc.updateHomePage(); - if (context.mounted) { + if (mounted) { ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text(S.of(context).itemDeletedSnackbar))); } diff --git a/lib/features/diary/presentation/widgets/day_info_widget.dart b/lib/features/diary/presentation/widgets/day_info_widget.dart index 2a86f46..6551dd9 100644 --- a/lib/features/diary/presentation/widgets/day_info_widget.dart +++ b/lib/features/diary/presentation/widgets/day_info_widget.dart @@ -24,7 +24,7 @@ class DayInfoWidget extends StatelessWidget { TrackedDayEntity? trackedDayEntity) onDeleteActivity; const DayInfoWidget( - {Key? key, + {super.key, required this.selectedDay, required this.trackedDayEntity, required this.userActivities, @@ -33,8 +33,7 @@ class DayInfoWidget extends StatelessWidget { required this.dinnerIntake, required this.snackIntake, required this.onDeleteIntake, - required this.onDeleteActivity}) - : super(key: key); + required this.onDeleteActivity}); @override Widget build(BuildContext context) { diff --git a/lib/features/diary/presentation/widgets/diary_table_calendar.dart b/lib/features/diary/presentation/widgets/diary_table_calendar.dart index 58ffd07..ccc2b01 100644 --- a/lib/features/diary/presentation/widgets/diary_table_calendar.dart +++ b/lib/features/diary/presentation/widgets/diary_table_calendar.dart @@ -13,14 +13,13 @@ class DiaryTableCalendar extends StatefulWidget { final Map trackedDaysMap; const DiaryTableCalendar( - {Key? key, + {super.key, required this.onDateSelected, required this.calendarDurationDays, required this.focusedDate, required this.currentDate, required this.selectedDate, - required this.trackedDaysMap}) - : super(key: key); + required this.trackedDaysMap}); @override State createState() => _DiaryTableCalendarState(); diff --git a/lib/features/home/home_page.dart b/lib/features/home/home_page.dart index 214df17..6e2c0f4 100644 --- a/lib/features/home/home_page.dart +++ b/lib/features/home/home_page.dart @@ -15,7 +15,7 @@ import 'package:opennutritracker/features/home/presentation/widgets/intake_verti import 'package:opennutritracker/generated/l10n.dart'; class HomePage extends StatefulWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override State createState() => _HomePageState(); diff --git a/lib/features/home/presentation/widgets/dashboard_widget.dart b/lib/features/home/presentation/widgets/dashboard_widget.dart index 354dc9c..3d1c6c9 100644 --- a/lib/features/home/presentation/widgets/dashboard_widget.dart +++ b/lib/features/home/presentation/widgets/dashboard_widget.dart @@ -17,7 +17,7 @@ class DashboardWidget extends StatefulWidget { final double totalProteinsGoal; const DashboardWidget( - {Key? key, + {super.key, required this.totalKcalSupplied, required this.totalKcalBurned, required this.totalKcalDaily, @@ -27,8 +27,7 @@ class DashboardWidget extends StatefulWidget { required this.totalProteinsIntake, required this.totalCarbsGoal, required this.totalFatsGoal, - required this.totalProteinsGoal}) - : super(key: key); + required this.totalProteinsGoal}); @override State createState() => _DashboardWidgetState(); diff --git a/lib/features/home/presentation/widgets/intake_vertical_list.dart b/lib/features/home/presentation/widgets/intake_vertical_list.dart index 9fd8538..2e558d9 100644 --- a/lib/features/home/presentation/widgets/intake_vertical_list.dart +++ b/lib/features/home/presentation/widgets/intake_vertical_list.dart @@ -15,14 +15,13 @@ class IntakeVerticalList extends StatelessWidget { final Function(BuildContext, IntakeEntity) onItemLongPressedCallback; const IntakeVerticalList( - {Key? key, + {super.key, required this.day, required this.title, required this.listIcon, required this.addMealType, required this.intakeList, - required this.onItemLongPressedCallback}) - : super(key: key); + required this.onItemLongPressedCallback}); @override Widget build(BuildContext context) { diff --git a/lib/features/home/presentation/widgets/macro_nutriments_widget.dart b/lib/features/home/presentation/widgets/macro_nutriments_widget.dart index c2d48d3..0d8783e 100644 --- a/lib/features/home/presentation/widgets/macro_nutriments_widget.dart +++ b/lib/features/home/presentation/widgets/macro_nutriments_widget.dart @@ -11,14 +11,13 @@ class MacroNutrientsView extends StatefulWidget { final double totalProteinsGoal; const MacroNutrientsView( - {Key? key, + {super.key, required this.totalCarbsIntake, required this.totalFatsIntake, required this.totalProteinsIntake, required this.totalCarbsGoal, required this.totalFatsGoal, - required this.totalProteinsGoal}) - : super(key: key); + required this.totalProteinsGoal}); @override State createState() => _MacroNutrientsViewState(); diff --git a/lib/features/meal_detail/meal_detail_screen.dart b/lib/features/meal_detail/meal_detail_screen.dart index a65e88f..4585760 100644 --- a/lib/features/meal_detail/meal_detail_screen.dart +++ b/lib/features/meal_detail/meal_detail_screen.dart @@ -18,7 +18,7 @@ import 'package:opennutritracker/features/meal_detail/presentation/widgets/off_d import 'package:opennutritracker/generated/l10n.dart'; class MealDetailScreen extends StatefulWidget { - const MealDetailScreen({Key? key}) : super(key: key); + const MealDetailScreen({super.key}); @override State createState() => _MealDetailScreenState(); diff --git a/lib/features/meal_detail/presentation/widgets/meal_detail_bottom_sheet.dart b/lib/features/meal_detail/presentation/widgets/meal_detail_bottom_sheet.dart index e9b25ae..d441205 100644 --- a/lib/features/meal_detail/presentation/widgets/meal_detail_bottom_sheet.dart +++ b/lib/features/meal_detail/presentation/widgets/meal_detail_bottom_sheet.dart @@ -18,13 +18,12 @@ class MealDetailBottomSheet extends StatefulWidget { final MealDetailBloc mealDetailBloc; const MealDetailBottomSheet( - {Key? key, + {super.key, required this.product, required this.day, required this.intakeTypeEntity, required this.mealDetailBloc, - required this.quantityTextController}) - : super(key: key); + required this.quantityTextController}); @override State createState() => _MealDetailBottomSheetState(); diff --git a/lib/features/meal_detail/presentation/widgets/meal_detail_macro_nutrients.dart b/lib/features/meal_detail/presentation/widgets/meal_detail_macro_nutrients.dart index 59a98da..0ed3225 100644 --- a/lib/features/meal_detail/presentation/widgets/meal_detail_macro_nutrients.dart +++ b/lib/features/meal_detail/presentation/widgets/meal_detail_macro_nutrients.dart @@ -6,8 +6,7 @@ class MealDetailMacroNutrients extends StatelessWidget { final double? value; const MealDetailMacroNutrients( - {Key? key, required this.typeString, required this.value}) - : super(key: key); + {super.key, required this.typeString, required this.value}); @override Widget build(BuildContext context) { diff --git a/lib/features/meal_detail/presentation/widgets/meal_detail_nutriments_table.dart b/lib/features/meal_detail/presentation/widgets/meal_detail_nutriments_table.dart index 12de0ee..23f2c05 100644 --- a/lib/features/meal_detail/presentation/widgets/meal_detail_nutriments_table.dart +++ b/lib/features/meal_detail/presentation/widgets/meal_detail_nutriments_table.dart @@ -6,8 +6,7 @@ import 'package:opennutritracker/generated/l10n.dart'; class MealDetailNutrimentsTable extends StatelessWidget { final MealEntity product; - const MealDetailNutrimentsTable({Key? key, required this.product}) - : super(key: key); + const MealDetailNutrimentsTable({super.key, required this.product}); @override Widget build(BuildContext context) { diff --git a/lib/features/meal_detail/presentation/widgets/meal_info_button.dart b/lib/features/meal_detail/presentation/widgets/meal_info_button.dart index e6d7e33..0581ef5 100644 --- a/lib/features/meal_detail/presentation/widgets/meal_info_button.dart +++ b/lib/features/meal_detail/presentation/widgets/meal_info_button.dart @@ -9,8 +9,7 @@ class MealInfoButton extends StatelessWidget { final String? url; final MealSourceEntity source; - const MealInfoButton({Key? key, required this.url, required this.source}) - : super(key: key); + const MealInfoButton({super.key, required this.url, required this.source}); @override Widget build(BuildContext context) { diff --git a/lib/features/meal_detail/presentation/widgets/meal_placeholder.dart b/lib/features/meal_detail/presentation/widgets/meal_placeholder.dart index 76d905c..72b7fe1 100644 --- a/lib/features/meal_detail/presentation/widgets/meal_placeholder.dart +++ b/lib/features/meal_detail/presentation/widgets/meal_placeholder.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; class MealPlaceholder extends StatelessWidget { - const MealPlaceholder({Key? key}) : super(key: key); + const MealPlaceholder({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/onboarding/onboarding_screen.dart b/lib/features/onboarding/onboarding_screen.dart index 66e332c..2e2ba34 100644 --- a/lib/features/onboarding/onboarding_screen.dart +++ b/lib/features/onboarding/onboarding_screen.dart @@ -17,7 +17,7 @@ import 'package:opennutritracker/features/onboarding/presentation/widgets/onboar import 'package:opennutritracker/generated/l10n.dart'; class OnboardingScreen extends StatefulWidget { - const OnboardingScreen({Key? key}) : super(key: key); + const OnboardingScreen({super.key}); @override State createState() => _OnboardingScreenState(); diff --git a/lib/features/onboarding/presentation/onboarding_intro_page_body.dart b/lib/features/onboarding/presentation/onboarding_intro_page_body.dart index dd826a1..83c6121 100644 --- a/lib/features/onboarding/presentation/onboarding_intro_page_body.dart +++ b/lib/features/onboarding/presentation/onboarding_intro_page_body.dart @@ -7,8 +7,7 @@ import 'package:opennutritracker/generated/l10n.dart'; import 'package:url_launcher/url_launcher.dart'; class OnboardingIntroPageBody extends StatefulWidget { - const OnboardingIntroPageBody({Key? key, required this.setPageContent}) - : super(key: key); + const OnboardingIntroPageBody({super.key, required this.setPageContent}); final Function(bool active, bool acceptedDataCollection) setPageContent; diff --git a/lib/features/onboarding/presentation/widgets/highlight_button.dart b/lib/features/onboarding/presentation/widgets/highlight_button.dart index 9e3417d..f734076 100644 --- a/lib/features/onboarding/presentation/widgets/highlight_button.dart +++ b/lib/features/onboarding/presentation/widgets/highlight_button.dart @@ -6,11 +6,10 @@ class HighlightButton extends StatefulWidget { final bool buttonActive; const HighlightButton( - {Key? key, + {super.key, required this.buttonLabel, required this.onButtonPressed, - required this.buttonActive}) - : super(key: key); + required this.buttonActive}); @override State createState() => _HighlightButtonState(); diff --git a/lib/features/onboarding/presentation/widgets/onboarding_first_page_body.dart b/lib/features/onboarding/presentation/widgets/onboarding_first_page_body.dart index d8bc2cb..20af5b1 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_first_page_body.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_first_page_body.dart @@ -8,8 +8,7 @@ class OnboardingFirstPageBody extends StatefulWidget { bool active, UserGenderSelectionEntity? gender, DateTime? birthday) setPageContent; - const OnboardingFirstPageBody({Key? key, required this.setPageContent}) - : super(key: key); + const OnboardingFirstPageBody({super.key, required this.setPageContent}); @override State createState() => diff --git a/lib/features/onboarding/presentation/widgets/onboarding_fourth_page_body.dart b/lib/features/onboarding/presentation/widgets/onboarding_fourth_page_body.dart index 7397b16..3dfefca 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_fourth_page_body.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_fourth_page_body.dart @@ -6,8 +6,7 @@ class OnboardingFourthPageBody extends StatefulWidget { final Function(bool active, UserGoalSelectionEntity? selectedGoal) setButtonContent; - const OnboardingFourthPageBody({Key? key, required this.setButtonContent}) - : super(key: key); + const OnboardingFourthPageBody({super.key, required this.setButtonContent}); @override State createState() => diff --git a/lib/features/onboarding/presentation/widgets/onboarding_overview_page_body.dart b/lib/features/onboarding/presentation/widgets/onboarding_overview_page_body.dart index 41f81ce..1961d98 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_overview_page_body.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_overview_page_body.dart @@ -10,14 +10,13 @@ class OnboardingOverviewPageBody extends StatelessWidget { final double? totalKcalCalculated; const OnboardingOverviewPageBody( - {Key? key, + {super.key, required this.setButtonActive, this.totalKcalCalculated, required this.calorieGoalDayString, required this.carbsGoalString, required this.fatGoalString, - required this.proteinGoalString}) - : super(key: key); + required this.proteinGoalString}); @override Widget build(BuildContext context) { diff --git a/lib/features/onboarding/presentation/widgets/onboarding_second_page_body.dart b/lib/features/onboarding/presentation/widgets/onboarding_second_page_body.dart index 54cb644..90ac426 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_second_page_body.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_second_page_body.dart @@ -6,8 +6,7 @@ class OnboardingSecondPageBody extends StatefulWidget { final Function(bool active, double? selectedHeight, double? selectedWeight) setButtonContent; - const OnboardingSecondPageBody({Key? key, required this.setButtonContent}) - : super(key: key); + const OnboardingSecondPageBody({super.key, required this.setButtonContent}); @override State createState() => diff --git a/lib/features/onboarding/presentation/widgets/onboarding_third_page_body.dart b/lib/features/onboarding/presentation/widgets/onboarding_third_page_body.dart index 8bf3e55..b9616da 100644 --- a/lib/features/onboarding/presentation/widgets/onboarding_third_page_body.dart +++ b/lib/features/onboarding/presentation/widgets/onboarding_third_page_body.dart @@ -7,8 +7,7 @@ class OnboardingThirdPageBody extends StatefulWidget { final Function(bool active, UserActivitySelectionEntity? selectedActivity) setButtonContent; - const OnboardingThirdPageBody({Key? key, required this.setButtonContent}) - : super(key: key); + const OnboardingThirdPageBody({super.key, required this.setButtonContent}); @override State createState() => diff --git a/lib/features/profile/presentation/widgets/bmi_overview.dart b/lib/features/profile/presentation/widgets/bmi_overview.dart index 14b9d1c..065a2f5 100644 --- a/lib/features/profile/presentation/widgets/bmi_overview.dart +++ b/lib/features/profile/presentation/widgets/bmi_overview.dart @@ -9,8 +9,7 @@ class BMIOverview extends StatelessWidget { final UserNutritionalStatus nutritionalStatus; const BMIOverview( - {Key? key, required this.bmiValue, required this.nutritionalStatus}) - : super(key: key); + {super.key, required this.bmiValue, required this.nutritionalStatus}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/presentation/widgets/set_gender_dialog.dart b/lib/features/profile/presentation/widgets/set_gender_dialog.dart index 78d245b..aade89f 100644 --- a/lib/features/profile/presentation/widgets/set_gender_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_gender_dialog.dart @@ -3,7 +3,7 @@ import 'package:opennutritracker/core/domain/entity/user_gender_entity.dart'; import 'package:opennutritracker/generated/l10n.dart'; class SetGenderDialog extends StatelessWidget { - const SetGenderDialog({Key? key}) : super(key: key); + const SetGenderDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/presentation/widgets/set_goal_dialog.dart b/lib/features/profile/presentation/widgets/set_goal_dialog.dart index 550644e..fe202a3 100644 --- a/lib/features/profile/presentation/widgets/set_goal_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_goal_dialog.dart @@ -3,7 +3,7 @@ import 'package:opennutritracker/core/domain/entity/user_weight_goal_entity.dart import 'package:opennutritracker/generated/l10n.dart'; class SetWeightGoalDialog extends StatelessWidget { - const SetWeightGoalDialog({Key? key}) : super(key: key); + const SetWeightGoalDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/presentation/widgets/set_height_dialog.dart b/lib/features/profile/presentation/widgets/set_height_dialog.dart index 691cf52..14ac892 100644 --- a/lib/features/profile/presentation/widgets/set_height_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_height_dialog.dart @@ -7,8 +7,7 @@ class SetHeightDialog extends StatelessWidget { final double userHeightCM; - const SetHeightDialog({Key? key, required this.userHeightCM}) - : super(key: key); + const SetHeightDialog({super.key, required this.userHeightCM}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/presentation/widgets/set_pal_category_dialog.dart b/lib/features/profile/presentation/widgets/set_pal_category_dialog.dart index a10b07a..f74619c 100644 --- a/lib/features/profile/presentation/widgets/set_pal_category_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_pal_category_dialog.dart @@ -3,7 +3,7 @@ import 'package:opennutritracker/core/domain/entity/user_pal_entity.dart'; import 'package:opennutritracker/generated/l10n.dart'; class SetPALCategoryDialog extends StatelessWidget { - const SetPALCategoryDialog({Key? key}) : super(key: key); + const SetPALCategoryDialog({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/presentation/widgets/set_weight_dialog.dart b/lib/features/profile/presentation/widgets/set_weight_dialog.dart index 1647ee8..156409c 100644 --- a/lib/features/profile/presentation/widgets/set_weight_dialog.dart +++ b/lib/features/profile/presentation/widgets/set_weight_dialog.dart @@ -7,7 +7,7 @@ class SetWeightDialog extends StatelessWidget { final double userWeight; - const SetWeightDialog({Key? key, required this.userWeight}) : super(key: key); + const SetWeightDialog({super.key, required this.userWeight}); @override Widget build(BuildContext context) { diff --git a/lib/features/profile/profile_page.dart b/lib/features/profile/profile_page.dart index 4b346ad..e4217b9 100644 --- a/lib/features/profile/profile_page.dart +++ b/lib/features/profile/profile_page.dart @@ -16,7 +16,7 @@ import 'package:opennutritracker/features/profile/presentation/widgets/set_weigh import 'package:opennutritracker/generated/l10n.dart'; class ProfilePage extends StatefulWidget { - const ProfilePage({Key? key}) : super(key: key); + const ProfilePage({super.key}); @override State createState() => _ProfilePageState(); diff --git a/lib/features/scanner/scanner_screen.dart b/lib/features/scanner/scanner_screen.dart index ddc612d..655837c 100644 --- a/lib/features/scanner/scanner_screen.dart +++ b/lib/features/scanner/scanner_screen.dart @@ -11,7 +11,7 @@ import 'package:opennutritracker/features/scanner/presentation/scanner_bloc.dart import 'package:opennutritracker/generated/l10n.dart'; class ScannerScreen extends StatefulWidget { - const ScannerScreen({Key? key}) : super(key: key); + const ScannerScreen({super.key}); @override State createState() => _ScannerScreenState(); diff --git a/lib/features/settings/settings_screen.dart b/lib/features/settings/settings_screen.dart index 1f45a18..d0ac5d6 100644 --- a/lib/features/settings/settings_screen.dart +++ b/lib/features/settings/settings_screen.dart @@ -15,7 +15,7 @@ import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:url_launcher/url_launcher.dart'; class SettingsScreen extends StatefulWidget { - const SettingsScreen({Key? key}) : super(key: key); + const SettingsScreen({super.key}); @override State createState() => _SettingsScreenState(); diff --git a/pubspec.lock b/pubspec.lock index 25c9f11..a26ee84 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.4.1" animated_flip_counter: dependency: "direct main" description: @@ -29,18 +29,18 @@ packages: dependency: transitive description: name: app_links - sha256: eb83c2b15b78a66db04e95132678e910fcdb8dc3a9b0aed0c138f50b2bef0dae + sha256: "4e392b5eba997df356ca6021f28431ce1cfeb16758699553a94b13add874a3bb" url: "https://pub.dev" source: hosted - version: "3.4.5" + version: "3.5.0" archive: dependency: transitive description: name: archive - sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03" + sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" url: "https://pub.dev" source: hosted - version: "3.4.6" + version: "3.4.10" args: dependency: transitive description: @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: bloc - sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49" + sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e url: "https://pub.dev" source: hosted - version: "8.1.2" + version: "8.1.3" boolean_selector: dependency: transitive description: @@ -101,34 +101,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.1" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.4.8" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 + sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" url: "https://pub.dev" source: hosted - version: "7.2.11" + version: "7.3.0" built_collection: dependency: transitive description: @@ -141,34 +141,34 @@ packages: dependency: transitive description: name: built_value - sha256: "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e" + sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e url: "https://pub.dev" source: hosted - version: "8.7.0" + version: "8.9.1" cached_network_image: dependency: "direct main" description: name: cached_network_image - sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f + sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.3.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613" + sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257" + sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" characters: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: cli_util - sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" clock: dependency: transitive description: @@ -205,18 +205,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.10.0" collection: dependency: "direct main" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -245,10 +245,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.4" dots_indicator: dependency: transitive description: @@ -261,18 +261,18 @@ packages: dependency: "direct main" description: name: envied - sha256: "60d3f5606c7b35bc6ef493e650d916b34351d8af2e58b7ac45881ba59dfcf039" + sha256: dab29e21452c3d57ec10889d96b06b4a006b01375d4df10b33c9704800c208c4 url: "https://pub.dev" source: hosted - version: "0.3.0+3" + version: "0.5.3" envied_generator: dependency: "direct dev" description: name: envied_generator - sha256: dfdbe5dc52863e54c036a4c4042afbdf1bd528cb4c1e638ecba26228ba72e9e5 + sha256: b8655d5cb39b4d1d449a79ff6f1367b252c23955ff17ec7c03aacdff938598bd url: "https://pub.dev" source: hosted - version: "0.3.0+3" + version: "0.5.3" equatable: dependency: "direct main" description: @@ -293,10 +293,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" file: dependency: transitive description: @@ -322,10 +322,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae + sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1" url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "8.1.4" flutter_cache_manager: dependency: "direct main" description: @@ -394,10 +394,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.1" flutter_localizations: dependency: "direct main" description: flutter @@ -407,10 +407,10 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "22dbf16f23a4bcf9d35e51be1c84ad5bb6f627750565edd70dab70f3ff5fff8f" + sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685 url: "https://pub.dev" source: hosted - version: "8.1.0" + version: "9.0.0" flutter_secure_storage_linux: dependency: transitive description: @@ -447,18 +447,18 @@ packages: dependency: transitive description: name: flutter_secure_storage_windows - sha256: "38f9501c7cb6f38961ef0e1eacacee2b2d4715c63cc83fe56449c4d3d0b47255" + sha256: "5809c66f9dd3b4b93b0a6e2e8561539405322ee767ac2f64d084e2ab5429d108" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" flutter_svg: dependency: "direct main" description: name: flutter_svg - sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.10+1" flutter_test: dependency: "direct dev" description: flutter @@ -481,18 +481,18 @@ packages: dependency: transitive description: name: functions_client - sha256: "3b157b4d3ae9e38614fd80fab76d1ef1e0e39ff3412a45de2651f27cecb9d2d2" + sha256: "9a0ab83a525c8691a6724746e642de755a299afa04158807787364cd9e718001" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "2.0.0" get_it: dependency: "direct main" description: name: get_it - sha256: f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3 + sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7 url: "https://pub.dev" source: hosted - version: "7.6.4" + version: "7.6.7" glob: dependency: transitive description: @@ -505,10 +505,10 @@ packages: dependency: transitive description: name: gotrue - sha256: f3a47cdbc59e543f453a1ef150050cd7650fe756254ac1fcac1d2a2f6f2b5a21 + sha256: "1bf6354278a98b8a1867263e94921da8a239de07e9babceab2b4e80af651a098" url: "https://pub.dev" source: hosted - version: "1.12.6" + version: "2.5.1" graphs: dependency: transitive description: @@ -517,6 +517,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" + gtk: + dependency: transitive + description: + name: gtk + sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c + url: "https://pub.dev" + source: hosted + version: "2.1.0" hive: dependency: "direct main" description: @@ -553,10 +561,10 @@ packages: dependency: "direct main" description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" http_multi_server: dependency: transitive description: @@ -577,10 +585,10 @@ packages: dependency: transitive description: name: image - sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" + sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" url: "https://pub.dev" source: hosted - version: "4.1.3" + version: "4.1.7" intl: dependency: "direct main" description: @@ -637,14 +645,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" logging: dependency: "direct main" description: @@ -657,42 +689,42 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.11.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" mobile_scanner: dependency: "direct main" description: name: mobile_scanner - sha256: cf978740676ba5b0c17399baf117984b31190bb7a6eaa43e51229ed46abc42ee + sha256: "619ed5fd43ca9007a151f00c3dc43feedeaf235fe5647735d0237c38849d49dc" url: "https://pub.dev" source: hosted - version: "3.5.2" + version: "4.0.0" nested: dependency: transitive description: @@ -721,10 +753,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "5.0.1" package_info_plus_platform_interface: dependency: transitive description: @@ -737,10 +769,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -753,26 +785,26 @@ packages: dependency: "direct main" description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" path_provider_linux: dependency: transitive description: @@ -785,10 +817,10 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: @@ -809,34 +841,34 @@ packages: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.8" pointycastle: dependency: transitive description: name: pointycastle - sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" url: "https://pub.dev" source: hosted - version: "3.7.3" + version: "3.7.4" pool: dependency: transitive description: @@ -849,18 +881,18 @@ packages: dependency: transitive description: name: postgrest - sha256: f190eddc5779842dfa529fa239ec4b1025f6f968c18052ba6fffc0aecac93e6b + sha256: "9a3b590cf123f8d323b6a918702e037f037027d12a01902f9dc6ee38fdc05d6c" url: "https://pub.dev" source: hosted - version: "1.5.2" + version: "2.1.1" provider: dependency: "direct main" description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" pub_semver: dependency: transitive description: @@ -881,10 +913,18 @@ packages: dependency: transitive description: name: realtime_client - sha256: "2027358cdbe65d5f1770c3f768aa9adecd394de486c5dbbd2cfe19d5c6dbbc4a" + sha256: "41d6c5e0327d6c270b98b79bfed672928244af60e2856770f3eff697f9efe459" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "2.0.1" + recase: + dependency: transitive + description: + name: recase + sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213 + url: "https://pub.dev" + source: hosted + version: "4.1.0" retry: dependency: transitive description: @@ -905,18 +945,18 @@ packages: dependency: transitive description: name: sentry - sha256: "9cfd325611ab54b57d5e26957466823f05bea9d6cfcc8d48f11817b8bcedf0d1" + sha256: d2ee9c850d876d285f22e2e662f400ec2438df9939fe4acd5d780df9841794ce url: "https://pub.dev" source: hosted - version: "7.12.0" + version: "7.16.1" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "0cd7d622cb63c94fd1b2f87ab508e158b950bd281e2a80f327ebf73bb217eaf3" + sha256: "5b428c189c825f16fb14e9166529043f06b965d5b59bfc3a1415e39c082398c0" url: "https://pub.dev" source: hosted - version: "7.12.0" + version: "7.16.1" shared_preferences: dependency: transitive description: @@ -937,10 +977,10 @@ packages: dependency: transitive description: name: shared_preferences_foundation - sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.5" shared_preferences_linux: dependency: transitive description: @@ -953,18 +993,18 @@ packages: dependency: transitive description: name: shared_preferences_platform_interface - sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -989,38 +1029,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - sign_in_with_apple: - dependency: transitive - description: - name: sign_in_with_apple - sha256: "0975c23b9f8b30a80e27d5659a75993a093d4cb5f4eb7d23a9ccc586fea634e0" - url: "https://pub.dev" - source: hosted - version: "5.0.0" - sign_in_with_apple_platform_interface: - dependency: transitive - description: - name: sign_in_with_apple_platform_interface - sha256: a5883edee09ed6be19de19e7d9f618a617fe41a6fa03f76d082dfb787e9ea18d - url: "https://pub.dev" - source: hosted - version: "1.0.0" - sign_in_with_apple_web: - dependency: transitive - description: - name: sign_in_with_apple_web - sha256: "44b66528f576e77847c14999d5e881e17e7223b7b0625a185417829e5306f47a" - url: "https://pub.dev" - source: hosted - version: "1.0.1" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592" + sha256: ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3 url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.2.1" sky_engine: dependency: transitive description: flutter @@ -1030,10 +1046,10 @@ packages: dependency: transitive description: name: source_gen - sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" source_helper: dependency: transitive description: @@ -1050,46 +1066,54 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" sqflite: dependency: transitive description: name: sqflite - sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" + sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.3" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" storage_client: dependency: transitive description: name: storage_client - sha256: f02d4d8967bec77767dcaf9daf24ca5b8d5a9f1cc093f14dffb77930b52589a3 + sha256: bf5589d5de61a2451edb1b8960a0e673d4bb5c42ecc4dddf7c051a93789ced34 url: "https://pub.dev" source: hosted - version: "1.5.4" + version: "2.0.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1110,26 +1134,26 @@ packages: dependency: transitive description: name: supabase - sha256: "1434bb9375f88f51802dadf7b99568117c434f6a9af7f8a55e5be94c8b4da7c9" + sha256: f431753d2a4cb9dacd72c7378154f806c2b2cef23859bd9cee1add23821e874d url: "https://pub.dev" source: hosted - version: "1.11.11" + version: "2.0.8" supabase_flutter: dependency: "direct main" description: name: supabase_flutter - sha256: "37287e2cc8180e0e984c4d7206ef31bbbd2c9b79ef0aa8d4969b023a433626c8" + sha256: "30e966b89ee61dc9de845e2d7e1c60967b3189c410d105c6d42f09b6259f4cb6" url: "https://pub.dev" source: hosted - version: "1.10.24" + version: "2.3.4" synchronized: dependency: transitive description: name: synchronized - sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.0+1" table_calendar: dependency: "direct main" description: @@ -1150,10 +1174,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" timing: dependency: transitive description: @@ -1174,34 +1198,34 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.5" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" + sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a" + sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.2.4" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" url_launcher_macos: dependency: transitive description: @@ -1214,58 +1238,58 @@ packages: dependency: transitive description: name: url_launcher_platform_interface - sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" uuid: dependency: "direct main" description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.3.3" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43" + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7" + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26 + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" url: "https://pub.dev" source: hosted - version: "1.1.9+1" + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -1274,6 +1298,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" watcher: dependency: transitive description: @@ -1286,74 +1318,42 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.4.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b - url: "https://pub.dev" - source: hosted - version: "2.4.0" - webview_flutter: - dependency: transitive - description: - name: webview_flutter - sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf" - url: "https://pub.dev" - source: hosted - version: "4.4.2" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - sha256: "8326ee235f87605a2bfc444a4abc897f4abc78d83f054ba7d3d1074ce82b4fbf" - url: "https://pub.dev" - source: hosted - version: "3.12.1" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - sha256: "6d9213c65f1060116757a7c473247c60f3f7f332cac33dc417c9e362a9a13e4f" + sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" url: "https://pub.dev" source: hosted - version: "2.6.0" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - sha256: af6f5ab05918070b33507b0d453ba9fb7d39338a3256c23cf9433dc68100774a - url: "https://pub.dev" - source: hosted - version: "3.9.3" + version: "2.4.3" win32: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.2.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" xml: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" yaml: dependency: transitive description: @@ -1366,10 +1366,10 @@ packages: dependency: transitive description: name: yet_another_json_isolate - sha256: "86fad76026c4241a32831d6c7febd8f9bded5019e2cd36c5b148499808d8307d" + sha256: e727502a2640d65b4b8a8a6cb48af9dd0cbe644ba4b3ee667c7f4afa0c1d6069 url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "2.0.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.3.0-279.1.beta <3.4.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index c1a4abe..1a98c5f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 0.6.8+14 environment: - sdk: '>=2.18.1 <3.0.0' + sdk: '>=3.0.0 <3.4.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -38,18 +38,18 @@ dependencies: get_it: ^7.6.0 provider: ^6.0.5 http: ^1.1.0 - uuid: ^3.0.7 - json_annotation: ^4.8.0 + uuid: ^4.3.3 + json_annotation: ^4.8.1 logging: ^1.1.1 path_provider: ^2.0.14 - flutter_secure_storage: ^8.0.0 + flutter_secure_storage: ^9.0.0 cupertino_icons: ^1.0.5 - package_info_plus: ^4.0.2 + package_info_plus: ^5.0.1 url_launcher: ^6.1.10 flutter_svg: ^2.0.7 cached_network_image: ^3.2.3 flutter_cache_manager: ^3.3.0 - envied: ^0.3.0+3 + envied: ^0.5.3 flutter_bloc: ^8.1.2 equatable: ^2.0.5 @@ -61,14 +61,14 @@ dependencies: auto_size_text: ^3.0.0 animated_flip_counter: ^0.2.6 - mobile_scanner: ^3.4.1 + mobile_scanner: ^4.0.0 hive: ^2.2.3 hive_flutter: ^1.1.0 sentry_flutter: ^7.8.0 - supabase_flutter: ^1.10.7 + supabase_flutter: ^2.3.4 dev_dependencies: flutter_test: @@ -76,10 +76,10 @@ dev_dependencies: build_runner: ^2.3.3 json_serializable: ^6.6.1 - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 flutter_launcher_icons: ^0.13.1 hive_generator: ^2.0.0 - envied_generator: ^0.3.0+3 + envied_generator: ^0.5.3 flutter: