3-Schweinehunde
/
encrateia
Archived
3
0
Fork 0
Code Issues 17 Pull Requests Projects Releases Wiki Activity

upgraded several libaries, regenerated model.g, fixed more errors, only 1 warning left

upgrade-2021-project
Stefan Haslinger 2022-02-11 20:36:49 +01:00
parent 0a629bb5b4
commit 60dfd4ede6
7 changed files with 101 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

18
ios/Flutter/Flutter.podspec
View File

@ -1,18 +0,0 @@
#
# NOTE: This podspec is NOT to be published. It is only used as a local source!
#
Pod::Spec.new do |s|
s.name = 'Flutter'
s.version = '1.0.0'
s.summary = 'High-performance, high-fidelity mobile apps.'
s.description = <<-DESC
Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
DESC
s.homepage = 'https://flutter.io'
s.license = { :type => 'MIT' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.vendored_frameworks = 'Flutter.framework'
end

5
lib/models/athlete.dart
View File

@ -53,9 +53,10 @@ class Athlete {
set lastName(String value) => _db.lastName = value;
set recordAggregationCount(int value) => _db.recordAggregationCount = value;
set stravaAccessToken(String value) => _db.stravaAccessToken = value;
set stravaScope(String value) => _db.stravaScope = value;
set stravaTokenType(String value) => _db.stravaTokenType = value;
set stravaRefreshToken(String value) => _db.stravaRefreshToken = value;
set stravaExpire(int value) => _db.stravaExpire = value;
set stravaExpiresAt(int value) => _db.stravaExpiresAt = value;
set stravaExpiresIn(int value) => _db.stravaExpiresIn = value;
@override
String toString() => '< Athlete | $firstName $lastName | $stravaId >';

16
lib/models/strava_token.dart
View File

@ -7,8 +7,9 @@ Future<void> persist({encrateia.Athlete athlete}) async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
athlete
..stravaAccessToken = prefs.getString('strava_accessToken')
..stravaExpire = prefs.getInt('strava_expire')
..stravaScope = prefs.getString('strava_token_type')
..stravaExpiresAt = prefs.getInt('strava_expires_at')
..stravaExpiresIn = prefs.getInt('strava_expires_in')
..stravaTokenType = prefs.getString('strava_token_type')
..stravaRefreshToken = prefs.getString('strava_refreshToken');
await athlete.save();
@ -17,12 +18,12 @@ Future<void> persist({encrateia.Athlete athlete}) async {
Future<void> load({encrateia.Athlete athlete}) async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString('strava_accessToken', athlete.stravaAccessToken);
await prefs.setInt('strava_expire_at', athlete.stravaExpiresAt);
await prefs.setInt('strava_expire_in', athlete.stravaExpiresIn);
await prefs.setInt('strava_expires_at', athlete.stravaExpiresAt);
await prefs.setInt('strava_expires_in', athlete.stravaExpiresIn);
await prefs.setString('strava_token_type', athlete.stravaTokenType);
await prefs.setString('strava_refreshToken', athlete.stravaRefreshToken);
final TokenResponse token = TokenResponse(
final TokenResponse _token = TokenResponse(
tokenType: athlete.stravaTokenType,
expiresAt: athlete.stravaExpiresAt,
expiresIn: athlete.stravaExpiresIn,
@ -41,7 +42,8 @@ Future<void> delete({encrateia.Athlete athlete}) async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString('strava_accessToken', null);
await prefs.setInt('strava_expire', null);
await prefs.setString('strava_scope', null);
await prefs.setInt('strava_expires_in', null);
await prefs.setInt('strava_expires_at', null);
await prefs.setString('strava_token_type', null);
await prefs.setString('strava_refreshToken', null);
}

7
lib/screens/onboarding_screens/introduction_text_screen.dart
View File

@ -14,7 +14,12 @@ class IntroductionTextScreen extends StatelessWidget {
),
body: SafeArea(
child: Markdown(
onTapLink: (String url) => launch(url),
onTapLink: (
String _text,
String url,
String _title,
) =>
launch(url),
data: '''
## What is Encrateia?

120
pubspec.lock
View File

@ -7,28 +7,28 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "14.0.0"
version: "31.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.41.2"
version: "2.8.0"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
version: "3.1.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.0"
version: "2.3.0"
async:
dependency: transitive
description:
@ -49,49 +49,49 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.2"
version: "2.2.1"
build_config:
dependency: transitive
description:
name: build_config
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.6"
version: "1.0.0"
build_daemon:
dependency: transitive
description:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.10"
version: "3.0.1"
build_resolvers:
dependency: transitive
description:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.3"
version: "2.0.6"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "1.11.5"
version: "2.1.7"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.10"
version: "7.2.3"
build_verify:
dependency: "direct dev"
description:
name: build_verify
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "3.0.0"
built_collection:
dependency: transitive
description:
@ -140,7 +140,7 @@ packages:
name: checked_yaml
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
cli_util:
dependency: transitive
description:
@ -161,7 +161,7 @@ packages:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
version: "3.7.0"
version: "4.1.0"
collection:
dependency: "direct main"
description:
@ -175,7 +175,7 @@ packages:
name: convert
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "3.0.1"
cookie_jar:
dependency: transitive
description:
@ -189,14 +189,14 @@ packages:
name: coverage
url: "https://pub.dartlang.org"
source: hosted
version: "0.15.2"
version: "1.0.3"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
version: "3.0.1"
csslib:
dependency: transitive
description:
@ -224,7 +224,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.12"
version: "2.2.1"
datetime_picker_formfield:
dependency: "direct main"
description:
@ -292,14 +292,14 @@ packages:
name: flutter_launcher_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.5"
version: "0.9.2"
flutter_markdown:
dependency: "direct main"
description:
name: flutter_markdown
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.4"
version: "0.6.9"
flutter_material_color_picker:
dependency: "direct main"
description:
@ -326,6 +326,13 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
frontend_server_client:
dependency: transitive
description:
name: frontend_server_client
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
get_it:
dependency: transitive
description:
@ -346,7 +353,7 @@ packages:
name: graphs
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
version: "2.1.0"
html:
dependency: "direct main"
description:
@ -360,7 +367,7 @@ packages:
name: http_multi_server
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "3.2.0"
http_parser:
dependency: transitive
description:
@ -374,7 +381,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.19"
version: "3.1.1"
intl:
dependency: transitive
description:
@ -388,7 +395,7 @@ packages:
name: io
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.5"
version: "1.0.3"
js:
dependency: transitive
description:
@ -416,7 +423,7 @@ packages:
name: markdown
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.8"
version: "4.0.1"
matcher:
dependency: transitive
description:
@ -451,14 +458,14 @@ packages:
name: node_preamble
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.13"
version: "2.0.1"
package_config:
dependency: transitive
description:
name: package_config
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
version: "2.0.2"
package_info:
dependency: "direct main"
description:
@ -535,7 +542,7 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "4.4.0"
platform:
dependency: transitive
description:
@ -577,7 +584,7 @@ packages:
name: pubspec_parse
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.8"
version: "1.2.0"
shared_preferences:
dependency: transitive
description:
@ -647,21 +654,21 @@ packages:
name: shelf_packages_handler
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "3.0.0"
shelf_static:
dependency: transitive
description:
name: shelf_static
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.9+2"
version: "1.1.0"
shelf_web_socket:
dependency: transitive
description:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.4+1"
version: "1.0.1"
sky_engine:
dependency: transitive
description: flutter
@ -673,7 +680,7 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.10+3"
version: "1.2.1"
source_map_stack_trace:
dependency: transitive
description:
@ -701,28 +708,49 @@ packages:
name: sqfentity
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.5+3"
version: "2.2.0+1.pre"
sqfentity_gen:
dependency: "direct main"
description:
name: sqfentity_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.0+2"
version: "2.2.0+2.pre"
sqflite:
dependency: "direct main"
description:
name: sqflite
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.2+4"
version: "1.3.2+1"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3+3"
version: "2.2.0"
sqflite_common_ffi:
dependency: transitive
description:
name: sqflite_common_ffi
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0+2"
sqflite_sqlcipher:
dependency: transitive
description:
name: sqflite_sqlcipher
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
sqlite3:
dependency: transitive
description:
name: sqlite3
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.1"
stack_trace:
dependency: transitive
description:
@ -734,7 +762,7 @@ packages:
dependency: "direct main"
description:
path: "."
ref: HEAD
ref: abf9a78cc30680fe31e88d473b1089bf88ae9cf5
resolved-ref: abf9a78cc30680fe31e88d473b1089bf88ae9cf5
url: "git://github.com/dreampowder/strava_flutter"
source: git
@ -766,7 +794,7 @@ packages:
name: synchronized
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0+2"
version: "3.0.0"
term_glyph:
dependency: transitive
description:
@ -780,28 +808,28 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.16.5"
version: "1.17.10"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
version: "0.4.2"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.15"
version: "0.4.0"
timing:
dependency: transitive
description:
name: timing
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1+3"
version: "1.0.0"
typed_data:
dependency: transitive
description:
@ -892,7 +920,7 @@ packages:
name: uuid
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
version: "3.0.5"
vector_math:
dependency: transitive
description:
@ -920,7 +948,7 @@ packages:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "2.1.0"
webkit_inspection_protocol:
dependency: transitive
description:
@ -948,14 +976,14 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "4.5.1"
version: "5.3.1"
yaml:
dependency: transitive
description:
name: yaml
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "3.1.0"
sdks:
dart: ">=2.15.0 <3.0.0"
flutter: ">=2.10.0"

17
pubspec.yaml
View File

@ -21,27 +21,28 @@ dependencies:
flushbar: 1.10.4
flutter:
sdk: flutter
flutter_launcher_icons: ^0.7.2
flutter_markdown: ^0.4.1
flutter_launcher_icons: 0.9.2
flutter_markdown: 0.6.9
flutter_material_color_picker: ^1.0.5
flutter_secure_storage: ^3.3.1+1
flutter_staggered_grid_view: 0.3.0
html: ^0.15.0
package_info: ^0.4.0+16
path_provider: ^2.0.7
sqfentity: ^1.3.5+3
sqfentity_gen: ^1.3.5+6
path_provider: 2.0.9
sqfentity: ^2.2.0+1.pre
sqfentity_gen: ^2.2.0+2.pre
sqflite: ^1.3.0
# strava_flutter: ^1.2.1+54
strava_flutter:
git:
url: git://github.com/dreampowder/strava_flutter
ref: abf9a78cc30680fe31e88d473b1089bf88ae9cf5
url_launcher: ^6.0.17
uuid: 2.0.4
uuid: 3.0.5
dev_dependencies:
build_runner: ^1.10.1
build_verify: ^1.1.1
build_runner: ^2.1.7
build_verify: ^3.0.0
flutter:
uses-material-design: true