From 1f06e7b936e385c979ae31e5d53e4083798ff104 Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 6 Sep 2024 19:00:25 +0200 Subject: [PATCH] Fixed project. Now it builds --- lib/enter_food_widget.dart | 6 +- lib/food_entry/food_entry_bloc.dart | 2 +- lib/food_entry/food_entry_widget.dart | 4 +- lib/main.dart | 11 +- lib/perdate/entry_list.dart | 6 +- lib/perdate/perdate_widget.dart | 14 +- lib/storage/storage.dart | 2 +- lib/utils/router.dart | 4 +- lib/utils/settings.dart | 6 +- lib/utils/settings_bloc.dart | 2 +- lib/utils/sum_widget.dart | 6 +- lib/utils/theme_bloc.dart | 2 +- lib/utils/theme_switcher_button.dart | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 186 ++++++++++++++++-- pubspec.yaml | 9 +- 16 files changed, 212 insertions(+), 52 deletions(-) diff --git a/lib/enter_food_widget.dart b/lib/enter_food_widget.dart index 8af7c7c..e0ed597 100644 --- a/lib/enter_food_widget.dart +++ b/lib/enter_food_widget.dart @@ -1,7 +1,7 @@ -import 'package:calodiary/storage/storage.dart'; +import 'package:calorimeter/storage/storage.dart'; import 'package:flutter/material.dart'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; -import 'package:calodiary/row_with_spacers_widget.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/row_with_spacers_widget.dart'; class EnterFoodWidget extends StatefulWidget { final Function(BuildContext context, FoodEntry entry) onAdd; diff --git a/lib/food_entry/food_entry_bloc.dart b/lib/food_entry/food_entry_bloc.dart index d714a7e..10ef2a8 100644 --- a/lib/food_entry/food_entry_bloc.dart +++ b/lib/food_entry/food_entry_bloc.dart @@ -1,5 +1,5 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:calodiary/storage/storage.dart'; +import 'package:calorimeter/storage/storage.dart'; import 'package:uuid/uuid.dart'; class FoodEntryBloc extends Bloc { diff --git a/lib/food_entry/food_entry_widget.dart b/lib/food_entry/food_entry_widget.dart index 9206f4f..28dc931 100644 --- a/lib/food_entry/food_entry_widget.dart +++ b/lib/food_entry/food_entry_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; -import 'package:calodiary/row_with_spacers_widget.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/row_with_spacers_widget.dart'; class FoodEntryWidget extends StatefulWidget { final FoodEntry entry; diff --git a/lib/main.dart b/lib/main.dart index a45b66e..9624e18 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,13 +1,10 @@ -import 'package:calodiary/storage/storage.dart'; -import 'package:calodiary/perdate/perdate_widget.dart'; -import 'package:calodiary/utils/router.dart'; -import 'package:calodiary/utils/settings.dart'; -import 'package:calodiary/utils/settings_bloc.dart'; -import 'package:calodiary/utils/theme_bloc.dart'; +import 'package:calorimeter/storage/storage.dart'; +import 'package:calorimeter/utils/router.dart'; +import 'package:calorimeter/utils/settings_bloc.dart'; +import 'package:calorimeter/utils/theme_bloc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:go_router/go_router.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/perdate/entry_list.dart b/lib/perdate/entry_list.dart index 94e79f6..bb23ba2 100644 --- a/lib/perdate/entry_list.dart +++ b/lib/perdate/entry_list.dart @@ -1,6 +1,6 @@ -import 'package:calodiary/enter_food_widget.dart'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; -import 'package:calodiary/food_entry/food_entry_widget.dart'; +import 'package:calorimeter/enter_food_widget.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/food_entry/food_entry_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/perdate/perdate_widget.dart b/lib/perdate/perdate_widget.dart index eac1813..dbb54c6 100644 --- a/lib/perdate/perdate_widget.dart +++ b/lib/perdate/perdate_widget.dart @@ -1,10 +1,10 @@ -import 'package:calodiary/app_drawer.dart'; -import 'package:calodiary/utils/calendar_floating_button.dart'; -import 'package:calodiary/perdate/entry_list.dart'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; -import 'package:calodiary/storage/storage.dart'; -import 'package:calodiary/utils/sum_widget.dart'; -import 'package:calodiary/utils/theme_switcher_button.dart'; +import 'package:calorimeter/app_drawer.dart'; +import 'package:calorimeter/utils/calendar_floating_button.dart'; +import 'package:calorimeter/perdate/entry_list.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/storage/storage.dart'; +import 'package:calorimeter/utils/sum_widget.dart'; +import 'package:calorimeter/utils/theme_switcher_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:intl/intl.dart'; diff --git a/lib/storage/storage.dart b/lib/storage/storage.dart index 4cf41be..e3cdbf7 100644 --- a/lib/storage/storage.dart +++ b/lib/storage/storage.dart @@ -1,7 +1,7 @@ import 'dart:developer'; import 'dart:io'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; import 'package:path_provider/path_provider.dart'; import 'package:universal_platform/universal_platform.dart'; diff --git a/lib/utils/router.dart b/lib/utils/router.dart index e06a13c..7dde46a 100644 --- a/lib/utils/router.dart +++ b/lib/utils/router.dart @@ -1,5 +1,5 @@ -import 'package:calodiary/perdate/perdate_widget.dart'; -import 'package:calodiary/utils/settings.dart'; +import 'package:calorimeter/perdate/perdate_widget.dart'; +import 'package:calorimeter/utils/settings.dart'; import 'package:go_router/go_router.dart'; GoRouter getRouterConfig() { diff --git a/lib/utils/settings.dart b/lib/utils/settings.dart index f836b9b..09ae3b4 100644 --- a/lib/utils/settings.dart +++ b/lib/utils/settings.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:calodiary/app_drawer.dart'; -import 'package:calodiary/utils/calendar_floating_button.dart'; -import 'package:calodiary/utils/settings_bloc.dart'; +import 'package:calorimeter/app_drawer.dart'; +import 'package:calorimeter/utils/calendar_floating_button.dart'; +import 'package:calorimeter/utils/settings_bloc.dart'; import 'package:settings_ui/settings_ui.dart'; class SettingsWidget extends StatefulWidget { diff --git a/lib/utils/settings_bloc.dart b/lib/utils/settings_bloc.dart index ac88d5c..7749e12 100644 --- a/lib/utils/settings_bloc.dart +++ b/lib/utils/settings_bloc.dart @@ -1,5 +1,5 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:calodiary/storage/storage.dart'; +import 'package:calorimeter/storage/storage.dart'; class SettingsDataBloc extends Bloc { final FoodStorage storage; diff --git a/lib/utils/sum_widget.dart b/lib/utils/sum_widget.dart index 94aa46e..baf3d64 100644 --- a/lib/utils/sum_widget.dart +++ b/lib/utils/sum_widget.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:calodiary/food_entry/food_entry_bloc.dart'; -import 'package:calodiary/utils/settings_bloc.dart'; -import 'package:calodiary/row_with_spacers_widget.dart'; +import 'package:calorimeter/food_entry/food_entry_bloc.dart'; +import 'package:calorimeter/utils/settings_bloc.dart'; +import 'package:calorimeter/row_with_spacers_widget.dart'; class SumWidget extends StatefulWidget { final List foodEntries; diff --git a/lib/utils/theme_bloc.dart b/lib/utils/theme_bloc.dart index 8dc83fe..7683b78 100644 --- a/lib/utils/theme_bloc.dart +++ b/lib/utils/theme_bloc.dart @@ -1,4 +1,4 @@ -import 'package:calodiary/storage/storage.dart'; +import 'package:calorimeter/storage/storage.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class ThemeDataBloc extends Bloc { diff --git a/lib/utils/theme_switcher_button.dart b/lib/utils/theme_switcher_button.dart index 096bbf4..940ab0a 100644 --- a/lib/utils/theme_switcher_button.dart +++ b/lib/utils/theme_switcher_button.dart @@ -1,4 +1,4 @@ -import 'package:calodiary/utils/theme_bloc.dart'; +import 'package:calorimeter/utils/theme_bloc.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index cccf817..e777c67 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,8 @@ import FlutterMacOS import Foundation +import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 20212b2..47aaaf4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -49,6 +49,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + crypto: + dependency: transitive + description: + name: crypto + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + url: "https://pub.dev" + source: hosted + version: "3.0.5" fake_async: dependency: transitive description: @@ -57,19 +65,27 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_barcode_scanner: - dependency: "direct main" - description: - name: flutter_barcode_scanner - sha256: a4ba37daf9933f451a5e812c753ddd045d6354e4a3280342d895b07fecaab3fa - url: "https://pub.dev" - source: hosted - version: "2.0.0" flutter_bloc: dependency: "direct main" description: @@ -86,19 +102,37 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" - url: "https://pub.dev" - source: hosted - version: "2.0.22" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + go_router: + dependency: "direct main" + description: + name: go_router + sha256: "2ddb88e9ad56ae15ee144ed10e33886777eb5ca2509a914850a5faa7b52ff459" + url: "https://pub.dev" + source: hosted + version: "14.2.7" + intl: + dependency: "direct main" + description: + name: intl + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + url: "https://pub.dev" + source: hosted + version: "0.19.0" leak_tracker: dependency: transitive description: @@ -131,6 +165,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" matcher: dependency: transitive description: @@ -171,6 +213,70 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_provider: + dependency: "direct main" + description: + name: path_provider + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + url: "https://pub.dev" + source: hosted + version: "2.1.4" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" + url: "https://pub.dev" + source: hosted + version: "2.2.10" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + url: "https://pub.dev" + source: hosted + version: "2.4.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" provider: dependency: transitive description: @@ -179,6 +285,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.2" + settings_ui: + dependency: "direct main" + description: + name: settings_ui + sha256: d9838037cb554b24b4218b2d07666fbada3478882edefae375ee892b6c820ef3 + url: "https://pub.dev" + source: hosted + version: "2.0.2" sky_engine: dependency: transitive description: flutter @@ -192,6 +306,14 @@ 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" stack_trace: dependency: transitive description: @@ -232,6 +354,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.2" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + universal_platform: + dependency: "direct main" + description: + name: universal_platform + sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + uuid: + dependency: "direct main" + description: + name: uuid + sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + url: "https://pub.dev" + source: hosted + version: "4.5.0" vector_math: dependency: transitive description: @@ -248,6 +394,14 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.5" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" + source: hosted + version: "1.0.4" sdks: dart: ">=3.5.2 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0dda103..a891c1f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,8 +9,15 @@ environment: dependencies: flutter: sdk: flutter - flutter_barcode_scanner: ^2.0.0 flutter_bloc: ^8.1.6 + flutter_localizations: + sdk: flutter + go_router: ^14.2.7 + intl: any + path_provider: ^2.1.4 + settings_ui: ^2.0.2 + universal_platform: ^1.1.0 + uuid: ^4.5.0 dev_dependencies: flutter_test: