Merge branch 'master' into feature/material-3

# Conflicts:
#	lib/theme/theme.dart
#	pubspec.lock
#	pubspec.yaml
This commit is contained in:
Roland Geider
2023-05-19 17:07:44 +02:00
15 changed files with 488 additions and 384 deletions

View File

@@ -1,63 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>de.wger.flutter</id>
<name>wger</name>
<summary>Fitness/workout, nutrition and weight tracker</summary>
<id>de.wger.flutter</id>
<name>wger</name>
<summary>Fitness/workout, nutrition and weight tracker</summary>
<metadata_license>CC0-1.0</metadata_license>
<project_license>AGPL-3.0-or-later</project_license>
<recommends>
<control>touch</control>
<control>pointing</control>
<control>keyboard</control>
</recommends>
<developer_name>wger</developer_name>
<url type="homepage">https://wger.de/</url>
<url type="bugtracker">https://github.com/wger-project/flutter/issues</url>
<metadata_license>CC0-1.0</metadata_license>
<project_license>AGPL-3.0-or-later</project_license>
<recommends>
<control>touch</control>
<control>pointing</control>
<control>keyboard</control>
</recommends>
<developer_name>wger</developer_name>
<url type="homepage">https://wger.de/</url>
<url type="bugtracker">https://github.com/wger-project/flutter/issues</url>
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
<description>
<p>From fitness lovers to fitness lovers get your health organized with WGER, your Workout Manager!</p>
<p>Have you already found your #1 fitness app and do you love to create your own sports routines? No matter what type of sporty beast you are we all have something in common: We love to keep track of our health data &lt;3</p>
<p>So we dont judge you for still managing your fitness journey with your handy little workout log book but welcome to 2021!</p>
<p>We have developed a 100% free digital health and fitness tracker app for you, sized down to the most relevant features to make your life easier. Get started, keep training and celebrate your progress!</p>
<p>wger is an Open Source project and all about:</p>
<ul>
<li><strong>Your body:</strong> No need to google for the ingredients of your favourite treats choose your daily meals from more than 78000 products and see the nutritional values. Add meals to the nutritional plan and keep an overview of your diet in the calendar.</li>
<li><strong>Your workouts:</strong> You know what is best for your body. Create your own workouts out of a growing variety from 200 different exercises. Then, use the Gym Mode to guide you through the training while you log your weights with one tap.</li>
<li><strong>Your progress:</strong> Never lose sight of your goals. Track your weight and keep your statistics.</li>
<li><strong>Your data:</strong> wger is your personalized fitness diary but you own your data. Use the REST API to access and do amazing things with it.</li>
</ul>
<p>Please note: This free app is not based on additional fundings and we dont ask you to donate money. More than that it is a community project which is growing constantly. So be prepared for new features anytime!</p>
<p><strong>OpenSource what does that mean?</strong> Open Source means that the whole source code for this app and the server it talks to is free and available to anybody:</p>
<ul>
<description>
<p>
From fitness lovers to fitness lovers get your health organized with WGER,
your Workout Manager!
</p>
<p>
Have you already found your #1 fitness app and do you love to create your own sports
routines? No matter what type of sporty beast you are we all have something in common:
We love to keep track of our health data &lt;3
</p>
<p>
So we dont judge you for still managing your fitness journey with your handy little
workout log book but welcome to 2021!
</p>
<p>
We have developed a 100% free digital health and fitness tracker app for you, sized down
to the most relevant features to make your life easier. Get started, keep training and
celebrate your progress!
</p>
<p>wger is an Open Source project and all about:</p>
<ul>
<li>
Your body:
No need to google for the ingredients of your favourite treats choose your daily
meals from more than 78000 products and see the nutritional values. Add meals to the
nutritional plan and keep an overview of your diet in the calendar.
</li>
<li>
Your workouts:
You know what is best for your body. Create your own workouts out of a growing
variety from 200 different exercises. Then, use the Gym Mode to guide you through
the training while you log your weights with one tap.
</li>
<li>
Your progress:
Never lose sight of your goals. Track your weight and keep your statistics.
</li>
<li>
Your data:
wger is your personalized fitness diary but you own your data. Use the REST API to
access and do amazing things with it.
</li>
</ul>
<p>Please note: This free app is not based on additional fundings and we dont ask you to
donate money. More than that it is a community project which is growing constantly. So
be prepared for new features anytime!
</p>
<p>
OpenSource what does that mean?
Open Source means that the whole source code for this app and the server it talks to is
free and available to anybody:
</p>
<ul>
<li>Do you want to run wger on your own server for you or your local gym? Go ahead!</li>
<li>Do you miss a feature and want to implement it? Start now!</li>
<li>Do you want to check that nothing is being sent anywhere? You can!</li>
</ul>
<p>Join our community and become a part of sport enthusiasts and IT geeks from all over the world. We keep working on adjusting and optimizing the app customized to our needs. We love your input so feel free to jump in anytime and contribute your wishes and ideas!</p>
<ul>
<li>find the source code on <a href="https://github.com/wger-project">https://github.com/wger-project</a></li>
<li>ask your questions or just say hello on our discord Server <a href="https://discord.gg/rPWFv6W">https://discord.gg/rPWFv6W</a></li>
</ul>
</description>
</ul>
<p>Join our community and become a part of sport enthusiasts and IT geeks from all over the
world. We keep working on adjusting and optimizing the app customized to our needs. We
love your input so feel free to jump in anytime and contribute your wishes and ideas!
</p>
<ul>
<li>find the source code on https://github.com/wger-project
</li>
<li>
ask your questions or just say hello on our discord Server
https://discord.gg/rPWFv6W
</li>
</ul>
</description>
<screenshots>
<screenshot type="default">
<caption>wger's dashboard</caption>
<image type="source">https://github.com/wger-project/flutter/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png</image>
</screenshot>
</screenshots>
<screenshots>
<screenshot type="default">
<caption>wger's dashboard</caption>
<image type="source">
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png
</image>
</screenshot>
<screenshot>
<caption>Workout detail</caption>
<image type="source">
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/02%20-%20workout%20detail.png
</image>
</screenshot>
<screenshot>
<caption>Measurements</caption>
<image type="source">
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04%20-%20measurements.png
</image>
</screenshot>
<screenshot>
<caption>Nutritional plan</caption>
<image type="source">
https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05%20-%20nutritional%20plan.png
</image>
</screenshot>
</screenshots>
<releases>
<release version="1.5.3" date="2023-03-16" />
</releases>
<releases>
<release version="1.5.3" date="2023-03-16" />
</releases>
<content_rating type="oars-1.1" />
<content_rating type="oars-1.1" />
<launchable type="desktop-id">de.wger.flutter.desktop</launchable>
<launchable type="desktop-id">de.wger.flutter.desktop</launchable>
</component>

View File

@@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<string>11.0</string>
</dict>
</plist>

View File

@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

View File

@@ -1,70 +1,71 @@
PODS:
- camera (0.0.1):
- Flutter
- Flutter (1.0.0)
- flutter_barcode_scanner (2.0.0):
- Flutter
- flutter_keyboard_visibility (0.0.1):
- Flutter
- image_picker (0.0.1):
- image_picker_ios (0.0.1):
- Flutter
- package_info (0.0.1):
- integration_test (0.0.1):
- Flutter
- shared_preferences_ios (0.0.1):
- package_info_plus (0.4.5):
- Flutter
- rive_common (0.0.1):
- Flutter
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- url_launcher_ios (0.0.1):
- Flutter
- video_player (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter_wkwebview (0.0.1):
- video_player_avfoundation (0.0.1):
- Flutter
DEPENDENCIES:
- camera (from `.symlinks/plugins/camera/ios`)
- Flutter (from `Flutter`)
- flutter_barcode_scanner (from `.symlinks/plugins/flutter_barcode_scanner/ios`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- rive_common (from `.symlinks/plugins/rive_common/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
EXTERNAL SOURCES:
camera:
:path: ".symlinks/plugins/camera/ios"
Flutter:
:path: Flutter
flutter_barcode_scanner:
:path: ".symlinks/plugins/flutter_barcode_scanner/ios"
flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
package_info:
:path: ".symlinks/plugins/package_info/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
integration_test:
:path: ".symlinks/plugins/integration_test/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
rive_common:
:path: ".symlinks/plugins/rive_common/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
video_player:
:path: ".symlinks/plugins/video_player/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter_wkwebview:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
video_player_avfoundation:
:path: ".symlinks/plugins/video_player_avfoundation/ios"
SPEC CHECKSUMS:
camera: fe33292aff715a981eb34d7ce7b35b54337ff34c
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
COCOAPODS: 1.11.2
COCOAPODS: 1.12.0

View File

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -199,6 +199,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -252,6 +253,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -339,7 +341,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -425,7 +427,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -474,7 +476,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;

View File

@@ -43,5 +43,7 @@
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>

View File

@@ -28,6 +28,9 @@ String getTranslation(String value, BuildContext context) {
case 'Biceps':
return AppLocalizations.of(context).biceps;
case 'Body Weight':
return AppLocalizations.of(context).body_weight;
case 'Calves':
return AppLocalizations.of(context).calves;
@@ -58,21 +61,27 @@ String getTranslation(String value, BuildContext context) {
case 'Kilometers':
return AppLocalizations.of(context).kilometers;
case 'Kilometers Per Hour':
return AppLocalizations.of(context).kilometers_per_hour;
case 'Lats':
return AppLocalizations.of(context).lats;
case 'Legs':
return AppLocalizations.of(context).legs;
case 'Lower back':
return AppLocalizations.of(context).lower_back;
case 'Miles':
return AppLocalizations.of(context).miles;
case 'Miles Per Hour':
return AppLocalizations.of(context).miles_per_hour;
case 'Minutes':
return AppLocalizations.of(context).minutes;
case 'Plates':
return AppLocalizations.of(context).plates;
case 'Pull-up bar':
return AppLocalizations.of(context).pull_up_bar;
@@ -100,6 +109,12 @@ String getTranslation(String value, BuildContext context) {
case 'Until Failure':
return AppLocalizations.of(context).until_failure;
case 'kg':
return AppLocalizations.of(context).kg;
case 'lb':
return AppLocalizations.of(context).lb;
case 'none (bodyweight exercise)':
return AppLocalizations.of(context).none__bodyweight_exercise_;

View File

@@ -635,37 +635,150 @@
}
},
"cacheWarning": "Due to caching it might take some time till the changes are visible throughout the application.",
"abs": "Abs",
"arms": "Arms",
"back": "Back",
"barbell": "Barbell",
"bench": "Bench",
"biceps": "Biceps",
"calves": "Calves",
"cardio": "Cardio",
"chest": "Chest",
"dumbbell": "Dumbbell",
"glutes": "Glutes",
"gym_mat": "Gym mat",
"hamstrings": "Hamstrings",
"incline_bench": "Incline bench",
"kettlebell": "Kettlebell",
"kilometers": "Kilometers",
"lats": "Lats",
"legs": "Legs",
"lower_back": "Lower back",
"miles": "Miles",
"minutes": "Minutes",
"pull_up_bar": "Pull-up bar",
"quads": "Quads",
"repetitions": "Repetitions",
"sz_bar": "SZ-Bar",
"seconds": "Seconds",
"shoulders": "Shoulders",
"swiss_ball": "Swiss Ball",
"triceps": "Triceps",
"until_failure": "Until Failure",
"none__bodyweight_exercise_": "none (bodyweight exercise)",
"textPromptTitle": "Ready to start?",
"textPromptSubheading": "Press the action button to begin"
"textPromptSubheading": "Press the action button to begin",
"abs": "Abs",
"@abs": {
"description": "Generated entry for translation for server strings"
},
"arms": "Arms",
"@arms": {
"description": "Generated entry for translation for server strings"
},
"back": "Back",
"@back": {
"description": "Generated entry for translation for server strings"
},
"barbell": "Barbell",
"@barbell": {
"description": "Generated entry for translation for server strings"
},
"bench": "Bench",
"@bench": {
"description": "Generated entry for translation for server strings"
},
"biceps": "Biceps",
"@biceps": {
"description": "Generated entry for translation for server strings"
},
"body_weight": "Body Weight",
"@body_weight": {
"description": "Generated entry for translation for server strings"
},
"calves": "Calves",
"@calves": {
"description": "Generated entry for translation for server strings"
},
"cardio": "Cardio",
"@cardio": {
"description": "Generated entry for translation for server strings"
},
"chest": "Chest",
"@chest": {
"description": "Generated entry for translation for server strings"
},
"dumbbell": "Dumbbell",
"@dumbbell": {
"description": "Generated entry for translation for server strings"
},
"glutes": "Glutes",
"@glutes": {
"description": "Generated entry for translation for server strings"
},
"gym_mat": "Gym mat",
"@gym_mat": {
"description": "Generated entry for translation for server strings"
},
"hamstrings": "Hamstrings",
"@hamstrings": {
"description": "Generated entry for translation for server strings"
},
"incline_bench": "Incline bench",
"@incline_bench": {
"description": "Generated entry for translation for server strings"
},
"kettlebell": "Kettlebell",
"@kettlebell": {
"description": "Generated entry for translation for server strings"
},
"kilometers": "Kilometers",
"@kilometers": {
"description": "Generated entry for translation for server strings"
},
"kilometers_per_hour": "Kilometers Per Hour",
"@kilometers_per_hour": {
"description": "Generated entry for translation for server strings"
},
"lats": "Lats",
"@lats": {
"description": "Generated entry for translation for server strings"
},
"legs": "Legs",
"@legs": {
"description": "Generated entry for translation for server strings"
},
"miles": "Miles",
"@miles": {
"description": "Generated entry for translation for server strings"
},
"miles_per_hour": "Miles Per Hour",
"@miles_per_hour": {
"description": "Generated entry for translation for server strings"
},
"minutes": "Minutes",
"@minutes": {
"description": "Generated entry for translation for server strings"
},
"plates": "Plates",
"@plates": {
"description": "Generated entry for translation for server strings"
},
"pull_up_bar": "Pull-up bar",
"@pull_up_bar": {
"description": "Generated entry for translation for server strings"
},
"quads": "Quads",
"@quads": {
"description": "Generated entry for translation for server strings"
},
"repetitions": "Repetitions",
"@repetitions": {
"description": "Generated entry for translation for server strings"
},
"sz_bar": "SZ-Bar",
"@sz_bar": {
"description": "Generated entry for translation for server strings"
},
"seconds": "Seconds",
"@seconds": {
"description": "Generated entry for translation for server strings"
},
"shoulders": "Shoulders",
"@shoulders": {
"description": "Generated entry for translation for server strings"
},
"swiss_ball": "Swiss Ball",
"@swiss_ball": {
"description": "Generated entry for translation for server strings"
},
"triceps": "Triceps",
"@triceps": {
"description": "Generated entry for translation for server strings"
},
"until_failure": "Until Failure",
"@until_failure": {
"description": "Generated entry for translation for server strings"
},
"kg": "kg",
"@kg": {
"description": "Generated entry for translation for server strings"
},
"lb": "lb",
"@lb": {
"description": "Generated entry for translation for server strings"
},
"none__bodyweight_exercise_": "none (bodyweight exercise)",
"@none__bodyweight_exercise_": {
"description": "Generated entry for translation for server strings"
}
}

View File

@@ -717,5 +717,9 @@
"cacheWarning": "Önbelleğe alma nedeniyle değişikliklerin uygulama genelinde görünür olması biraz zaman alabilir.",
"@cacheWarning": {},
"searchNamesInEnglish": "Ayrıca İngilizce adları da arayın",
"@searchNamesInEnglish": {}
"@searchNamesInEnglish": {},
"textPromptTitle": "Başlamaya hazır mısınız?",
"@textPromptTitle": {},
"textPromptSubheading": "Başlamak için eylem düğmesine basın",
"@textPromptSubheading": {}
}

View File

@@ -717,5 +717,9 @@
"cacheWarning": "Через кешування може знадобитися деякий час, перш ніж зміни стануть видимими у всьому застосунку.",
"@cacheWarning": {},
"searchNamesInEnglish": "Також шукайте імена англійською мовою",
"@searchNamesInEnglish": {}
"@searchNamesInEnglish": {},
"textPromptTitle": "Готові почати?",
"@textPromptTitle": {},
"textPromptSubheading": "Натисніть кнопку дії, щоб почати",
"@textPromptSubheading": {}
}

View File

@@ -159,7 +159,7 @@
},
"loginInstead": "登录",
"@loginInstead": {},
"registerInstead": "注册",
"registerInstead": "没有帐户?点击注册",
"@registerInstead": {},
"reset": "重置",
"@reset": {
@@ -556,5 +556,11 @@
"logged": "已记录",
"@logged": {
"description": "Header for the column of 'logged' nutritional values, i.e. what was eaten"
},
"userProfile": "账户",
"@userProfile": {},
"exerciseName": "锻炼名",
"@exerciseName": {
"description": "Label for the name of a workout exercise"
}
}

View File

@@ -178,8 +178,8 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
return Column(
children: [
Container(
padding: const EdgeInsets.all(15),
height: 220,
padding: const EdgeInsets.all(15),
height: 220,
child: charts.BarChart(
[
charts.Series<NutritionData, String>(
@@ -187,8 +187,8 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
domainFn: (nutritionEntry, index) => nutritionEntry.name,
measureFn: (nutritionEntry, index) => nutritionEntry.value,
data: [
NutritionData(
AppLocalizations.of(context).energy, _nutritionalPlan.nutritionalValues.energy),
NutritionData(AppLocalizations.of(context).energy,
_nutritionalPlan.nutritionalValues.energy),
],
),
charts.Series<NutritionData, String>(
@@ -197,7 +197,8 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
measureFn: (nutritionEntry, index) => nutritionEntry.value,
fillPatternFn: (nutritionEntry, index) => charts.FillPatternType.forwardHatch,
data: [
NutritionData(AppLocalizations.of(context).energy, loggedNutritionalValues.energy),
NutritionData(
AppLocalizations.of(context).energy, loggedNutritionalValues.energy),
],
),
charts.Series<NutritionData, String>(
@@ -223,8 +224,9 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
),
),
),
Container( padding: const EdgeInsets.all(15),
height: 300,
Container(
padding: const EdgeInsets.all(15),
height: 300,
child: charts.BarChart(
[
charts.Series<NutritionData, String>(
@@ -276,7 +278,7 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
// AppLocalizations.of(context).energy,
// loggedNutritionalValues.energy
// ),
NutritionData(
AppLocalizations.of(context).protein, loggedNutritionalValues.protein),
NutritionData(AppLocalizations.of(context).carbohydrates,
@@ -286,8 +288,10 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
NutritionData(AppLocalizations.of(context).fat, loggedNutritionalValues.fat),
NutritionData(AppLocalizations.of(context).saturatedFat,
loggedNutritionalValues.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, loggedNutritionalValues.fibres),
NutritionData(AppLocalizations.of(context).sodium, loggedNutritionalValues.sodium),
NutritionData(
AppLocalizations.of(context).fibres, loggedNutritionalValues.fibres),
NutritionData(
AppLocalizations.of(context).sodium, loggedNutritionalValues.sodium),
],
),
charts.Series<NutritionData, String>(
@@ -299,9 +303,11 @@ class NutritionalPlanHatchBarChartWidget extends StatelessWidget {
NutritionData(AppLocalizations.of(context).protein, sevenDayAvg.protein),
NutritionData(
AppLocalizations.of(context).carbohydrates, sevenDayAvg.carbohydrates),
NutritionData(AppLocalizations.of(context).sugars, sevenDayAvg.carbohydratesSugar),
NutritionData(
AppLocalizations.of(context).sugars, sevenDayAvg.carbohydratesSugar),
NutritionData(AppLocalizations.of(context).fat, sevenDayAvg.fat),
NutritionData(AppLocalizations.of(context).saturatedFat, sevenDayAvg.fatSaturated),
NutritionData(
AppLocalizations.of(context).saturatedFat, sevenDayAvg.fatSaturated),
NutritionData(AppLocalizations.of(context).fibres, sevenDayAvg.fibres),
NutritionData(AppLocalizations.of(context).sodium, sevenDayAvg.sodium),
],

View File

@@ -9,12 +9,10 @@ import package_info_plus
import rive_common
import shared_preferences_foundation
import url_launcher_macos
import wakelock_macos
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
}

View File

@@ -5,18 +5,18 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: a36ec4843dc30ea6bf652bf25e3448db6c5e8bcf4aa55f063a5d1dad216d8214
sha256: "8880b4cfe7b5b17d57c052a5a3a8cc1d4f546261c7cc8fbd717bd53f48db0568"
url: "https://pub.dev"
source: hosted
version: "58.0.0"
version: "59.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: cc4242565347e98424ce9945c819c192ec0838cb9d1f6aa4a97cc96becbc5b27
sha256: a89627f49b0e70e068130a36571409726b04dab12da7e5625941d2c8ec278b96
url: "https://pub.dev"
source: hosted
version: "5.10.0"
version: "5.11.1"
android_metadata:
dependency: "direct main"
description:
@@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: args
sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.1"
async:
dependency: transitive
description:
@@ -117,10 +117,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d"
url: "https://pub.dev"
source: hosted
version: "8.4.4"
version: "8.5.0"
carousel_slider:
dependency: "direct main"
description:
@@ -165,26 +165,10 @@ packages:
dependency: transitive
description:
name: checked_yaml
sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.2"
chewie:
dependency: transitive
description:
name: chewie
sha256: e9da4898ee4859825404f507969f57113c04ca0060e152b95c9afd73934126ad
url: "https://pub.dev"
source: hosted
version: "1.4.0"
chewie_audio:
dependency: transitive
description:
name: chewie_audio
sha256: f92bb4364ced21318e1a7c0eddaf249a7554e5cf27f869d58c44d926abd292a7
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "2.0.3"
cider:
dependency: "direct dev"
description:
@@ -197,10 +181,10 @@ packages:
dependency: transitive
description:
name: cli_util
sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
url: "https://pub.dev"
source: hosted
version: "0.3.5"
version: "0.4.0"
clock:
dependency: transitive
description:
@@ -269,10 +253,10 @@ packages:
dependency: transitive
description:
name: dart_style
sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352"
sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.3.1"
equatable:
dependency: "direct main"
description:
@@ -313,14 +297,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
flex_seed_scheme:
dependency: "direct main"
description:
name: flex_seed_scheme
sha256: b3678d82403c13dec2ee2721e078b26f14577712411b6aa981b0f4269df3fabb
url: "https://pub.dev"
source: hosted
version: "1.2.4"
flutter:
dependency: "direct main"
description: flutter
@@ -351,18 +327,18 @@ packages:
dependency: "direct main"
description:
name: flutter_html
sha256: ccb810fcabfce3a7ffaca46e458323915ac7e7fc59082c7357ff848972c02230
sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd"
url: "https://pub.dev"
source: hosted
version: "2.2.1"
version: "3.0.0-alpha.6"
flutter_keyboard_visibility:
dependency: transitive
description:
name: flutter_keyboard_visibility
sha256: "86b71bbaffa38e885f5c21b1182408b9be6951fd125432cf6652c636254cef2d"
sha256: "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb"
url: "https://pub.dev"
source: hosted
version: "5.4.0"
version: "5.4.1"
flutter_keyboard_visibility_linux:
dependency: transitive
description:
@@ -407,18 +383,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_launcher_icons
sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
url: "https://pub.dev"
source: hosted
version: "0.11.0"
flutter_layout_grid:
dependency: transitive
description:
name: flutter_layout_grid
sha256: "86c1b21520612edfbb93f189b3ec05058470570f3a5c08ce10c92cc76a6e814e"
url: "https://pub.dev"
source: hosted
version: "1.0.6"
version: "0.13.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -432,22 +400,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_math_fork:
dependency: transitive
description:
name: flutter_math_fork
sha256: a34205227e1a1d040a56e74a5e2e56e9397ea930540a9373bd0b3e2e4f122017
url: "https://pub.dev"
source: hosted
version: "0.5.0"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0"
url: "https://pub.dev"
source: hosted
version: "2.0.9"
version: "2.0.14"
flutter_staggered_grid_view:
dependency: "direct main"
description:
@@ -460,10 +420,10 @@ packages:
dependency: "direct main"
description:
name: flutter_svg
sha256: cbf529d563dd910a249041bde2a0dfc3cf62280fcc459b85f3d614b2ab73abb3
sha256: f991fdb1533c3caeee0cdc14b04f50f0c3916f0dbcbc05237ccbe4e3c6b93f3f
url: "https://pub.dev"
source: hosted
version: "0.23.0+1"
version: "2.0.5"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -473,10 +433,10 @@ packages:
dependency: "direct main"
description:
name: flutter_typeahead
sha256: edfc51579ca3756adaa32b6849cf44af03276b93e8a8a68d8247ee243598f1b2
sha256: "721610b3d61814efa13fb5f720a6781bc123cd51b7e01f5a45d7c92124376644"
url: "https://pub.dev"
source: hosted
version: "4.3.7"
version: "4.3.8"
flutter_web_plugins:
dependency: transitive
description: flutter
@@ -523,18 +483,18 @@ packages:
dependency: transitive
description:
name: html
sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8"
url: "https://pub.dev"
source: hosted
version: "0.15.2"
version: "0.15.3"
http:
dependency: "direct main"
description:
name: http
sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
url: "https://pub.dev"
source: hosted
version: "0.13.5"
version: "0.13.6"
http_multi_server:
dependency: transitive
description:
@@ -555,26 +515,26 @@ packages:
dependency: transitive
description:
name: image
sha256: "02bafd3b4f399bfeb10034deba9753d93b55ce41cd0c4d3d8b355626f80e5b32"
sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
url: "https://pub.dev"
source: hosted
version: "3.1.3"
version: "4.0.17"
image_picker:
dependency: "direct main"
description:
name: image_picker
sha256: f202f5d730eb8219e35e80c4461fb3a779940ad30ce8fde1586df756e3af25e6
sha256: "3da954c3b8906d82ecb50fd5e2b5401758f06d5678904eed6cbc06172283a263"
url: "https://pub.dev"
source: hosted
version: "0.8.7+3"
version: "0.8.7+4"
image_picker_android:
dependency: transitive
description:
name: image_picker_android
sha256: "1ea6870350f56af8dab716459bd9d5dc76947e29e07a2ba1d0c172eaaf4f269c"
sha256: "271e0448e82268b3fa1cb2a48e4a911cbc2135587123d7df8e7ca703c5b10da2"
url: "https://pub.dev"
source: hosted
version: "0.8.6+7"
version: "0.8.6+11"
image_picker_for_web:
dependency: transitive
description:
@@ -632,18 +592,18 @@ packages:
dependency: "direct main"
description:
name: json_annotation
sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "4.8.1"
json_serializable:
dependency: "direct dev"
description:
name: json_serializable
sha256: dadc08bd61f72559f938dd08ec20dbfec6c709bba83515085ea943d2078d187a
sha256: "43793352f90efa5d8b251893a63d767b2f7c833120e3cc02adad55eefec04dc7"
url: "https://pub.dev"
source: hosted
version: "6.6.1"
version: "6.6.2"
klizma:
dependency: transitive
description:
@@ -672,10 +632,10 @@ packages:
dependency: transitive
description:
name: markdown
sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
url: "https://pub.dev"
source: hosted
version: "7.0.2"
version: "7.1.0"
marker:
dependency: transitive
description:
@@ -752,10 +712,10 @@ packages:
dependency: transitive
description:
name: numerus
sha256: "0087ef729d63b96cb347a9c44b9c592f21cecb3605b415bbd18710aef80ce5cb"
sha256: "436759d84f233b40107d0cc31cfa92d24e0960afeb2e506be70926d4cddffd9e"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "2.0.0"
package_config:
dependency: transitive
description:
@@ -768,10 +728,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: cbff87676c352d97116af6dbea05aa28c4d65eb0f6d5677a520c11a69ca9a24d
sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.1.2"
package_info_plus_platform_interface:
dependency: transitive
description:
@@ -788,22 +748,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.8.2"
path_drawing:
dependency: transitive
description:
name: path_drawing
sha256: "3bdd251dae9ffaef944450b73f168610db7e968e7b20daf0c3907f8b4aafc8a2"
url: "https://pub.dev"
source: hosted
version: "0.5.1+1"
path_parsing:
dependency: transitive
description:
name: path_parsing
sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337
sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
url: "https://pub.dev"
source: hosted
version: "0.2.1"
version: "1.0.1"
path_provider_linux:
dependency: transitive
description:
@@ -824,10 +776,10 @@ packages:
dependency: transitive
description:
name: path_provider_windows
sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
url: "https://pub.dev"
source: hosted
version: "2.1.5"
version: "2.1.6"
petitparser:
dependency: transitive
description:
@@ -880,26 +832,18 @@ packages:
dependency: transitive
description:
name: pub_semver
sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "2.1.4"
pubspec_parse:
dependency: transitive
description:
name: pubspec_parse
sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
url: "https://pub.dev"
source: hosted
version: "1.2.2"
quiver:
dependency: transitive
description:
name: quiver
sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "1.2.3"
rfc_6901:
dependency: transitive
description:
@@ -920,26 +864,26 @@ packages:
dependency: transitive
description:
name: rive_common
sha256: "12ea4a1ca1aa2ddeb2ef212afa20517d6c140a5deb32149c713912a7e6b7e26e"
sha256: "7c4be235d75c34a0f257b4487c0cc314188aa2f9a6c177d34f02df53d7c25831"
url: "https://pub.dev"
source: hosted
version: "0.0.3"
version: "0.0.5"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46"
sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
shared_preferences_foundation:
dependency: transitive
description:
@@ -984,18 +928,18 @@ packages:
dependency: transitive
description:
name: shelf
sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
shelf_web_socket:
dependency: transitive
description:
name: shelf_web_socket
sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.4"
simple_gesture_detector:
dependency: transitive
description:
@@ -1013,10 +957,10 @@ packages:
dependency: transitive
description:
name: source_gen
sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298
sha256: b20e191de6964e98032573cecb1d2b169d96ba63fdb586d24dcd1003ba7e94f6
url: "https://pub.dev"
source: hosted
version: "1.2.7"
version: "1.3.0"
source_helper:
dependency: transitive
description:
@@ -1105,14 +1049,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.1"
tuple:
dependency: transitive
description:
name: tuple
sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
typed_data:
dependency: transitive
description:
@@ -1125,18 +1061,18 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3
url: "https://pub.dev"
source: hosted
version: "6.1.10"
version: "6.1.11"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: a52628068d282d01a07cd86e6ba99e497aa45ce8c91159015b2416907d78e411
sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd"
url: "https://pub.dev"
source: hosted
version: "6.0.27"
version: "6.0.31"
url_launcher_ios:
dependency: transitive
description:
@@ -1149,10 +1085,10 @@ packages:
dependency: transitive
description:
name: url_launcher_linux
sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
url: "https://pub.dev"
source: hosted
version: "3.0.4"
version: "3.0.5"
url_launcher_macos:
dependency: transitive
description:
@@ -1181,10 +1117,34 @@ packages:
dependency: transitive
description:
name: url_launcher_windows
sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.6"
vector_graphics:
dependency: transitive
description:
name: vector_graphics
sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79
url: "https://pub.dev"
source: hosted
version: "1.1.5"
vector_graphics_codec:
dependency: transitive
description:
name: vector_graphics_codec
sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced
url: "https://pub.dev"
source: hosted
version: "1.1.5"
vector_graphics_compiler:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca"
url: "https://pub.dev"
source: hosted
version: "1.1.5"
vector_math:
dependency: transitive
description:
@@ -1221,18 +1181,18 @@ packages:
dependency: transitive
description:
name: video_player_android
sha256: a592048a711d5739d9cea2255d425779f138d41095b9149bda60ce4bc1af8871
sha256: b608c320ab1a5fd373987c9c3c9ddbd6bda04d209f2a9f0bf197c5b02082201e
url: "https://pub.dev"
source: hosted
version: "2.4.4"
version: "2.4.7"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
sha256: "75c6d68cd479a25f34d635149ba6887bc8f1b2b2921841121fd44ea0c5bc1927"
sha256: "824dad3e2986a13766fcccfd1c48c83eef9f896c220a53292e3019b9e98615bb"
url: "https://pub.dev"
source: hosted
version: "2.4.4"
version: "2.4.5"
video_player_platform_interface:
dependency: transitive
description:
@@ -1257,46 +1217,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "9.4.0"
wakelock:
dependency: transitive
description:
name: wakelock
sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
url: "https://pub.dev"
source: hosted
version: "0.6.2"
wakelock_macos:
dependency: transitive
description:
name: wakelock_macos
sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
wakelock_platform_interface:
dependency: transitive
description:
name: wakelock_platform_interface
sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621"
url: "https://pub.dev"
source: hosted
version: "0.3.0"
wakelock_web:
dependency: transitive
description:
name: wakelock_web
sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
wakelock_windows:
dependency: transitive
description:
name: wakelock_windows
sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567"
url: "https://pub.dev"
source: hosted
version: "0.2.1"
watcher:
dependency: transitive
description:
@@ -1321,46 +1241,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
webview_flutter:
dependency: transitive
description:
name: webview_flutter
sha256: "6886b3ceef1541109df5001054aade5ee3c36b5780302e41701c78357233721c"
url: "https://pub.dev"
source: hosted
version: "2.8.0"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd"
url: "https://pub.dev"
source: hosted
version: "2.10.4"
webview_flutter_platform_interface:
dependency: transitive
description:
name: webview_flutter_platform_interface
sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf"
url: "https://pub.dev"
source: hosted
version: "1.9.5"
webview_flutter_wkwebview:
dependency: transitive
description:
name: webview_flutter_wkwebview
sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0
url: "https://pub.dev"
source: hosted
version: "2.9.5"
win32:
dependency: transitive
description:
name: win32
sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
url: "https://pub.dev"
source: hosted
version: "3.1.4"
version: "4.1.4"
xdg_directories:
dependency: transitive
description:
@@ -1373,18 +1261,18 @@ packages:
dependency: transitive
description:
name: xml
sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
url: "https://pub.dev"
source: hosted
version: "5.4.1"
version: "6.2.2"
yaml:
dependency: transitive
description:
name: yaml
sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
version: "3.1.2"
sdks:
dart: ">=2.19.0 <3.0.0"
flutter: ">=3.7.0"
flutter: ">=3.7.0-0"

View File

@@ -34,30 +34,30 @@ dependencies:
android_metadata: ^0.2.1
charts_flutter: ^0.12.0
collection: ^1.15.0-nullsafety.4
collection: ^1.17.0
cupertino_icons: ^1.0.5
equatable: ^2.0.5
flutter_calendar_carousel: ^2.4.1
flutter_html: ^2.1.2
flutter_typeahead: ^4.3.7
flutter_html: ^3.0.0-alpha.6
flutter_typeahead: ^4.3.8
font_awesome_flutter: ^10.4.0
http: ^0.13.5
image_picker: ^0.8.7
image_picker: ^0.8.7+3
intl: ^0.17.0
json_annotation: ^4.7.0
json_annotation: ^4.8.1
version: ^3.0.2
package_info_plus: ^3.0.3
package_info_plus: ^3.1.2
provider: ^6.0.5
rive: ^0.10.2
shared_preferences: ^2.1.0
rive: ^0.10.4
shared_preferences: ^2.1.1
table_calendar: ^3.0.8
url_launcher: ^6.1.10
url_launcher: ^6.1.11
flutter_barcode_scanner: ^2.0.0
video_player: ^2.6.0
video_player: ^2.6.1
flutter_staggered_grid_view: ^0.6.2
carousel_slider: ^4.2.1
multi_select_flutter: ^4.1.3
flutter_svg: ^0.23.0+1
flutter_svg: ^2.0.5
flex_seed_scheme: ^1.2.4
dev_dependencies:
@@ -66,8 +66,8 @@ dev_dependencies:
integration_test:
sdk: flutter
build_runner: ^2.3.3
flutter_launcher_icons: ^0.11.0
json_serializable: ^6.6.1
flutter_launcher_icons: ^0.13.1
json_serializable: ^6.6.2
mockito: ^5.4.0
network_image_mock: ^2.1.1
flutter_lints: ^2.0.1