From b42a3fc230333f2b6977db1a48f645cc373bf846 Mon Sep 17 00:00:00 2001 From: Enzo Date: Mon, 13 Nov 2023 08:13:36 +0100 Subject: [PATCH] modif --- .gitignore | 2 + lib/Modele/activity.dart | 99 +++++++++++++++++++++++++++++++++ lib/Modele/manager_file.dart | 99 --------------------------------- lib/View/login/signup_view.dart | 9 ++- lib/View/page_test.dart | 2 +- lib/main.dart | 3 +- 6 files changed, 112 insertions(+), 102 deletions(-) diff --git a/.gitignore b/.gitignore index f306354..d1369f0 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,5 @@ linux/flutter/generated_plugin_registrant.cc linux/flutter/generated_plugins.cmake windows/flutter/generated_plugin_registrant.cc windows/flutter/generated_plugins.cmake + +flutter/ \ No newline at end of file diff --git a/lib/Modele/activity.dart b/lib/Modele/activity.dart index b161e74..0b55431 100644 --- a/lib/Modele/activity.dart +++ b/lib/Modele/activity.dart @@ -1,3 +1,5 @@ +import 'package:fl_chart/fl_chart.dart'; + class ActivityOfUser { final String _type = "Default"; @@ -8,4 +10,101 @@ class ActivityOfUser { ActivityOfUser(List listeDynamic) { _contentActivity = listeDynamic; } + + List getHeartRateWithTime() { + List result = List.empty(growable: true); + int firtTimeStamp = 0; + + for (List ligne in _contentActivity) { + if (ligne[0] == "Data") { + if (ligne.length >= 10 && ligne[9] == "heart_rate") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); + result.add( + FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[10].toDouble())); + } else if (ligne.length >= 16 && ligne[15] == "heart_rate") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]); + result.add( + FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[16].toDouble())); + } + } + } + return result; + } + + List getDistanceWithTime() { + List result = List.empty(growable: true); + int firtTimeStamp = 0; + + for (List ligne in _contentActivity) { + if (ligne.length >= 8 && ligne[0] == "Data" && ligne[6] == "distance") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]); + result + .add(FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[7].toDouble())); + } + } + return result; + } + + List getAltitudeWithTime() { + List result = List.empty(growable: true); + int firtTimeStamp = 0; + + for (List ligne in _contentActivity) { + if (ligne.length >= 14 && ligne[0] == "Data" && ligne[12] == "altitude") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]); + result.add( + FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[13].toDouble())); + } + } + return result; + } + + double getDistance() { + double result = 0.0; + for (int i = _contentActivity.length - 1; i >= 0; i--) { + if (_contentActivity[i].length >= 8 && + _contentActivity[i][0] == "Data" && + _contentActivity[i][6] == "distance") { + if (_contentActivity[i][7] > result) { + result = _contentActivity[i][7].toDouble(); + } + } + } + return result; + } + + List getSpeedWithTime() { + List result = List.empty(growable: true); + int firtTimeStamp = 0; + + for (List ligne in _contentActivity) { + if (ligne[0] == "Data" && ligne[1] == 1) { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + result.add( + FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[19].toDouble())); + } + if (ligne[0] == "Data" && ligne[1] == 2) { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + result.add( + FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[25].toDouble())); + } + } + return result; + } } diff --git a/lib/Modele/manager_file.dart b/lib/Modele/manager_file.dart index 2de8703..55c2cea 100644 --- a/lib/Modele/manager_file.dart +++ b/lib/Modele/manager_file.dart @@ -48,103 +48,4 @@ class ManagerFile { // --- Ligne utile --- // //final csv = const ListToCsvConverter().convert(fitFile.toRows()); //await outFile.writeAsString(csv);*/ - - // ---------------- Fonction to get data --------- // - - List getHeartRateWithTime(ActivityOfUser activity) { - List result = List.empty(growable: true); - int firtTimeStamp = 0; - - for (List ligne in activity.contentActivity) { - if (ligne[0] == "Data") { - if (ligne.length >= 10 && ligne[9] == "heart_rate") { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); - result.add( - FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[10].toDouble())); - } else if (ligne.length >= 16 && ligne[15] == "heart_rate") { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]); - result.add( - FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[16].toDouble())); - } - } - } - return result; - } - - List getDistanceWithTime(ActivityOfUser activityOfUser) { - List result = List.empty(growable: true); - int firtTimeStamp = 0; - - for (List ligne in activityOfUser.contentActivity) { - if (ligne.length >= 8 && ligne[0] == "Data" && ligne[6] == "distance") { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]); - result - .add(FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[7].toDouble())); - } - } - return result; - } - - List getAltitudeWithTime(ActivityOfUser activityOfUser) { - List result = List.empty(growable: true); - int firtTimeStamp = 0; - - for (List ligne in activityOfUser.contentActivity) { - if (ligne.length >= 14 && ligne[0] == "Data" && ligne[12] == "altitude") { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - //result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[13].toInt()]); - result.add( - FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[13].toDouble())); - } - } - return result; - } - - double getDistance(ActivityOfUser activity) { - double result = 0.0; - for (int i = activity.contentActivity.length - 1; i >= 0; i--) { - if (activity.contentActivity[i].length >= 8 && - activity.contentActivity[i][0] == "Data" && - activity.contentActivity[i][6] == "distance") { - if (activity.contentActivity[i][7] > result) { - result = activity.contentActivity[i][7].toDouble(); - } - } - } - return result; - } - - List getSpeedWithTime(ActivityOfUser activityOfUser) { - List result = List.empty(growable: true); - int firtTimeStamp = 0; - - for (List ligne in activityOfUser.contentActivity) { - if (ligne[0] == "Data" && ligne[1] == 1) { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - result.add( - FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[19].toDouble())); - } - if (ligne[0] == "Data" && ligne[1] == 2) { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; - } - result.add( - FlSpot((ligne[4] - firtTimeStamp) / 100, ligne[25].toDouble())); - } - } - return result; - } } diff --git a/lib/View/login/signup_view.dart b/lib/View/login/signup_view.dart index 8df0c9c..8062686 100644 --- a/lib/View/login/signup_view.dart +++ b/lib/View/login/signup_view.dart @@ -15,6 +15,11 @@ class SignUpView extends StatefulWidget { class _SignUpViewState extends State { bool isCheck = false; + + final controllerTextEmail = TextEditingController(); + final controllerTextUsername = TextEditingController(); + final controllerTextPassword = TextEditingController(); + @override Widget build(BuildContext context) { var media = MediaQuery.of(context).size; @@ -55,10 +60,11 @@ class _SignUpViewState extends State { SizedBox( height: media.width * 0.04, ), - const RoundTextField( + RoundTextField( hitText: "Email", icon: "assets/img/email.svg", keyboardType: TextInputType.emailAddress, + controller: controllerTextEmail, ), SizedBox( height: media.width * 0.04, @@ -67,6 +73,7 @@ class _SignUpViewState extends State { hitText: "Mot de passe", icon: "assets/img/lock.svg", obscureText: true, + controller: controllerTextPassword, rigtIcon: TextButton( onPressed: () {}, child: Container( diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart index 49e4cbe..ac26eab 100644 --- a/lib/View/page_test.dart +++ b/lib/View/page_test.dart @@ -77,7 +77,7 @@ class _TestPage extends State { //print(x.getDistanceWithTime(ActivityOfUser(result))); //print(x.getDistance(ActivityOfUser(result))); //print(x.getAltitudeWithTime(ActivityOfUser(result))); - print(x.getSpeedWithTime(ActivityOfUser(result))); + //print(x.getSpeedWithTime(ActivityOfUser(result))); } } diff --git a/lib/main.dart b/lib/main.dart index 8e10bdd..ff58d38 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/Modele/user.dart'; import 'package:smartfit_app_mobile/View/login/login_view.dart'; +import 'package:smartfit_app_mobile/View/login/signup_view.dart'; import 'package:smartfit_app_mobile/View/on_boarding/started_view.dart'; import 'package:smartfit_app_mobile/View/page_test.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; @@ -38,7 +39,7 @@ class MyApp extends StatelessWidget { primaryColor: TColor.primaryColor1, fontFamily: "Poppins"), //home: const StartedView(), - home: const TestPage(), + home: const SignUpView(), ); } }