From d098b03ecf38c2de5461db8075fc201aebf212a6 Mon Sep 17 00:00:00 2001 From: otbenjello Date: Mon, 20 Nov 2023 10:42:17 +0100 Subject: [PATCH] responsive + stat --- lib/common_widget/stats.dart | 29 ------------------- .../utile/home_view/home_view_util.dart | 2 +- lib/view/home/mobile/mobile_homeview.dart | 9 ++++-- lib/view/home/web/web_homeview.dart | 2 +- lib/view/ne_pas_supprimer/home_view.txt | 2 +- 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/lib/common_widget/stats.dart b/lib/common_widget/stats.dart index a7c93dd..2fcb512 100644 --- a/lib/common_widget/stats.dart +++ b/lib/common_widget/stats.dart @@ -126,7 +126,6 @@ class InfoStat extends StatelessWidget { iconColor: iconColor, iconBackground: iconBackground, ), - Change(time: time), Align( alignment: Alignment.bottomLeft, child: Column( @@ -153,35 +152,7 @@ class InfoStat extends StatelessWidget { } } -class Change extends StatelessWidget { - const Change({ - Key? key, - required this.time, - }) : super(key: key); - final String time; - - @override - Widget build(BuildContext context) { - return Align( - alignment: Alignment.topRight, - child: Container( - padding: const EdgeInsets.symmetric( - vertical: 1, - horizontal: 4, - ), - decoration: BoxDecoration( - color: Colors.green, - borderRadius: BorderRadius.circular(500), - ), - child: Text( - time, - style: const TextStyle(fontSize: 10, color: Colors.white), - ), - ), - ); - } -} class StatIcon extends StatelessWidget { const StatIcon({ diff --git a/lib/modele/utile/home_view/home_view_util.dart b/lib/modele/utile/home_view/home_view_util.dart index 44cbe8c..15e7803 100644 --- a/lib/modele/utile/home_view/home_view_util.dart +++ b/lib/modele/utile/home_view/home_view_util.dart @@ -15,7 +15,7 @@ class HomeViewUtil { return DataHomeView( bpmSecondes, normaliserDeuxiemeElement(bpmSecondes2), - normaliserDeuxiemeElement(vitesseSecondes)); + normaliserDeuxiemeElement(vitesseSecondes),); } List normaliserDeuxiemeElement(List liste) { diff --git a/lib/view/home/mobile/mobile_homeview.dart b/lib/view/home/mobile/mobile_homeview.dart index 8e7cc54..c3d3cc0 100644 --- a/lib/view/home/mobile/mobile_homeview.dart +++ b/lib/view/home/mobile/mobile_homeview.dart @@ -1,10 +1,12 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/common_widget/container/ligne_container_stats.dart'; import 'package:smartfit_app_mobile/common_widget/graph/bpm_and_speed_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/bpm_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/other/entete_home_view.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; +import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/home_view_util.dart'; @@ -22,7 +24,9 @@ class _MobileHomeView extends State { @override Widget build(BuildContext context) { var media = MediaQuery.of(context).size; - + String maxBpm = context.watch().listActivity[0].getMaxBpm(); + String minBpm = context.watch().listActivity[0].getMinBpm(); + String avgBpm = context.watch().listActivity[0].getAvgBpm(); data = HomeViewUtil().initData(context); return Scaffold( @@ -52,7 +56,8 @@ class _MobileHomeView extends State { SizedBox( height: media.width * 0.05, ), - const LigneContainerStats("1", "2", "3", "Minimum", "Maximum", "Moyenne", Icons.trending_down,Icons.trending_up,Icons.favorite_outline ), + LigneContainerStats(minBpm+ " BPM",maxBpm+ " BPM" ,avgBpm+ " BPM", "Minimum", "Maximum", "Moyenne", Icons.trending_down,Icons.trending_up,Icons.favorite_outline), + Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ diff --git a/lib/view/home/web/web_homeview.dart b/lib/view/home/web/web_homeview.dart index 3f8e2d2..d1e9483 100644 --- a/lib/view/home/web/web_homeview.dart +++ b/lib/view/home/web/web_homeview.dart @@ -62,7 +62,7 @@ class _WebHomeView extends State { height: media.width * 0.05, ), - LigneContainerStats(maxBpm+ " BPM",minBpm+ " BPM" ,avgBpm+ " BPM", "Minimum", "Maximum", "Moyenne", Icons.trending_down,Icons.trending_up,Icons.favorite_outline), + LigneContainerStats(minBpm+ " BPM",maxBpm+ " BPM" ,avgBpm+ " BPM", "Minimum", "Maximum", "Moyenne", Icons.trending_down,Icons.trending_up,Icons.favorite_outline), SizedBox( height: media.width * 0.05, ), diff --git a/lib/view/ne_pas_supprimer/home_view.txt b/lib/view/ne_pas_supprimer/home_view.txt index f89fb10..0cb05f6 100644 --- a/lib/view/ne_pas_supprimer/home_view.txt +++ b/lib/view/ne_pas_supprimer/home_view.txt @@ -264,7 +264,7 @@ class _MobileHomeView extends State { title: "Voir", type: RoundButtonType.bgGradient, fontSize: 12, - fontWeight: FontWeight.w400, + fontWeight: FontWeight.w0, onPressed: () { Navigator.push( context,