diff --git a/lib/Modele/user.dart b/lib/Modele/user.dart index 70d78ff..4deb551 100644 --- a/lib/Modele/user.dart +++ b/lib/Modele/user.dart @@ -22,5 +22,6 @@ class User extends ChangeNotifier { void addActivity(ActivityOfUser activity) { listActivity.add(activity); + notifyListeners(); } } diff --git a/lib/View/home/home_view.dart b/lib/View/home/home_view.dart index a141e1a..d6fb16f 100644 --- a/lib/View/home/home_view.dart +++ b/lib/View/home/home_view.dart @@ -24,7 +24,9 @@ class HomeView extends StatefulWidget { class _HomeViewState extends State { - List allSpots = [FlSpot(0, 30),FlSpot(2, 20)]; + List allSpots = [FlSpot(0, 30)]; + TextEditingController bpmController = TextEditingController(); + List lastWorkoutArr = [ { "name": "Full Body Workout", @@ -60,14 +62,27 @@ class _HomeViewState extends State { @override Widget build(BuildContext context) { + print("test1"); + ManagerFile m = ManagerFile(); + print("test2"); + var media = MediaQuery.of(context).size; - print(m.getHeartRateWithTime(Provider.of(context).listActivity[0])); - allSpots = m.getHeartRateWithTime(Provider.of(context).listActivity[0]); + print("test3"); + + + + if (Provider.of(context, listen: true).listActivity.isNotEmpty) { + print("rempli"); + allSpots = m.getHeartRateWithTime(Provider.of(context).listActivity[0]); + } else { + print("vide"); + } + print("test4"); + final lineBarsData = [ LineChartBarData( - showingIndicators: showingTooltipOnSpots, spots: allSpots, isCurved: false, barWidth: 2, @@ -84,6 +99,7 @@ class _HomeViewState extends State { ), ), ]; + print("test5"); final tooltipsOnBar = lineBarsData[0]; @@ -283,31 +299,25 @@ class _HomeViewState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Graph 2 ( rhythme cardiaque )", + "Rhythme cardiaque", style: TextStyle( color: TColor.black, fontSize: 16, fontWeight: FontWeight.w700), ), - ShaderMask( - blendMode: BlendMode.srcIn, - shaderCallback: (bounds) { - return LinearGradient( - colors: TColor.primaryG, - begin: Alignment.centerLeft, - end: Alignment.centerRight) - .createShader(Rect.fromLTRB( - 0, 0, bounds.width, bounds.height)); - }, - child: Text( - "78 BPM", - style: TextStyle( + TextField( + controller: bpmController, + readOnly: true, + style: TextStyle( color: - TColor.primaryColor1.withOpacity(0.7), + TColor.primaryColor1.withOpacity(0.8), fontWeight: FontWeight.w700, fontSize: 18), + decoration: InputDecoration( + border: InputBorder.none, // Ajoutez cette ligne pour supprimer la bordure + ), ), - ), + ], ), ), @@ -374,12 +384,12 @@ class _HomeViewState extends State { touchTooltipData: LineTouchTooltipData( tooltipBgColor: TColor.secondaryColor1, tooltipRoundedRadius: 20, - getTooltipItems: - (List lineBarsSpot) { + getTooltipItems: (List lineBarsSpot) { return lineBarsSpot.map((lineBarSpot) { + bpmController.text = "${lineBarSpot.y} BPM"; return LineTooltipItem( - "il y a ${lineBarSpot.x.toInt()} minutes", - const TextStyle( + "Seconde ${lineBarSpot.x.toInt() / 10}", + TextStyle( color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold, @@ -390,8 +400,8 @@ class _HomeViewState extends State { ), ), lineBarsData: lineBarsData, - minY: 0, - maxY: 130, + minY: 50, + maxY: 250, titlesData: FlTitlesData( show: false, ), diff --git a/lib/View/main_tab/main_tab_view.dart b/lib/View/main_tab/main_tab_view.dart index 85e45f1..cd1788f 100644 --- a/lib/View/main_tab/main_tab_view.dart +++ b/lib/View/main_tab/main_tab_view.dart @@ -29,7 +29,7 @@ class _MainTabViewState extends State { height: 70, child: InkWell( onTap: () { - selectTab = 0; + selectTab = 4; currentTab = const TestPage(); if (mounted) { setState(() {}); diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart index 10dcee2..5714b4a 100644 --- a/lib/View/page_test.dart +++ b/lib/View/page_test.dart @@ -67,13 +67,16 @@ class _TestPage extends State { print("t"); } else { List result = await x.readFitFile(y!); + print("test11"); print(result); + print("test22"); print(x.getHeartRateWithTime(ActivityOfUser(result))); + print("test33"); //print(x.getDistanceWithTime(ActivityOfUser(result))); //print(x.getDistance(ActivityOfUser(result))); - print(x.getAltitudeWithTime(ActivityOfUser(result))); - Provider.of(context).addActivity(ActivityOfUser(result)); - print("lalala"); + print("test44"); + Provider.of(context, listen: false).addActivity(ActivityOfUser(result)); + print("test55"); print(result); }