Commit 6e363f92 authored by Administrator's avatar Administrator

upgraded to using AndroidX, switched to VSCode

parent 65f5bfde
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"flutter_secure_storage","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"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_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]}]}
\ No newline at end of file
......@@ -37,7 +37,7 @@ android {
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
......@@ -55,6 +55,6 @@ flutter {
dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}
......@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.5.3'
}
}
......
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
#Fri Jun 23 08:50:38 CEST 2017
#Sun Dec 29 20:52:57 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
......@@ -59,7 +59,7 @@ class Activity extends ChangeNotifier {
await strava.getLoggedInAthleteActivities(now, startDate);
for (StravaActivity.SummaryActivity summaryActivity in summaryActivities) {
Activity.fromStrava(summaryActivity).db.save;
Activity.fromStrava(summaryActivity).db.save();
}
}
......
......@@ -35,16 +35,17 @@ class Athlete extends ChangeNotifier {
}
}
store_credentials() async {
storeCredentials() async {
final storage = new FlutterSecureStorage();
await storage.write(key: "email", value: email);
await storage.write(key: "password", value: password);
}
Future<Athlete> read_credentials() async {
Future<Athlete> readCredentials() async {
final storage = new FlutterSecureStorage();
email = await storage.read(key: "email");
password = await storage.read(key: "password");
return this;
}
static Future<List<Athlete>> all() async {
......
......@@ -43,16 +43,14 @@ class _DashboardState extends State<Dashboard> {
'Maybe you want to learn more about Encrateia.'
'We have provided some introductory help for you.'),
),
ButtonTheme.bar(
child: ButtonBar(
children: <Widget>[
FlatButton(
child: const Text('HELP'),
onPressed: () {},
)
],
),
)
ButtonBar(
children: <Widget>[
FlatButton(
child: const Text('HELP'),
onPressed: () {},
)
],
),
],
),
),
......@@ -68,8 +66,7 @@ class _DashboardState extends State<Dashboard> {
'(you) or many athletes (if you act as a trainer).'
'\n Please create your first athlete!'),
),
ButtonTheme.bar(
child: ButtonBar(
ButtonBar(
children: <Widget>[
FlatButton(
child: const Text('CREATE NEW ATHLETE'),
......@@ -85,7 +82,7 @@ class _DashboardState extends State<Dashboard> {
},
)
],
))
)
],
))
],
......@@ -120,7 +117,7 @@ class _DashboardState extends State<Dashboard> {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
athlete.read_credentials();
athlete.readCredentials();
return EditAthleteScreen(athlete: athlete);
}),
);
......
......@@ -104,7 +104,7 @@ class EditAthleteScreen extends StatelessWidget {
child: Text('Save', textScaleFactor: 1.5),
onPressed: () {
athlete.db.save();
athlete.store_credentials();
athlete.storeCredentials();
Navigator.of(context).pop();
},
),
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment