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

wip: updating to latest strava_flutter

upgrade-2021-project
Stefan Haslinger 2022-02-11 18:45:57 +01:00
parent 756e4d844b
commit 0a629bb5b4
7 changed files with 7594 additions and 12154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

5
lib/model/model.dart
View File

@ -26,9 +26,10 @@ const SqfEntityTable tableAthlete = SqfEntityTable(
SqfEntityField('downloadInterval', DbType.integer),
SqfEntityField('recordAggregationCount', DbType.integer),
SqfEntityField('stravaAccessToken', DbType.text),
SqfEntityField('stravaScope', DbType.text),
SqfEntityField('stravaTokenType', DbType.text),
SqfEntityField('stravaRefreshToken', DbType.text),
SqfEntityField('stravaExpire', DbType.integer),
SqfEntityField('stravaExpiresAt', DbType.integer),
SqfEntityField('stravaExpiresIn', DbType.integer),
],
);

19683
lib/model/model.g.dart
View File

File diff suppressed because it is too large Load Diff

7
lib/models/athlete.dart
View File

@ -3,7 +3,7 @@ import 'dart:io';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:path_provider/path_provider.dart';
import 'package:sqfentity_gen/sqfentity_gen.dart' show BoolResult;
import 'package:strava_flutter/Models/detailedAthlete.dart';
import 'package:strava_flutter/domain/model/model_detailed_athlete.dart';
import '/model/model.dart'
show
@ -40,11 +40,12 @@ class Athlete {
String get state => _db.state;
String get stravaUsername => _db.stravaUsername;
String get stravaAccessToken => _db.stravaAccessToken;
String get stravaScope => _db.stravaScope;
String get stravaTokenType => _db.stravaTokenType;
String get stravaRefreshToken => _db.stravaRefreshToken;
int get downloadInterval => _db.downloadInterval;
int get recordAggregationCount => _db.recordAggregationCount;
int get stravaExpire => _db.stravaExpire;
int get stravaExpiresAt => _db.stravaExpiresAt;
int get stravaExpiresIn => _db.stravaExpiresIn;
int get stravaId => _db.stravaId;
set downloadInterval(int value) => _db.downloadInterval = value;

33
lib/models/strava_token.dart
View File

@ -1,38 +1,41 @@
import 'package:shared_preferences/shared_preferences.dart';
import 'package:strava_flutter/globals.dart' as globals;
import 'package:strava_flutter/domain/model/model_authentication_response.dart';
import 'athlete.dart';
import '/models/athlete.dart' as encrateia;
Future<void> persist({Athlete athlete}) async {
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_scope')
..stravaScope = prefs.getString('strava_token_type')
..stravaRefreshToken = prefs.getString('strava_refreshToken');
await athlete.save();
}
Future<void> load({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', athlete.stravaExpire);
await prefs.setString('strava_scope', athlete.stravaScope);
await prefs.setInt('strava_expire_at', athlete.stravaExpiresAt);
await prefs.setInt('strava_expire_in', athlete.stravaExpiresIn);
await prefs.setString('strava_token_type', athlete.stravaTokenType);
await prefs.setString('strava_refreshToken', athlete.stravaRefreshToken);
globals.token
..accessToken = athlete.stravaAccessToken
..scope = athlete.stravaScope
..expiresAt = athlete.stravaExpire
..refreshToken = athlete.stravaRefreshToken;
final TokenResponse token = TokenResponse(
tokenType: athlete.stravaTokenType,
expiresAt: athlete.stravaExpiresAt,
expiresIn: athlete.stravaExpiresIn,
accessToken: athlete.stravaAccessToken,
refreshToken: athlete.stravaRefreshToken);
}
Future<void> delete({Athlete athlete}) async {
Future<void> delete({encrateia.Athlete athlete}) async {
athlete
..stravaAccessToken = null
..stravaExpire = null
..stravaScope = null
..stravaExpiresAt = null
..stravaExpiresIn = null
..stravaTokenType = null
..stravaRefreshToken = null;
await athlete.save();

2
lib/screens/strava_get_user.dart
View File

@ -55,7 +55,7 @@ class _StravaGetUserState extends State<StravaGetUser> {
], redirectUrl: 'stravaflutter://redirect');
final DetailedAthlete stravaAthlete =
await stravaClient.getLoggedInAthlete();
await stravaClient.athletes.getAuthenticatedAthlete();
await widget.athlete.updateFromStravaAthlete(stravaAthlete);
}

16
pubspec.lock
View File

@ -591,14 +591,14 @@ packages:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.10"
version: "2.0.11"
shared_preferences_ios:
dependency: transitive
description:
name: shared_preferences_ios
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.9"
version: "2.0.10"
shared_preferences_linux:
dependency: transitive
description:
@ -843,14 +843,14 @@ packages:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.14"
version: "6.0.15"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.14"
version: "6.0.15"
url_launcher_linux:
dependency: transitive
description:
@ -878,7 +878,7 @@ packages:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
version: "2.0.8"
url_launcher_windows:
dependency: transitive
description:
@ -934,7 +934,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.6"
version: "2.3.11"
xdg_directories:
dependency: transitive
description:
@ -957,5 +957,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.14.0 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.15.0 <3.0.0"
flutter: ">=2.10.0"