From 873819dea1f52555b9f7b3719110f040a9350dab Mon Sep 17 00:00:00 2001 From: bogdan <1926167@stud.hs-mannheim.de> Date: Fri, 26 May 2023 00:59:09 +0200 Subject: [PATCH] Progress Page und Meal Page das Design fertig gemacht --- .dart_tool/package_config.json | 196 ++++----- .dart_tool/package_config_subset | 388 +++++++++--------- .dart_tool/version | 2 +- .flutter-plugins | 10 +- .flutter-plugins-dependencies | 2 +- .../components/MealPageFoodComponent.dart | 27 ++ .../circular/circular_component.dart | 19 + .../line_circular_with_text_component.dart | 38 ++ .../components/food_list_component.dart | 41 ++ .../meal_page_text/days_component.dart | 25 ++ .../meal_page_text/days_text_component.dart | 20 + .../secondary_big_text_component.dart | 19 + .../secondary_text_component.dart | 19 + .../statistics_text_component.dart | 19 + .../statistics_today_component.dart | 49 +++ .../meal_page_text/title_component.dart | 19 + ...atistics_circular_indicator_component.dart | 10 +- .../pages/nav_pages/meal_plan_page.dart | 77 +--- .../pages/nav_pages/progress_page.dart | 289 ++++++++++++- lib/android/pages/nav_pages/today_page.dart | 75 ++-- pubspec.lock | 16 + pubspec.yaml | 1 + 22 files changed, 947 insertions(+), 414 deletions(-) create mode 100644 lib/android/components/MealPageFoodComponent.dart create mode 100644 lib/android/components/circular/circular_component.dart create mode 100644 lib/android/components/circular/line_circular_with_text_component.dart create mode 100644 lib/android/components/food_list_component.dart create mode 100644 lib/android/components/meal_page_text/days_component.dart create mode 100644 lib/android/components/meal_page_text/days_text_component.dart create mode 100644 lib/android/components/meal_page_text/secondary_big_text_component.dart create mode 100644 lib/android/components/meal_page_text/secondary_text_component.dart create mode 100644 lib/android/components/meal_page_text/statistics_text_component.dart create mode 100644 lib/android/components/meal_page_text/statistics_today_component.dart create mode 100644 lib/android/components/meal_page_text/title_component.dart diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 8332636..d630013 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,547 +3,559 @@ "packages": [ { "name": "_fe_analyzer_shared", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "analyzer", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-5.11.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/analyzer-5.11.1", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "animate_gradient", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/animate_gradient-0.0.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/animate_gradient-0.0.2", "packageUri": "lib/", "languageVersion": "2.16" }, { "name": "args", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/args-2.4.1", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "assorted_layout_widgets", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/assorted_layout_widgets-8.0.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/assorted_layout_widgets-8.0.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "async", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/async-2.10.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "boolean_selector", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "build", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.3.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build-2.3.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "build_config", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_config-1.1.1", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "build_daemon", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-3.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_daemon-3.1.1", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "build_resolvers", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_resolvers-2.2.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "build_runner", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.3.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner-2.3.3", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "build_runner_core", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-7.2.7", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner_core-7.2.7", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "built_collection", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_collection-5.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "built_value", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.5.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_value-8.5.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "card_swiper", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/card_swiper-2.0.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/card_swiper-2.0.4", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "checked_yaml", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "clock", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "code_builder", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.4.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/code_builder-4.4.0", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "collection", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/collection-1.17.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "convert", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/convert-3.1.1", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "crypto", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/crypto-3.0.3", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "cupertino_icons", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.5", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "dart_style", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.3.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/dart_style-2.3.1", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "empty_widget", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/empty_widget-0.0.5", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/empty_widget-0.0.5", + "packageUri": "lib/", + "languageVersion": "2.12" + }, + { + "name": "equatable", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/equatable-2.0.5", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "ffi", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.0.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/ffi-2.0.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "file", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/file-6.1.4", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fixnum", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/fixnum-1.1.0", "packageUri": "lib/", "languageVersion": "2.19" }, + { + "name": "fl_chart", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/fl_chart-0.62.0", + "packageUri": "lib/", + "languageVersion": "2.17" + }, { "name": "flutter", - "rootUri": "file:///C:/Users/Nutzer/flutter/packages/flutter", + "rootUri": "file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "flutter_dotenv", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_dotenv-5.0.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_dotenv-5.0.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_lints", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///C:/Users/Nutzer/flutter/packages/flutter_test", + "rootUri": "file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter_test", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "frontend_server_client", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-3.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/frontend_server_client-3.2.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "glob", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/glob-2.1.1", "packageUri": "lib/", "languageVersion": "2.15" }, { "name": "graphs", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/graphs-2.2.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "hive", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive-2.2.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive-2.2.3", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "hive_flutter", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_flutter-1.1.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_flutter-1.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "hive_generator", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_generator-2.0.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_generator-2.0.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "http_multi_server", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "http_parser", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_parser-4.0.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "io", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/io-1.0.4", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "js", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/js-0.6.5", "packageUri": "lib/", "languageVersion": "2.16" }, { "name": "json_annotation", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.8.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/json_annotation-4.8.1", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "lints", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/lints-2.0.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "logging", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/logging-1.1.1", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "matcher", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/matcher-0.12.13", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "material_color_utilities", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0", "packageUri": "lib/", "languageVersion": "2.13" }, { "name": "matrix4_transform", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matrix4_transform-2.0.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/matrix4_transform-2.0.1", "packageUri": "lib/", "languageVersion": "2.13" }, { "name": "meta", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "mime", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/mime-1.0.4", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "package_config", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/package_config-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path_provider", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.0.14", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider-2.0.14", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "path_provider_android", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.0.27", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "path_provider_foundation", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.2.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "path_provider_linux", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.1.10", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "path_provider_platform_interface", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.0.6", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path_provider_windows", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.1.6", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "percent_indicator", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/percent_indicator-4.2.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/percent_indicator-4.2.3", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "platform", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/platform-3.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "plugin_platform_interface", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "pool", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/pool-1.5.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "process", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/process-4.2.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/process-4.2.4", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "pub_semver", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/pub_semver-2.1.4", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "pubspec_parse", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.3", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "responsive_framework", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/responsive_framework-1.0.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/responsive_framework-1.0.0", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "searchable_listview", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/searchable_listview-2.4.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/searchable_listview-2.4.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "shelf", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf-1.4.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "shelf_web_socket", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.4", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "sizer", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/sizer-2.0.15", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/sizer-2.0.15", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///C:/Users/Nutzer/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///Users/bogdan/fvm/versions/3.7.9/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_gen", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.3.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_gen-1.3.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "source_helper", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.3", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_helper-1.3.3", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "source_span", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_span-1.9.1", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/stack_trace-1.11.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "stream_channel", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_channel-2.1.1", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "stream_transform", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_transform-2.1.0", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "string_scanner", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/string_scanner-1.2.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "term_glyph", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/test_api-0.4.16", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "timing", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/timing-1.0.1", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "typed_data", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/typed_data-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "universal_io", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.2.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/universal_io-2.2.0", "packageUri": "lib/", "languageVersion": "2.15" }, { "name": "vector_math", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/vector_math-2.1.4", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "watcher", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/watcher-1.0.2", "packageUri": "lib/", "languageVersion": "2.14" }, { "name": "web_socket_channel", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.4.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/web_socket_channel-2.4.0", "packageUri": "lib/", "languageVersion": "2.15" }, { "name": "win32", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/win32-4.1.4", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/win32-4.1.4", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "xdg_directories", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.0.0", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/xdg_directories-1.0.0", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "yaml", - "rootUri": "file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.2", + "rootUri": "file:///Users/bogdan/.pub-cache/hosted/pub.dev/yaml-3.1.2", "packageUri": "lib/", "languageVersion": "2.19" }, @@ -554,7 +566,7 @@ "languageVersion": "2.19" } ], - "generated": "2023-05-13T09:16:35.483470Z", + "generated": "2023-05-25T21:42:31.568902Z", "generator": "pub", "generatorVersion": "2.19.6" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 4318107..25e5f1e 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -1,369 +1,377 @@ _fe_analyzer_shared 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-59.0.0/lib/ analyzer 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-5.11.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-5.11.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/analyzer-5.11.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/analyzer-5.11.1/lib/ animate_gradient 2.16 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/animate_gradient-0.0.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/animate_gradient-0.0.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/animate_gradient-0.0.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/animate_gradient-0.0.2/lib/ args 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/args-2.4.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/args-2.4.1/lib/ assorted_layout_widgets 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/assorted_layout_widgets-8.0.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/assorted_layout_widgets-8.0.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/assorted_layout_widgets-8.0.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/assorted_layout_widgets-8.0.0/lib/ async 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/async-2.10.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/async-2.10.0/lib/ boolean_selector 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ build 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.3.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.3.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build-2.3.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build-2.3.1/lib/ build_config 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-1.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_config-1.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_config-1.1.1/lib/ build_daemon 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-3.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-3.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_daemon-3.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_daemon-3.1.1/lib/ build_resolvers 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_resolvers-2.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_resolvers-2.2.0/lib/ build_runner 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.3.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-2.3.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner-2.3.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner-2.3.3/lib/ build_runner_core 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-7.2.7/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-7.2.7/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner_core-7.2.7/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/build_runner_core-7.2.7/lib/ built_collection 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_collection-5.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_collection-5.1.1/lib/ built_value 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.5.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.5.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_value-8.5.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/built_value-8.5.0/lib/ card_swiper 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/card_swiper-2.0.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/card_swiper-2.0.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/card_swiper-2.0.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/card_swiper-2.0.4/lib/ characters 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/characters-1.2.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/characters-1.2.1/lib/ checked_yaml 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3/lib/ clock 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/clock-1.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/clock-1.1.1/lib/ code_builder 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.4.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-4.4.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/code_builder-4.4.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/code_builder-4.4.0/lib/ collection 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/collection-1.17.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/ convert 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/convert-3.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/convert-3.1.1/lib/ crypto 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/crypto-3.0.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/crypto-3.0.3/lib/ cupertino_icons 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.5/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.5/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5/lib/ dart_style 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.3.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.3.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/dart_style-2.3.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/dart_style-2.3.1/lib/ empty_widget 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/empty_widget-0.0.5/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/empty_widget-0.0.5/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/empty_widget-0.0.5/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/empty_widget-0.0.5/lib/ +equatable +2.12 +file:///Users/bogdan/.pub-cache/hosted/pub.dev/equatable-2.0.5/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/equatable-2.0.5/lib/ fake_async 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fake_async-1.3.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib/ ffi 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.0.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/ffi-2.0.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/ffi-2.0.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/ffi-2.0.1/lib/ file 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/file-6.1.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/file-6.1.4/lib/ fixnum 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fixnum-1.1.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fixnum-1.1.0/lib/ +fl_chart +2.17 +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fl_chart-0.62.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/fl_chart-0.62.0/lib/ flutter_dotenv 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_dotenv-5.0.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_dotenv-5.0.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_dotenv-5.0.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_dotenv-5.0.2/lib/ flutter_lints 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/lib/ frontend_server_client 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-3.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/frontend_server_client-3.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/frontend_server_client-3.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/frontend_server_client-3.2.0/lib/ glob 2.15 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/glob-2.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/glob-2.1.1/lib/ graphs 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-2.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/graphs-2.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/graphs-2.2.0/lib/ hive 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive-2.2.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive-2.2.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive-2.2.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive-2.2.3/lib/ hive_flutter 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_flutter-1.1.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_flutter-1.1.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_flutter-1.1.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_flutter-1.1.0/lib/ hive_generator 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_generator-2.0.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/hive_generator-2.0.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_generator-2.0.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/hive_generator-2.0.0/lib/ http_multi_server 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1/lib/ http_parser 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_parser-4.0.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib/ io 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/io-1.0.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/io-1.0.4/lib/ js 2.16 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/js-0.6.5/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/js-0.6.5/lib/ json_annotation 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.8.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.8.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/json_annotation-4.8.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/json_annotation-4.8.1/lib/ lints 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/lints-2.0.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/lints-2.0.1/lib/ logging 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/logging-1.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/logging-1.1.1/lib/ matcher 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/matcher-0.12.13/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/matcher-0.12.13/lib/ material_color_utilities 2.13 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/ matrix4_transform 2.13 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matrix4_transform-2.0.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/matrix4_transform-2.0.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/matrix4_transform-2.0.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/matrix4_transform-2.0.1/lib/ meta 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/meta-1.8.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/meta-1.8.0/lib/ mime 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/mime-1.0.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/mime-1.0.4/lib/ package_config 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/package_config-2.1.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/package_config-2.1.0/lib/ path 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path-1.8.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path-1.8.2/lib/ path_provider 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.0.14/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider-2.0.14/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider-2.0.14/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider-2.0.14/lib/ path_provider_android 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.0.27/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_android-2.0.27/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/lib/ path_provider_foundation 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.2.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_foundation-2.2.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2/lib/ path_provider_linux 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.1.10/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.1.10/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/lib/ path_provider_platform_interface 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/lib/ path_provider_windows 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.1.6/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_windows-2.1.6/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/lib/ percent_indicator 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/percent_indicator-4.2.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/percent_indicator-4.2.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/percent_indicator-4.2.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/percent_indicator-4.2.3/lib/ platform 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/platform-3.1.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/platform-3.1.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/platform-3.1.0/lib/ plugin_platform_interface 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib/ pool 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pool-1.5.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pool-1.5.1/lib/ process 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/process-4.2.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/process-4.2.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/process-4.2.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/process-4.2.4/lib/ pub_semver 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pub_semver-2.1.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pub_semver-2.1.4/lib/ pubspec_parse 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.3/lib/ responsive_framework 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/responsive_framework-1.0.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/responsive_framework-1.0.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/responsive_framework-1.0.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/responsive_framework-1.0.0/lib/ searchable_listview 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/searchable_listview-2.4.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/searchable_listview-2.4.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/searchable_listview-2.4.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/searchable_listview-2.4.0/lib/ shelf 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf-1.4.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf-1.4.1/lib/ shelf_web_socket 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.4/lib/ sizer 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/sizer-2.0.15/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/sizer-2.0.15/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/sizer-2.0.15/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/sizer-2.0.15/lib/ source_gen 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.3.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.3.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_gen-1.3.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_gen-1.3.0/lib/ source_helper 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.3/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.3/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_helper-1.3.3/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_helper-1.3.3/lib/ source_span 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_span-1.9.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/source_span-1.9.1/lib/ stack_trace 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/lib/ stream_channel 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib/ stream_transform 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_transform-2.1.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/stream_transform-2.1.0/lib/ string_scanner 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib/ term_glyph 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/ test_api 2.18 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/test_api-0.4.16/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/test_api-0.4.16/lib/ timing 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/timing-1.0.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/timing-1.0.1/lib/ typed_data 2.12 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/typed_data-1.3.1/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/typed_data-1.3.1/lib/ universal_io 2.15 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.2.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/universal_io-2.2.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/universal_io-2.2.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/universal_io-2.2.0/lib/ vector_math 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ watcher 2.14 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/watcher-1.0.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/watcher-1.0.2/lib/ web_socket_channel 2.15 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.4.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.4.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/web_socket_channel-2.4.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/web_socket_channel-2.4.0/lib/ win32 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/win32-4.1.4/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/win32-4.1.4/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/win32-4.1.4/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/win32-4.1.4/lib/ xdg_directories 2.17 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.0.0/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/xdg_directories-1.0.0/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/xdg_directories-1.0.0/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/xdg_directories-1.0.0/lib/ yaml 2.19 -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.2/ -file:///C:/Users/Nutzer/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.2/lib/ -sky_engine -2.12 -file:///C:/Users/Nutzer/flutter/bin/cache/pkg/sky_engine/ -file:///C:/Users/Nutzer/flutter/bin/cache/pkg/sky_engine/lib/ -flutter -2.17 -file:///C:/Users/Nutzer/flutter/packages/flutter/ -file:///C:/Users/Nutzer/flutter/packages/flutter/lib/ -flutter_test -2.17 -file:///C:/Users/Nutzer/flutter/packages/flutter_test/ -file:///C:/Users/Nutzer/flutter/packages/flutter_test/lib/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/yaml-3.1.2/ +file:///Users/bogdan/.pub-cache/hosted/pub.dev/yaml-3.1.2/lib/ ernaehrung 2.19 -file:///C:/Users/Nutzer/source/repos/Flutter-Ernaehrungsapp/ -file:///C:/Users/Nutzer/source/repos/Flutter-Ernaehrungsapp/lib/ +file:///Users/bogdan/IdeaProjects/ernaehrung/ +file:///Users/bogdan/IdeaProjects/ernaehrung/lib/ +sky_engine +2.12 +file:///Users/bogdan/fvm/versions/3.7.9/bin/cache/pkg/sky_engine/ +file:///Users/bogdan/fvm/versions/3.7.9/bin/cache/pkg/sky_engine/lib/ +flutter +2.17 +file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter/ +file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter/lib/ +flutter_test +2.17 +file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter_test/ +file:///Users/bogdan/fvm/versions/3.7.9/packages/flutter_test/lib/ 2 diff --git a/.dart_tool/version b/.dart_tool/version index ad64131..7560320 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.7.11 \ No newline at end of file +3.7.9 \ No newline at end of file diff --git a/.flutter-plugins b/.flutter-plugins index 5ff5caf..ff4cc46 100644 --- a/.flutter-plugins +++ b/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Nutzer\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path_provider-2.0.14\\ -path_provider_android=C:\\Users\\Nutzer\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\Nutzer\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path_provider_foundation-2.2.2\\ -path_provider_linux=C:\\Users\\Nutzer\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path_provider_linux-2.1.10\\ -path_provider_windows=C:\\Users\\Nutzer\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path_provider_windows-2.1.6\\ +path_provider=/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider-2.0.14/ +path_provider_android=/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/ +path_provider_foundation=/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2/ +path_provider_linux=/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/ +path_provider_windows=/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 5c89fed..913bc4f 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Nutzer\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.2.2\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Nutzer\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Nutzer\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.2.2\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Nutzer\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_linux-2.1.10\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Nutzer\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_windows-2.1.6\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-05-14 09:21:07.613440","version":"3.7.11"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2/","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/bogdan/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-05-25 23:42:32.742938","version":"3.7.9"} \ No newline at end of file diff --git a/lib/android/components/MealPageFoodComponent.dart b/lib/android/components/MealPageFoodComponent.dart new file mode 100644 index 0000000..f3f3038 --- /dev/null +++ b/lib/android/components/MealPageFoodComponent.dart @@ -0,0 +1,27 @@ +import 'package:ernaehrung/android/components/food_list_component.dart'; +import 'package:flutter/material.dart'; + +import 'meal_page_text/title_component.dart'; + +class MealPageStatisticsFoodComponent extends StatelessWidget { + const MealPageStatisticsFoodComponent({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + decoration: const BoxDecoration( + color: Colors.white + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: const [ + SizedBox( + height: 24, + ), + TitleComponent("Nahrung"), + FoodComponent() + ], + ), + ); + } +} diff --git a/lib/android/components/circular/circular_component.dart b/lib/android/components/circular/circular_component.dart new file mode 100644 index 0000000..65d1460 --- /dev/null +++ b/lib/android/components/circular/circular_component.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; +import 'package:percent_indicator/circular_percent_indicator.dart'; + +class CircularLoadingComponent extends StatelessWidget { + final String textCenter; + const CircularLoadingComponent(this.textCenter, {Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return CircularPercentIndicator( + animation: true, + radius: 60.0, + lineWidth: 5.0, + percent: 0.5, + center: Text(textCenter), + progressColor: Colors.lightGreen, + ); + } +} \ No newline at end of file diff --git a/lib/android/components/circular/line_circular_with_text_component.dart b/lib/android/components/circular/line_circular_with_text_component.dart new file mode 100644 index 0000000..127afd2 --- /dev/null +++ b/lib/android/components/circular/line_circular_with_text_component.dart @@ -0,0 +1,38 @@ +import 'package:ernaehrung/android/components/meal_page_text/statistics_text_component.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:percent_indicator/linear_percent_indicator.dart'; + +class LineCircularWiTextComponent extends StatelessWidget { + final Color progressColor; + final double percent; + final int left; + final int total; + final String textName; + + const LineCircularWiTextComponent( + this.progressColor, this.percent, this.left, this.total, this.textName, + {super.key}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 0, horizontal: 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StaticsTextComponent(left.toString(), true), + const SizedBox(height: 4,), + LinearPercentIndicator( + padding: EdgeInsets.zero, + lineHeight: 8.0, + percent: 0.9, + progressColor: progressColor, + ), + const SizedBox(height: 4,), + StaticsTextComponent(textName, false), + ], + ), + ); + } +} diff --git a/lib/android/components/food_list_component.dart b/lib/android/components/food_list_component.dart new file mode 100644 index 0000000..88dfff3 --- /dev/null +++ b/lib/android/components/food_list_component.dart @@ -0,0 +1,41 @@ +import 'package:flutter/cupertino.dart'; +import 'package:hive/hive.dart'; +import 'package:hive_flutter/adapters.dart'; + +import '../models/food.dart'; +import 'card_component.dart'; + +class FoodComponent extends StatelessWidget { + const FoodComponent({Key? key}) : super(key: key); + + List castDynamicToListFood(List dynamicList) { + List foodList = []; + for (Food element in dynamicList) { + foodList.add(element); + } + + return foodList; + } + + @override + Widget build(BuildContext context) { + return ValueListenableBuilder( + valueListenable: Hive.box("TODAY").listenable(), + builder: (context, box, widget) { + return ListView.builder( + primary: false, + shrinkWrap: true, + itemCount: box.keys.length, + itemBuilder: (context, i) { + if (box.keyAt(i).toString() == "DATE") { + return const SizedBox.shrink(); + } else { + return CardComponent( + eatingMealName: box.keyAt(i).toString(), + selectedMeal: + castDynamicToListFood(box.getAt(i))); + } + }); + }); + } +} diff --git a/lib/android/components/meal_page_text/days_component.dart b/lib/android/components/meal_page_text/days_component.dart new file mode 100644 index 0000000..ffc43c8 --- /dev/null +++ b/lib/android/components/meal_page_text/days_component.dart @@ -0,0 +1,25 @@ +import 'package:ernaehrung/android/components/meal_page_text/days_text_component.dart'; +import 'package:flutter/cupertino.dart'; + +class DaysMealPageComponent extends StatelessWidget { + final String dayText = "Tag"; + final String weekText = "Woche"; + final String monthText = "Monat"; + + const DaysMealPageComponent({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 0), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + DaysTextComponent(dayText), + DaysTextComponent(weekText), + DaysTextComponent(monthText), + ], + ), + ); + } +} diff --git a/lib/android/components/meal_page_text/days_text_component.dart b/lib/android/components/meal_page_text/days_text_component.dart new file mode 100644 index 0000000..a5ace69 --- /dev/null +++ b/lib/android/components/meal_page_text/days_text_component.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; + +class DaysTextComponent extends StatelessWidget { + final String name; + + const DaysTextComponent(this.name, {super.key}); + + @override + Widget build(BuildContext context) { + return TextButton( + onPressed: () {}, + child: Text( + name, + style: const TextStyle( + color: Color.fromARGB(255, 211, 211, 211), + fontSize: 14, + ), + )); + } +} diff --git a/lib/android/components/meal_page_text/secondary_big_text_component.dart b/lib/android/components/meal_page_text/secondary_big_text_component.dart new file mode 100644 index 0000000..2eccc37 --- /dev/null +++ b/lib/android/components/meal_page_text/secondary_big_text_component.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; + +class SecondaryBigTextComponent extends StatelessWidget { + final String title; + + const SecondaryBigTextComponent(this.title, {Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text( + title.toString(), + style: const TextStyle( + color: Colors.black, + fontSize: 30, + fontWeight: FontWeight.w600), + textAlign: TextAlign.left, + ); + } +} diff --git a/lib/android/components/meal_page_text/secondary_text_component.dart b/lib/android/components/meal_page_text/secondary_text_component.dart new file mode 100644 index 0000000..d56e287 --- /dev/null +++ b/lib/android/components/meal_page_text/secondary_text_component.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; + +class SecondaryTextComponent extends StatelessWidget { + final String title; + + const SecondaryTextComponent(this.title, {Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text( + title.toString(), + style: TextStyle( + color: Colors.grey.shade500, + fontSize: 14, + fontWeight: FontWeight.w500), + textAlign: TextAlign.left, + ); + } +} diff --git a/lib/android/components/meal_page_text/statistics_text_component.dart b/lib/android/components/meal_page_text/statistics_text_component.dart new file mode 100644 index 0000000..365e324 --- /dev/null +++ b/lib/android/components/meal_page_text/statistics_text_component.dart @@ -0,0 +1,19 @@ +import 'package:flutter/cupertino.dart'; + +class StaticsTextComponent extends StatelessWidget { + final String name; + final bool titleOrSecondary; + + const StaticsTextComponent(this.name, this.titleOrSecondary, {super.key}); + + @override + Widget build(BuildContext context) { + return Text(name, + textAlign: TextAlign.left, + style: TextStyle( + color: const Color.fromARGB(255, 211, 211, 211), + fontSize: titleOrSecondary ? 14 : 10, + fontWeight: titleOrSecondary ? FontWeight.w600 : FontWeight.w400 + )); + } +} diff --git a/lib/android/components/meal_page_text/statistics_today_component.dart b/lib/android/components/meal_page_text/statistics_today_component.dart new file mode 100644 index 0000000..a4dac6a --- /dev/null +++ b/lib/android/components/meal_page_text/statistics_today_component.dart @@ -0,0 +1,49 @@ +import 'package:ernaehrung/android/components/circular/circular_component.dart'; +import 'package:ernaehrung/android/components/circular/line_circular_with_text_component.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class StatisticsPercentage extends StatelessWidget { + final double heightStatisticsContainer = 220.0; + final double widthStatisticsContainer = double.infinity; + + const StatisticsPercentage({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + decoration: + BoxDecoration(border: Border.all(width: 2.0, color: Colors.black)), + height: heightStatisticsContainer, + padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Expanded( + child: SizedBox( + child: Padding( + padding: EdgeInsets.symmetric(vertical: 0, horizontal: 8), + child: FittedBox( + child: CircularLoadingComponent("100%"), + ), + ), + ), + ), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + LineCircularWiTextComponent( + Colors.green.shade400, 1.0, 1000, 2000, "Konsumiert"), + LineCircularWiTextComponent( + Colors.green.shade400, 1.0, 1000, 2000, "Konsumiert"), + LineCircularWiTextComponent( + Colors.green.shade400, 1.0, 1000, 2000, "Konsumiert"), + ], + ), + ) + ], + ), + ); + } +} diff --git a/lib/android/components/meal_page_text/title_component.dart b/lib/android/components/meal_page_text/title_component.dart new file mode 100644 index 0000000..3145930 --- /dev/null +++ b/lib/android/components/meal_page_text/title_component.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; + +class TitleComponent extends StatelessWidget { + final String title; + + const TitleComponent(this.title, {super.key}); + + @override + Widget build(BuildContext context) { + return Text( + title.toString(), + style: TextStyle( + color: Colors.orange.shade400, + fontSize: 18, + fontWeight: FontWeight.w500), + textAlign: TextAlign.left, + ); + } +} diff --git a/lib/android/components/statistics_circular_indicator_component.dart b/lib/android/components/statistics_circular_indicator_component.dart index a9a7b25..045927b 100644 --- a/lib/android/components/statistics_circular_indicator_component.dart +++ b/lib/android/components/statistics_circular_indicator_component.dart @@ -1,5 +1,5 @@ +import 'package:ernaehrung/android/components/circular/circular_component.dart'; import 'package:flutter/material.dart'; -import 'package:percent_indicator/circular_percent_indicator.dart'; class StatisticsPercentComponent extends StatelessWidget { late String eaten, calorienBurned, calorienLeft, calorienLeftPercent; @@ -22,13 +22,7 @@ class StatisticsPercentComponent extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(eaten), - CircularPercentIndicator( - radius: 60.0, - lineWidth: 5.0, - percent: 0.5, - center: const Text("100%"), //TODO: anpassen - progressColor: Colors.lightGreen, - ), + const CircularLoadingComponent("100"), Text(calorienBurned), ], ); diff --git a/lib/android/pages/nav_pages/meal_plan_page.dart b/lib/android/pages/nav_pages/meal_plan_page.dart index 7b9a696..d926423 100644 --- a/lib/android/pages/nav_pages/meal_plan_page.dart +++ b/lib/android/pages/nav_pages/meal_plan_page.dart @@ -1,16 +1,12 @@ - +import 'package:ernaehrung/android/components/MealPageFoodComponent.dart'; +import 'package:ernaehrung/android/components/meal_page_text/days_component.dart'; +import 'package:ernaehrung/android/components/meal_page_text/statistics_today_component.dart'; import 'package:flutter/material.dart'; -import 'package:hive_flutter/adapters.dart'; -import '../../components/card_component.dart'; -import '../../models/food.dart'; - - - class MealPlanPage extends StatefulWidget { - final String title; final Color backgroundColor = const Color(0xff47a44b); + const MealPlanPage({Key? key, required this.title}) : super(key: key); String get getTitle => title; @@ -20,67 +16,26 @@ class MealPlanPage extends StatefulWidget { return getTitle; } - @override - Widget build(BuildContext context) { - return Scaffold(); - } - @override State createState() => _MealPlanState(); - } + class _MealPlanState extends State { - - List castDynamicToListFood(List dynamicList) { - List foodList = []; - - for (Food element in dynamicList) { - foodList.add(element); - } - return foodList; - } - @override Widget build(BuildContext context) { return Scaffold( - body: SizedBox( - width: double.infinity, - height: double.infinity, - child: Container( - decoration: const BoxDecoration( - gradient: LinearGradient( - colors: [Color(0xff000000), Color(0xff47a44b)], - stops: [0.1, 5], - begin: Alignment.bottomCenter, - end: Alignment.topCenter, - )), - child: SingleChildScrollView( - padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 0), + body: Container( + margin: const EdgeInsets.all(8), + width: double.infinity, + height: double.infinity, + child: SingleChildScrollView( child: Column( - children: [ - ValueListenableBuilder( - valueListenable: Hive.box("TODAY").listenable(), - builder: (context, box, widget) { - return ListView.builder( - primary: false, - shrinkWrap: true, - itemCount: box.keys.length, - itemBuilder: (context, i) { - if(box.keyAt(i).toString() == "DATE"){ - return const SizedBox.shrink(); - }else{ - return CardComponent( - eatingMealName: box.keyAt(i).toString(), - selectedMeal: castDynamicToListFood( - box.getAt(i)) - ); - } - } - ); - }), + children: const [ + DaysMealPageComponent(), + StatisticsPercentage(), + MealPageStatisticsFoodComponent(), ], ), - )), - )); + ))); } -} \ No newline at end of file +} diff --git a/lib/android/pages/nav_pages/progress_page.dart b/lib/android/pages/nav_pages/progress_page.dart index 01dc6d6..ebfd779 100644 --- a/lib/android/pages/nav_pages/progress_page.dart +++ b/lib/android/pages/nav_pages/progress_page.dart @@ -1,8 +1,13 @@ -import 'package:flutter/cupertino.dart'; +import 'package:ernaehrung/android/components/meal_page_text/secondary_big_text_component.dart'; +import 'package:ernaehrung/android/components/meal_page_text/secondary_text_component.dart'; +import 'package:ernaehrung/android/components/meal_page_text/title_component.dart'; +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; -class ProgressPage extends StatelessWidget{ +class ProgressPage extends StatelessWidget { final String title; final Color backgroundColor = const Color(0xff47a44b); + const ProgressPage({Key? key, required this.title}) : super(key: key); String get getTitle => title; @@ -12,12 +17,288 @@ class ProgressPage extends StatelessWidget{ return getTitle; } + /* + * TODO: in versch. Dateien auslagern, damit der Code nicht voll gemüllt wird + * */ @override Widget build(BuildContext context) { - return Container( - + return Scaffold( + body: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 8), + child: Column( + children: [ + Container( + height: 284, + decoration: BoxDecoration( + border: Border.all(), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const TitleComponent("Kalorien"), + const SizedBox( + height: 16, + ), + const SecondaryTextComponent("Durchschnittlich"), + SecondaryBigTextComponent(1235.toString()), + SizedBox( + height: 200, + child: BarChart( + BarChartData( + barTouchData: barTouchData, + titlesData: titlesData, + borderData: borderData, + barGroups: barGroups, + gridData: FlGridData(show: false), + alignment: BarChartAlignment.spaceAround, + maxY: 200, + ), + ), + ) + ], + ), + ), + Container( + margin: const EdgeInsets.symmetric(vertical: 16, horizontal: 0), + child: Column( + //TODO: Aussortieren und mit einer Schleife drüber gehen + //bzw. die Daten aus der Hivebox ziehen und sortieren + children: [ + const TitleComponent( + "Lebensmittel mit dem höchsten Kaloriengehalt"), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ), + const SizedBox(height: 24,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: const [ + SecondaryTextComponent("Haferflocker"), + SecondaryTextComponent("670 Kalorien"), + ], + ) + ], + ), + ) + ], + ), + ), + ), ); } + BarTouchData get barTouchData => BarTouchData( + enabled: false, + touchTooltipData: BarTouchTooltipData( + tooltipBgColor: Colors.transparent, + tooltipPadding: EdgeInsets.zero, + tooltipMargin: 4, + getTooltipItem: ( + BarChartGroupData group, + int groupIndex, + BarChartRodData rod, + int rodIndex, + ) { + return BarTooltipItem( + rod.toY.round().toString(), + const TextStyle( + color: Colors.orange, + fontWeight: FontWeight.bold, + ), + ); + }, + ), + ); + Widget getTitles(double value, TitleMeta meta) { + const style = TextStyle( + color: Colors.red, + fontWeight: FontWeight.bold, + fontSize: 14, + ); + String text; + switch (value.toInt()) { + case 0: + text = 'Mn'; + break; + case 1: + text = 'Te'; + break; + case 2: + text = 'Wd'; + break; + case 3: + text = 'Tu'; + break; + case 4: + text = 'Fr'; + break; + case 5: + text = 'St'; + break; + case 6: + text = 'Sn'; + break; + default: + text = ''; + break; + } + return SideTitleWidget( + axisSide: meta.axisSide, + space: 4, + child: Text(text, style: style), + ); + } + + FlTitlesData get titlesData => FlTitlesData( + show: true, + bottomTitles: AxisTitles( + sideTitles: SideTitles( + showTitles: true, + reservedSize: 30, + getTitlesWidget: getTitles, + ), + ), + leftTitles: AxisTitles( + sideTitles: SideTitles(showTitles: false), + ), + topTitles: AxisTitles( + sideTitles: SideTitles(showTitles: false), + ), + rightTitles: AxisTitles( + sideTitles: SideTitles(showTitles: false), + ), + ); + + FlBorderData get borderData => FlBorderData( + show: false, + ); + + LinearGradient get _barsGradient => const LinearGradient( + colors: [ + Colors.cyan, + Colors.deepPurple, + ], + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + ); + + List get barGroups => [ + BarChartGroupData( + x: 0, + barRods: [ + BarChartRodData( + toY: 8, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 1, + barRods: [ + BarChartRodData( + toY: 10, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 2, + barRods: [ + BarChartRodData( + toY: 14, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 3, + barRods: [ + BarChartRodData( + toY: 150, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 4, + barRods: [ + BarChartRodData( + toY: 13, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 5, + barRods: [ + BarChartRodData( + toY: 10, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + BarChartGroupData( + x: 6, + barRods: [ + BarChartRodData( + toY: 16, + gradient: _barsGradient, + ) + ], + showingTooltipIndicators: [0], + ), + ]; } diff --git a/lib/android/pages/nav_pages/today_page.dart b/lib/android/pages/nav_pages/today_page.dart index 491e382..cef0a10 100644 --- a/lib/android/pages/nav_pages/today_page.dart +++ b/lib/android/pages/nav_pages/today_page.dart @@ -1,12 +1,9 @@ +import 'package:ernaehrung/android/components/food_list_component.dart'; import 'package:flutter/material.dart'; -import 'package:hive_flutter/hive_flutter.dart'; -import '../../components/card_component.dart'; import '../../components/diet_chart_component.dart'; import '../../components/statistics_circular_indicator_component.dart'; -import '../../models/food.dart'; - -class TodayPage extends StatefulWidget{ +class TodayPage extends StatefulWidget { final String title; final Color backgroundColor = const Color(0xff47a44b); @@ -18,57 +15,31 @@ class TodayPage extends StatefulWidget{ class _TodayPageState extends State { - List castDynamicToListFood(List dynamicList) { - List foodList = []; - for (Food element in dynamicList) { - foodList.add(element); - } - - return foodList; - } @override Widget build(BuildContext context) { return Scaffold( body: SizedBox( - width: double.infinity, - height: double.infinity, - child: Container( - decoration: const BoxDecoration( - gradient: LinearGradient( - colors: [Color(0xff000000), Color(0xff47a44b)], - stops: [0.1, 5], - begin: Alignment.bottomCenter, - end: Alignment.topCenter, - )), - child: SingleChildScrollView( - padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 0), - child: Column( - children: [ - StatisticsPercentComponent(300, 100, 400), - DietChatComponent(1500), - ValueListenableBuilder( - valueListenable: Hive.box("TODAY").listenable(), - builder: (context, box, widget) { - return ListView.builder( - primary: false, - shrinkWrap: true, - itemCount: box.keys.length, - itemBuilder: (context, i) { - if(box.keyAt(i).toString() == "DATE"){ - return const SizedBox.shrink(); - }else{ - return CardComponent( - eatingMealName: box.keyAt(i).toString(), - selectedMeal: castDynamicToListFood( - box.getAt(i))); - } - } - ); - }), - ], - ), - )), - )); + width: double.infinity, + height: double.infinity, + child: Container( + decoration: const BoxDecoration( + gradient: LinearGradient( + colors: [Color(0xff000000), Color(0xff47a44b)], + stops: [0.1, 5], + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + )), + child: SingleChildScrollView( + padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 0), + child: Column( + children: [ + StatisticsPercentComponent(300, 100, 400), + DietChatComponent(1500), + const FoodComponent(), + ], + ), + )), + )); } } diff --git a/pubspec.lock b/pubspec.lock index 4dc7353..5940472 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -209,6 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.5" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" fake_async: dependency: transitive description: @@ -241,6 +249,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + fl_chart: + dependency: "direct main" + description: + name: fl_chart + sha256: "48a1b69be9544e2b03d9a8e843affd89e43f3194c9248776222efcb4206bb1ec" + url: "https://pub.dev" + source: hosted + version: "0.62.0" flutter: dependency: "direct main" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 5b8f55b..b7601e2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,6 +45,7 @@ dependencies: flutter_dotenv: ^5.0.2 responsive_framework: ^1.0.0 sizer: ^2.0.15 + fl_chart: ^0.62.0 dev_dependencies: