From 1628a1c252f1100c6c300b7a5f227c21e01db460 Mon Sep 17 00:00:00 2001 From: Stefan Haslinger Date: Sat, 1 May 2021 15:13:36 +0200 Subject: [PATCH] upgraded flutter and started to fix deprecations --- .flutter-plugins-dependencies | 2 +- .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/6.1.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/6.1.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/6.1.1/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/checksums/checksums.lock | Bin 0 -> 17 bytes .gradle/vcs-1/gc.properties | 0 changelog.txt | 10 ++- lib/models/record_list.dart | 2 - .../add_heart_rate_zone_schema_screen.dart | 3 +- lib/screens/add_power_zone_schema_screen.dart | 3 +- .../onboarding_create_user.dart | 10 ++- .../onboarding_finished_screen.dart | 4 +- .../onboarding_introduction_screen.dart | 7 +- lib/utils/my_button.dart | 21 ++++++ .../athlete_power_vs_distance.dart | 1 - local.properties | 8 ++ pubspec.lock | 69 +++++++----------- pubspec.yaml | 11 +-- test/widget_test.dart | 30 -------- 22 files changed, 89 insertions(+), 94 deletions(-) create mode 100644 .gradle/6.1.1/executionHistory/executionHistory.lock create mode 100644 .gradle/6.1.1/fileChanges/last-build.bin create mode 100644 .gradle/6.1.1/fileHashes/fileHashes.lock create mode 100644 .gradle/6.1.1/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/checksums/checksums.lock create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 local.properties delete mode 100644 test/widget_test.dart diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 242c4ac..98e37ae 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":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.5.0/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.5.0/","dependencies":[]}],"macos":[{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"url_launcher_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+7/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+1/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+1/","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2021-01-27 13:54:11.413137","version":"1.22.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.5.0/","dependencies":[]}],"android":[{"name":"flutter_secure_storage","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_secure_storage-3.3.3/","dependencies":[]},{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.11/","dependencies":[]},{"name":"shared_preferences","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.8/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"uni_links","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/uni_links-0.4.0/","dependencies":[]},{"name":"url_launcher","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.5.0/","dependencies":[]}],"macos":[{"name":"package_info","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.1/","dependencies":[]},{"name":"path_provider_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+10/","dependencies":[]},{"name":"sqflite","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-1.3.1/","dependencies":[]},{"name":"url_launcher_macos","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+7/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+1/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+1/","dependencies":[]}],"windows":[],"web":[{"name":"shared_preferences_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/daten/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2021-05-01 15:02:27.262115","version":"2.0.6"} \ No newline at end of file diff --git a/.gradle/6.1.1/executionHistory/executionHistory.lock b/.gradle/6.1.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..537526eb8353040e07afae09d08a12af6a36c3f7 GIT binary patch literal 17 TcmZSnx;n7(M4j9Z1}FdkJlX`x literal 0 HcmV?d00001 diff --git a/.gradle/6.1.1/fileChanges/last-build.bin b/.gradle/6.1.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/6.1.1/fileHashes/fileHashes.lock b/.gradle/6.1.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..f965ab6382bfcf8a409bc0f287fe68b8ae607925 GIT binary patch literal 17 TcmZRc`fgFr$8F~}Ge7|VNb?2V literal 0 HcmV?d00001 diff --git a/.gradle/6.1.1/gc.properties b/.gradle/6.1.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..e606090d152cfa0b1e929c765fcaa80afdceb2e7 GIT binary patch literal 17 UcmZR+y(c#9fQ9%h1_)pT05tUk2mk;8 literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..5e8f1c7 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sat May 01 14:27:20 CEST 2021 +gradle.version=6.1.1 diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..c2de9536e1c944a385fe828b377775e0772c87b7 GIT binary patch literal 17 TcmZQJI~yJCaCliQ0~7!NFM master, origin/master, oberwart/master, github/master) filter for valid ecors only" +* `2021-01-27 13:54` [2d6f117](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/2d6f117) - (HEAD -> master, origin/master, oberwart/master, github/master) version bump to 0.4.11 +* `2021-01-12 00:51` [f96643f](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/f96643f) - referenced correct watch type +* `2021-01-12 00:40` [67460d6](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/67460d6) - ignore hrv data messages +* `2021-01-12 00:30` [d8c6679](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/d8c6679) - ignore message type 329 +* `2020-12-27 12:05` [e4f6dd8](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/e4f6dd8) - update ios compatibility settings +* `2020-12-27 11:45` [f569405](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/f569405) - upgrade android Flutter wrappers +* `2020-12-27 10:47` [8462364](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/8462364) - push version to 0.4.10 for apple re-deployment +* `2020-09-25 09:21` [e5c4d63](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/e5c4d63) - version bump to 0.4.9 and flutter upgrade +* `2020-09-25 08:50` [72987c0](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/72987c0) - filter for valid ecors only" * `2020-09-25 08:37` [c27de5d](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/c27de5d) - sport selector for power,pace vs distance and power/hr * `2020-09-24 16:04` [624e413](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/624e413) - type annotations * `2020-09-24 16:02` [f33296d](https://gitlab.informatom.com/3-schweinehunde/encrateia/-/commit/f33296d) - sport selector for ftp and power ratio athlete diagrams diff --git a/lib/models/record_list.dart b/lib/models/record_list.dart index 3c11d1f..17a9fa9 100644 --- a/lib/models/record_list.dart +++ b/lib/models/record_list.dart @@ -1,5 +1,3 @@ -import 'dart:developer'; - import 'package:encrateia/models/event.dart'; import 'package:encrateia/models/power_zone.dart'; import 'package:encrateia/models/power_zone_schema.dart'; diff --git a/lib/screens/add_heart_rate_zone_schema_screen.dart b/lib/screens/add_heart_rate_zone_schema_screen.dart index ff57ba1..5e5c29e 100644 --- a/lib/screens/add_heart_rate_zone_schema_screen.dart +++ b/lib/screens/add_heart_rate_zone_schema_screen.dart @@ -235,7 +235,8 @@ class _AddHeartRateZoneSchemaScreenState 'If you only wanted to fix the date you need to delete the old heart' ' rate zone schema manually.'), actions: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('OK'), onPressed: () => Navigator.of(context).pop(), ), diff --git a/lib/screens/add_power_zone_schema_screen.dart b/lib/screens/add_power_zone_schema_screen.dart index 49cad31..87e5e5d 100644 --- a/lib/screens/add_power_zone_schema_screen.dart +++ b/lib/screens/add_power_zone_schema_screen.dart @@ -226,7 +226,8 @@ class _AddPowerZoneSchemaScreenState extends State { 'If you only wanted to fix the date you need to delete the old ' 'power zone schema manually.'), actions: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('OK'), onPressed: () => Navigator.of(context).pop(), ), diff --git a/lib/screens/onboarding_screens/onboarding_create_user.dart b/lib/screens/onboarding_screens/onboarding_create_user.dart index c442dd0..891ca23 100644 --- a/lib/screens/onboarding_screens/onboarding_create_user.dart +++ b/lib/screens/onboarding_screens/onboarding_create_user.dart @@ -1,6 +1,7 @@ import 'package:encrateia/actions/setupDemoAthlete.dart'; import 'package:encrateia/screens/onboarding_screens/onboarding_finished_screen.dart'; import 'package:encrateia/screens/onboarding_screens/onboarding_strava_credentials_screen.dart'; +import 'package:encrateia/utils/my_button.dart'; import 'package:encrateia/utils/my_color.dart'; import 'package:flushbar/flushbar.dart'; import 'package:flutter/material.dart'; @@ -52,7 +53,8 @@ class _OnboardingCreateUserScreenState ), ButtonBar( children: [ - FlatButton( + ElevatedButton( + style: MyButton.raisedButtonStyle, child: const Text('Create Demo User'), onPressed: () async { await setupDemoAthlete( @@ -87,7 +89,8 @@ class _OnboardingCreateUserScreenState ), ButtonBar( children: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('Connect to Strava'), onPressed: () async { await Navigator.push( @@ -125,7 +128,8 @@ class _OnboardingCreateUserScreenState ), ButtonBar( children: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('Create standalone User'), onPressed: () { athlete.setupStandaloneAthlete(); diff --git a/lib/screens/onboarding_screens/onboarding_finished_screen.dart b/lib/screens/onboarding_screens/onboarding_finished_screen.dart index ef8a16f..1ce7ae1 100644 --- a/lib/screens/onboarding_screens/onboarding_finished_screen.dart +++ b/lib/screens/onboarding_screens/onboarding_finished_screen.dart @@ -1,4 +1,5 @@ import 'package:encrateia/screens/dashboard.dart'; +import 'package:encrateia/utils/my_button.dart'; import 'package:encrateia/utils/my_color.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -33,7 +34,8 @@ class OnboardingFinishedScreen extends StatelessWidget { ), ButtonBar( children: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('Finish'), onPressed: () async { await Navigator.pushAndRemoveUntil( diff --git a/lib/screens/onboarding_screens/onboarding_introduction_screen.dart b/lib/screens/onboarding_screens/onboarding_introduction_screen.dart index 2f61d08..5e10b77 100644 --- a/lib/screens/onboarding_screens/onboarding_introduction_screen.dart +++ b/lib/screens/onboarding_screens/onboarding_introduction_screen.dart @@ -1,3 +1,4 @@ +import 'package:encrateia/utils/my_button.dart'; import 'package:encrateia/utils/my_color.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -35,7 +36,8 @@ class OnboardingIntroductionScreen extends StatelessWidget { ), ButtonBar( children: [ - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('Read Introduction'), onPressed: () => Navigator.push( context, @@ -44,7 +46,8 @@ class OnboardingIntroductionScreen extends StatelessWidget { ), ), ), - FlatButton( + TextButton( + style: MyButton.flatButtonStyle, child: const Text('Continue'), onPressed: () async { await Navigator.pushReplacement( diff --git a/lib/utils/my_button.dart b/lib/utils/my_button.dart index 175d8fa..bae614d 100644 --- a/lib/utils/my_button.dart +++ b/lib/utils/my_button.dart @@ -79,4 +79,25 @@ class MyButton extends RaisedButton { child: child ?? const Text('Activity'), onPressed: onPressed, ); + + static ButtonStyle raisedButtonStyle = ElevatedButton.styleFrom( + onPrimary: Colors.black87, + primary: Colors.grey[300], + minimumSize: const Size(88, 36), + padding: const EdgeInsets.symmetric(horizontal: 16), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(2)), + ), + ); + + static ButtonStyle flatButtonStyle = TextButton.styleFrom( + primary: Colors.black87, + minimumSize: const Size(88, 36), + padding: const EdgeInsets.symmetric(horizontal: 16.0), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(2.0)), + ), + ); + + } diff --git a/lib/widgets/athlete_widgets/athlete_power_vs_distance.dart b/lib/widgets/athlete_widgets/athlete_power_vs_distance.dart index a9db16f..0c7fe5b 100644 --- a/lib/widgets/athlete_widgets/athlete_power_vs_distance.dart +++ b/lib/widgets/athlete_widgets/athlete_power_vs_distance.dart @@ -1,4 +1,3 @@ -import 'dart:math'; import 'package:encrateia/models/activity.dart'; import 'package:encrateia/models/activity_list.dart'; import 'package:encrateia/models/athlete.dart'; diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..9ae349c --- /dev/null +++ b/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sat May 01 14:27:03 CEST 2021 +sdk.dir=/home/stefan/Android/Sdk diff --git a/pubspec.lock b/pubspec.lock index 3869909..682a7ae 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -35,14 +35,14 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.6.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" build: dependency: transitive description: @@ -112,14 +112,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" charts_common: dependency: transitive description: @@ -148,13 +148,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.4" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.1" code_builder: dependency: transitive description: @@ -168,7 +161,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" convert: dependency: transitive description: @@ -246,13 +239,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.1" ffi: dependency: transitive description: @@ -328,11 +314,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" flutter_web_plugins: dependency: transitive description: flutter @@ -407,7 +388,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3-nullsafety.2" + version: "0.6.3" json_annotation: dependency: transitive description: @@ -435,14 +416,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" mime: dependency: transitive description: @@ -491,7 +472,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" path_provider: dependency: "direct main" description: @@ -526,7 +507,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.11.0" petitparser: dependency: transitive description: @@ -561,7 +542,7 @@ packages: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.5.0-nullsafety.2" + version: "1.5.0" process: dependency: transitive description: @@ -671,21 +652,21 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" source_maps: dependency: transitive description: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.10-nullsafety.2" + version: "0.10.10" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.1" sqfentity: dependency: "direct main" description: @@ -734,7 +715,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" strava_flutter: dependency: "direct main" description: @@ -748,7 +729,7 @@ packages: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" stream_transform: dependency: transitive description: @@ -762,7 +743,7 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" synchronized: dependency: transitive description: @@ -776,28 +757,28 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test: dependency: transitive description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.16.0-nullsafety.5" + version: "1.16.5" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.2.19" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.12-nullsafety.5" + version: "0.3.15" timing: dependency: transitive description: @@ -811,7 +792,7 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" uni_links: dependency: transitive description: @@ -867,7 +848,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" vm_service: dependency: transitive description: @@ -918,5 +899,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.17.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.17.0" diff --git a/pubspec.yaml b/pubspec.yaml index 760364f..649d817 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,10 +7,8 @@ environment: sdk: ">=2.6.0 <3.0.0" dependencies: - flutter: - sdk: flutter - charts_flutter: ^0.8.1 + collection: ^1.14.13 csv: ^4.0.3 cupertino_icons: ^0.1.2 datetime_picker_formfield: ^1.0.0 @@ -20,11 +18,14 @@ dependencies: # fit_parser: # path: '../fit_parser' flushbar: 1.10.4 + flutter: + sdk: flutter flutter_launcher_icons: ^0.7.2 flutter_markdown: ^0.4.1 flutter_material_color_picker: ^1.0.5 flutter_secure_storage: ^3.3.1+1 flutter_staggered_grid_view: 0.3.0 + package_info: ^0.4.0+16 path_provider: ^1.6.7 sqfentity: ^1.3.5+3 sqfentity_gen: ^1.3.5+6 @@ -32,12 +33,8 @@ dependencies: strava_flutter: ^1.2.1+54 url_launcher: ^5.5.0 uuid: 2.0.4 - package_info: ^0.4.0+16 - collection: ^1.14.13 dev_dependencies: - flutter_test: - sdk: flutter build_runner: ^1.10.1 build_verify: ^1.1.1 diff --git a/test/widget_test.dart b/test/widget_test.dart deleted file mode 100644 index bc3fa28..0000000 --- a/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:encrateia/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -}