change convertisseur

Enzo
Enzo 1 year ago
parent c5b182411e
commit 866a0a7381

@ -26,7 +26,7 @@ class VolumesList extends StatelessWidget {
width: media.width * 0.03, width: media.width * 0.03,
), ),
ContainerStatsActivities( ContainerStatsActivities(
"${Convertisseur.secondeIntoMinute(volume["durationActiviy"]).toStringAsFixed(2)} m", "${Convertisseur.secondeIntoMinute(volume["durationActiviy"]).toStringAsFixed(0)} min",
"Temps Total", "Temps Total",
Icons.timer), Icons.timer),
SizedBox( SizedBox(

@ -27,8 +27,9 @@ class WorkoutRow extends StatelessWidget {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
const SizedBox(
const SizedBox(width: 15,), width: 15,
),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -40,18 +41,18 @@ class WorkoutRow extends StatelessWidget {
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
Text( Text(
"${ wObj["value"].toString()}", wObj["value"].toString(),
style: TextStyle( style: TextStyle(
color: TColor.gray, color: TColor.gray,
fontSize: 12,), fontSize: 12,
),
),
const SizedBox(
height: 4,
), ),
const SizedBox(height: 4,),
], ],
)), )),
], ],
)); ));
} }

@ -75,7 +75,7 @@ class WorkoutRowWalking extends StatelessWidget {
), ),
), ),
Text( Text(
"Temps : ${Convertisseur.secondeIntoMinute(wObj["time"]).toStringAsFixed(2)} m", "Temps : ${Convertisseur.secondeIntoMinute(wObj["time"]).toStringAsFixed(0)} minute",
style: TextStyle( style: TextStyle(
color: TColor.black, color: TColor.black,
fontSize: 12, fontSize: 12,

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:smartfit_app_mobile/modele/convertisseur.dart';
import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/modele/user.dart';
import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart';
@ -19,10 +20,11 @@ class Stats extends StatelessWidget {
.activityInfo .activityInfo
.bpmAvg .bpmAvg
.toString(); .toString();
String time = Provider.of<User>(context, listen: false) String time = Convertisseur.secondeIntoMinute(
Provider.of<User>(context, listen: false)
.managerSelectedActivity .managerSelectedActivity
.getTimeAllActivitySelected() .getTimeAllActivitySelected())
.toString(); .toStringAsFixed(0);
return Column( return Column(
children: [ children: [
Padding( Padding(
@ -57,7 +59,7 @@ class Stats extends StatelessWidget {
iconBackground: const Color(0xff6131AD), iconBackground: const Color(0xff6131AD),
time: '+5s', time: '+5s',
label: 'Time', label: 'Time',
value: '$time s', value: '$time min',
), ),
const SizedBox(width: 15), const SizedBox(width: 15),
InfoStat( InfoStat(

@ -12,4 +12,8 @@ class Convertisseur {
static double msIntoKmh(double metreSeconde) { static double msIntoKmh(double metreSeconde) {
return metreSeconde * 3.6; return metreSeconde * 3.6;
} }
static double millisecondeIntoSeconde(double milliseconde) {
return (milliseconde / 1000);
}
} }

@ -61,11 +61,11 @@ class _PredictionState extends State<Prediction> {
if (!resultat.item1) return; if (!resultat.item1) return;
setState(() { setState(() {
lastWorkoutArr[0]["value"] = lastWorkoutArr[0]["value"] =
"${resultat.item2.timeOfActivity.toStringAsFixed(2)} s"; "${Convertisseur.secondeIntoMinute(resultat.item2.timeOfActivity).toStringAsFixed(0)} min";
lastWorkoutArr[1]["value"] = lastWorkoutArr[1]["value"] =
"${resultat.item2.bpmAvg.toStringAsFixed(2)} bpm"; "${resultat.item2.bpmAvg.toStringAsFixed(2)} bpm";
lastWorkoutArr[2]["value"] = lastWorkoutArr[2]["value"] =
"${resultat.item2.vitesseAvg.toStringAsFixed(2)} m/s "; "${Convertisseur.msIntoKmh(resultat.item2.vitesseAvg).toStringAsFixed(1)} km/h ";
lastWorkoutArr[3]["value"] = lastWorkoutArr[3]["value"] =
"${resultat.item2.distance.toStringAsFixed(2)} m"; "${resultat.item2.distance.toStringAsFixed(2)} m";
}); });

@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
import 'package:smartfit_app_mobile/common_widget/container/container_stats_activities.dart'; import 'package:smartfit_app_mobile/common_widget/container/container_stats_activities.dart';
import 'package:smartfit_app_mobile/common_widget/other/entete_home_view.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/common/colo_extension.dart';
import 'package:smartfit_app_mobile/modele/convertisseur.dart';
import 'package:smartfit_app_mobile/modele/manager_selected_activity.dart'; import 'package:smartfit_app_mobile/modele/manager_selected_activity.dart';
import 'package:smartfit_app_mobile/modele/user.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/data_home_view.dart';
@ -83,11 +84,11 @@ class _StatAtivities extends State<StatAtivities> {
double maxSpeed = context double maxSpeed = context
.watch<User>() .watch<User>()
.managerSelectedActivity .managerSelectedActivity
.getMaxAltitudeAllActivitySelected(); .getMaxSpeedAllActivitySelected();
double minSpeed = context double minSpeed = context
.watch<User>() .watch<User>()
.managerSelectedActivity .managerSelectedActivity
.getMinAltitudeAllActivitySelected(); .getMinSpeedAllActivitySelected();
return Scaffold( return Scaffold(
backgroundColor: TColor.white, backgroundColor: TColor.white,
@ -139,17 +140,23 @@ class _StatAtivities extends State<StatAtivities> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities( ContainerStatsActivities(
"${avgSpeed.toStringAsFixed(2)} m/s", "Moyenne vitesse", Icons.bolt), "${Convertisseur.msIntoKmh(avgSpeed).toStringAsFixed(0)} km/h",
"Moyenne vitesse",
Icons.bolt),
SizedBox( SizedBox(
width: media.width * 0.03, width: media.width * 0.03,
), ),
ContainerStatsActivities( ContainerStatsActivities(
"$maxSpeed m/s", "Maximum vitesse", Icons.trending_up), "${Convertisseur.msIntoKmh(maxSpeed).toStringAsFixed(0)} km/h",
"Maximum vitesse",
Icons.trending_up),
SizedBox( SizedBox(
width: media.width * 0.03, width: media.width * 0.03,
), ),
ContainerStatsActivities( ContainerStatsActivities(
"$minSpeed m/s", "Minimum vitesse", Icons.trending_down) "${Convertisseur.msIntoKmh(minSpeed).toStringAsFixed(0)} km/h",
"Minimum vitesse",
Icons.trending_down)
], ],
), ),
SizedBox( SizedBox(
@ -179,7 +186,9 @@ class _StatAtivities extends State<StatAtivities> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities( ContainerStatsActivities(
"${avgAltitude.toStringAsFixed(2)} m", "Moyenne Altitude", Icons.landscape), "${avgAltitude.toStringAsFixed(2)} m",
"Moyenne Altitude",
Icons.landscape),
SizedBox( SizedBox(
width: media.width * 0.03, width: media.width * 0.03,
), ),
@ -214,7 +223,9 @@ class _StatAtivities extends State<StatAtivities> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ContainerStatsActivities( ContainerStatsActivities(
"$totalTime s", "Temps Total", Icons.timer), "${Convertisseur.secondeIntoMinute(totalTime)} min",
"Temps Total",
Icons.timer),
SizedBox( SizedBox(
width: media.width * 0.03, width: media.width * 0.03,
), ),

Loading…
Cancel
Save