From 7574ace86f29861a202b97370c0e9514e9aad3a6 Mon Sep 17 00:00:00 2001 From: otbenjello Date: Thu, 9 Nov 2023 15:38:46 +0100 Subject: [PATCH] dad --- lib/Modele/Mds/DeviceModel.dart | 1 - lib/Modele/user.dart | 4 ++++ lib/View/home/home_view.dart | 19 +++++++++++-------- lib/View/page_test.dart | 5 +++++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/Modele/Mds/DeviceModel.dart b/lib/Modele/Mds/DeviceModel.dart index a9a9363..e99fb1d 100644 --- a/lib/Modele/Mds/DeviceModel.dart +++ b/lib/Modele/Mds/DeviceModel.dart @@ -19,4 +19,3 @@ class DeviceModel extends ChangeNotifier { } } */ -*/ \ No newline at end of file diff --git a/lib/Modele/user.dart b/lib/Modele/user.dart index a4303fb..70d78ff 100644 --- a/lib/Modele/user.dart +++ b/lib/Modele/user.dart @@ -19,4 +19,8 @@ class User extends ChangeNotifier { _passwordHash = passwordHash; _listActivity = List.empty(growable: true); } + + void addActivity(ActivityOfUser activity) { + listActivity.add(activity); + } } diff --git a/lib/View/home/home_view.dart b/lib/View/home/home_view.dart index 64d0df2..297ff41 100644 --- a/lib/View/home/home_view.dart +++ b/lib/View/home/home_view.dart @@ -1,4 +1,7 @@ import 'package:dotted_dashed_line/dotted_dashed_line.dart'; +import 'package:provider/provider.dart'; +import 'package:smartfit_app_mobile/Modele/manager_file.dart'; +import 'package:smartfit_app_mobile/Modele/user.dart'; import 'package:smartfit_app_mobile/common_widget/round_button.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; @@ -19,7 +22,10 @@ class HomeView extends StatefulWidget { State createState() => _HomeViewState(); } + + class _HomeViewState extends State { + List allSpots = [FlSpot(0, 30),FlSpot(2, 20)]; List lastWorkoutArr = [ { "name": "Full Body Workout", @@ -43,9 +49,7 @@ class _HomeViewState extends State { "progress": 0.7 }, ]; - List showingTooltipOnSpots = [21]; - - List allSpots = [FlSpot(0, 20)]; + List showingTooltipOnSpots = [0]; List waterArr = [ {"title": "6am - 8am", "subtitle": "600ml"}, @@ -57,7 +61,10 @@ class _HomeViewState extends State { @override Widget build(BuildContext context) { + ManagerFile m = ManagerFile(); var media = MediaQuery.of(context).size; + print(m.getHeartRateWithTime(Provider.of(context).listActivity[0])); + allSpots = m.getHeartRateWithTime(Provider.of(context).listActivity[0]); final lineBarsData = [ LineChartBarData( @@ -883,11 +890,7 @@ class _HomeViewState extends State { ); } - void updateChartData(List newData) { - setState(() { - allSpots = newData; - }); - } + List showingSections() { diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart index 3c1c61a..30aabbc 100644 --- a/lib/View/page_test.dart +++ b/lib/View/page_test.dart @@ -7,6 +7,7 @@ import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/Modele/activity.dart'; import 'package:smartfit_app_mobile/Modele/manager_file.dart'; import 'package:smartfit_app_mobile/Modele/user.dart'; +import 'package:smartfit_app_mobile/View/home/home_view.dart'; // ----------- File --------------- // @@ -70,6 +71,10 @@ class _TestPage extends State { //print(x.getDistanceWithTime(ActivityOfUser(result))); //print(x.getDistance(ActivityOfUser(result))); print(x.getAltitudeWithTime(ActivityOfUser(result))); + Provider.of(context).addActivity(ActivityOfUser(result)); + print("lalala"); + + print(result); } }