SmartFit
/
SmartFit_Mobile
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modif

Browse Source
pull/4/head^2
Enzo 2 years ago
parent ae67f20c13
commit 62948bf1c2
2 changed files with 128 additions and 132 deletions
Show Stats Download Patch File Download Diff File

5
lib/modele/user.dart
Unescape View File

@ -54,7 +54,6 @@ class User extends ChangeNotifier {
} }
// ------------ Volume -------------- // // ------------ Volume -------------- //
// -------- Last 7 days ----- //
Map<String, dynamic> getVolumeWhithDuration(Duration timeSoustract) { Map<String, dynamic> getVolumeWhithDuration(Duration timeSoustract) {
List<ActivityOfUser> liste = []; List<ActivityOfUser> liste = [];
for (ActivityOfUser activityOfUser in listActivity) { for (ActivityOfUser activityOfUser in listActivity) {
@ -67,6 +66,10 @@ class User extends ChangeNotifier {
return _getVolume(liste); return _getVolume(liste);
} }
Map<String, dynamic> getVolumeAllTime() {
return _getVolume(listActivity);
}
Map<String, dynamic> _getVolume(List<ActivityOfUser> listeActivity) { Map<String, dynamic> _getVolume(List<ActivityOfUser> listeActivity) {
Map<String, dynamic> map = {}; Map<String, dynamic> map = {};
ManagerSelectedActivity managerSelectedActivity = ManagerSelectedActivity(); ManagerSelectedActivity managerSelectedActivity = ManagerSelectedActivity();

255
lib/view/home/volumes_view.dart
Unescape View File

@ -3,10 +3,8 @@ 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/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';
import 'package:smartfit_app_mobile/modele/utile/home_view/home_view_util.dart';
class Volumes extends StatefulWidget { class Volumes extends StatefulWidget {
const Volumes({super.key}); const Volumes({super.key});
@ -22,20 +20,15 @@ class _Volumes extends State<Volumes> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var media = MediaQuery.of(context).size; var media = MediaQuery.of(context).size;
data = HomeViewUtil().initData(context); User user = context.watch<User>();
ManagerSelectedActivity managerSelectedActivity =
context.watch<User>().managerSelectedActivity;
// -- BPM -- //
int avgBpm = managerSelectedActivity.getBpmAvgAllActivitieSelected();
// -- Speed -- //
String avgSpeed = context
.watch<User>()
.managerSelectedActivity
.getAvgSpeedAllActivitySelected().toStringAsFixed(2);
Map<String, dynamic> volume7Days =
user.getVolumeWhithDuration(const Duration(days: 7));
Map<String, dynamic> volume1Months =
user.getVolumeWhithDuration(const Duration(days: 30));
Map<String, dynamic> volume1Year =
user.getVolumeWhithDuration(const Duration(days: 366));
Map<String, dynamic> volumeAllTime = user.getVolumeAllTime();
return Scaffold( return Scaffold(
backgroundColor: TColor.white, backgroundColor: TColor.white,
@ -63,36 +56,36 @@ class _Volumes extends State<Volumes> {
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: child: Row(
Row( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ ContainerStatsActivities(
ContainerStatsActivities( "??", "Nombre Activitée(s)", Icons.numbers),
"??", "Nombre Activitée(s)", Icons.numbers), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? s", "Temps Total", Icons.timer),
"?? s", "Temps Total", Icons.timer), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? BPM", "Bpm Moyens", Icons.favorite),
"?? BPM", "Bpm Moyens", Icons.favorite), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? m/s", "Vitesse Moyenne", Icons.bolt),
"?? m/s", "Vitesse Moyenne", Icons.bolt), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? + m", "Dénivelé Positif", Icons.hiking),
"?? + m", "Dénivelé Positif", Icons.hiking), ],
], ),
),), ),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
@ -103,36 +96,36 @@ class _Volumes extends State<Volumes> {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: child: Row(
Row( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ ContainerStatsActivities(
ContainerStatsActivities( "??", "Nombre Activitée(s)", Icons.numbers),
"??", "Nombre Activitée(s)", Icons.numbers), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? s", "Temps Total", Icons.timer),
"?? s", "Temps Total", Icons.timer), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? BPM", "Bpm Moyens", Icons.favorite),
"?? BPM", "Bpm Moyens", Icons.favorite), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? m/s", "Vitesse Moyenne", Icons.bolt),
"?? m/s", "Vitesse Moyenne", Icons.bolt), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? + m", "Dénivelé Positif", Icons.hiking),
"?? + m", "Dénivelé Positif", Icons.hiking), ],
], ),
),), ),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
@ -143,36 +136,36 @@ class _Volumes extends State<Volumes> {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: child: Row(
Row( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ ContainerStatsActivities(
ContainerStatsActivities( "??", "Nombre Activitée(s)", Icons.numbers),
"??", "Nombre Activitée(s)", Icons.numbers), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? s", "Temps Total", Icons.timer),
"?? s", "Temps Total", Icons.timer), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? BPM", "Bpm Moyens", Icons.favorite),
"?? BPM", "Bpm Moyens", Icons.favorite), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? m/s", "Vitesse Moyenne", Icons.bolt),
"?? m/s", "Vitesse Moyenne", Icons.bolt), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? + m", "Dénivelé Positif", Icons.hiking),
"?? + m", "Dénivelé Positif", Icons.hiking), ],
], ),
),), ),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),
@ -183,36 +176,36 @@ class _Volumes extends State<Volumes> {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: child: Row(
Row( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ ContainerStatsActivities(
ContainerStatsActivities( "??", "Nombre Activitée(s)", Icons.numbers),
"??", "Nombre Activitée(s)", Icons.numbers), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? s", "Temps Total", Icons.timer),
"?? s", "Temps Total", Icons.timer), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? BPM", "Bpm Moyens", Icons.favorite),
"?? BPM", "Bpm Moyens", Icons.favorite), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? m/s", "Vitesse Moyenne", Icons.bolt),
"?? m/s", "Vitesse Moyenne", Icons.bolt), SizedBox(
SizedBox( width: media.width * 0.03,
width: media.width * 0.03, ),
), ContainerStatsActivities(
ContainerStatsActivities( "?? + m", "Dénivelé Positif", Icons.hiking),
"?? + m", "Dénivelé Positif", Icons.hiking), ],
], ),
),), ),
SizedBox( SizedBox(
height: media.width * 0.03, height: media.width * 0.03,
), ),

Write Preview
Loading…
Cancel
Save