From e8ed9888d8613f1818a5a1a35a890829f9399396 Mon Sep 17 00:00:00 2001
From: otbenjello <Othmane.BENJELLOUN@etu.uca.fr>
Date: Mon, 13 Nov 2023 09:20:00 +0100
Subject: [PATCH] reglages merge

---
 lib/Modele/user.dart         | 28 ++++++++++------------------
 lib/View/home/home_view.dart |  7 +++----
 lib/View/page_test.dart      |  5 ++++-
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/Modele/user.dart b/lib/Modele/user.dart
index 4deb551..f54c799 100644
--- a/lib/Modele/user.dart
+++ b/lib/Modele/user.dart
@@ -1,27 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:smartfit_app_mobile/Modele/activity.dart';
 
-class User extends ChangeNotifier {
-  // A modifier
-  late String _username;
-  late String _email;
-  late String _passwordHash;
-  late List<ActivityOfUser> _listActivity;
 
-  String get username => _username;
-  String get email => _email;
-  String get passwordHash => _passwordHash;
-  List<ActivityOfUser> get listActivity => _listActivity;
+import 'package:flutter/material.dart';
+import 'package:smartfit_app_mobile/Modele/activity.dart';
+
+class User extends ChangeNotifier {
+  String? username;
+  String? email;
+  String? token;
+  List<ActivityOfUser> listActivity = [];
 
-  User(String username, String email, String passwordHash) {
-    _username = username;
-    _email = email;
-    _passwordHash = passwordHash;
-    _listActivity = List.empty(growable: true);
-  }
 
   void addActivity(ActivityOfUser activity) {
-    listActivity.add(activity);
+    listActivity.add(activity);		    listActivity.add(activity);
     notifyListeners();
-  }
+  }		  
 }
diff --git a/lib/View/home/home_view.dart b/lib/View/home/home_view.dart
index aca893c..458cd2c 100644
--- a/lib/View/home/home_view.dart
+++ b/lib/View/home/home_view.dart
@@ -85,7 +85,6 @@ class _HomeViewState extends State<HomeView> {
   Widget build(BuildContext context) {
     print("test1");
 
-    ManagerFile m = ManagerFile();
     print("test2");
 
     var media = MediaQuery.of(context).size;
@@ -95,9 +94,9 @@ class _HomeViewState extends State<HomeView> {
 
     if (Provider.of<User>(context, listen: true).listActivity.isNotEmpty) {
       print("rempli");
-      bpmSecondes = m.getHeartRateWithTime(Provider.of<User>(context).listActivity[0]);
-      vitesseSecondes = m.getSpeedWithTime(Provider.of<User>(context).listActivity[0]);
-      altitudeSecondes = m.getAltitudeWithTime(Provider.of<User>(context).listActivity[0]);
+      bpmSecondes = Provider.of<User>(context).listActivity[0].getHeartRateWithTime();
+      vitesseSecondes = Provider.of<User>(context).listActivity[0].getSpeedWithTime();
+      altitudeSecondes = Provider.of<User>(context).listActivity[0].getAltitudeWithTime();
       normaliserDeuxiemeElement(vitesseSecondes);
       normaliserDeuxiemeElement(altitudeSecondes);
       bpmSecondes2 = List.from(bpmSecondes) ;
diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart
index b9471b2..46a695e 100644
--- a/lib/View/page_test.dart
+++ b/lib/View/page_test.dart
@@ -76,8 +76,9 @@ class _TestPage extends State<TestPage> {
       print("test11");
       print(result);
       print("test22");
-      print(x.getHeartRateWithTime(ActivityOfUser(result)));
+      print(ActivityOfUser(result).getHeartRateWithTime());
       print("test33");
+      Provider.of<User>(context, listen: false).addActivity(ActivityOfUser(result));
       //print(x.getDistanceWithTime(ActivityOfUser(result)));
       //print(x.getDistance(ActivityOfUser(result)));
       //print(x.getAltitudeWithTime(ActivityOfUser(result)));
@@ -209,6 +210,8 @@ class _TestPage extends State<TestPage> {
               onPressed: createUser, child: const Text("Create User")),
           ElevatedButton(
               onPressed: deleteUser, child: const Text("Delete User")),
+          ElevatedButton(
+              onPressed: readFile, child: const Text("ReadFile")),
           ElevatedButton(onPressed: getFiles, child: const Text("getFiles")),
           ElevatedButton(
               onPressed: modifAttribut, child: const Text("modif attribut")),