From d4728f0dc4aedff4ba1ece7103780ea15c52d6a8 Mon Sep 17 00:00:00 2001 From: Enzo Date: Mon, 20 Nov 2023 10:53:12 +0100 Subject: [PATCH] micro change --- .../activity/mobile/mobile_Activity_view.dart | 1 - lib/view/activity/web/web_list_activity.dart | 16 ++++------- lib/view/home/mobile/mobile_homeview.dart | 21 ++++++++++---- lib/view/home/web/web_homeview.dart | 28 ++++++++++++++----- 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/lib/view/activity/mobile/mobile_Activity_view.dart b/lib/view/activity/mobile/mobile_Activity_view.dart index 85c2d9a..273f6be 100644 --- a/lib/view/activity/mobile/mobile_Activity_view.dart +++ b/lib/view/activity/mobile/mobile_Activity_view.dart @@ -4,7 +4,6 @@ import 'package:smartfit_app_mobile/common_widget/graph/graph.dart'; import 'package:smartfit_app_mobile/common_widget/info.dart' hide Stats; import 'package:smartfit_app_mobile/common_widget/stats.dart'; import 'package:flutter/material.dart'; -import 'package:smartfit_app_mobile/modele/user.dart'; class MobileActivity extends StatelessWidget { const MobileActivity({Key? key}) : super(key: key); diff --git a/lib/view/activity/web/web_list_activity.dart b/lib/view/activity/web/web_list_activity.dart index 3d7cc62..cebb8c8 100644 --- a/lib/view/activity/web/web_list_activity.dart +++ b/lib/view/activity/web/web_list_activity.dart @@ -1,21 +1,17 @@ import 'dart:convert'; -import 'dart:io'; import 'dart:typed_data'; import 'package:flutter/material.dart'; +import 'package:smartfit_app_mobile/modele/manager_file.dart'; import 'package:universal_html/html.dart' as html; -import 'package:crypto/crypto.dart'; import 'package:file_picker/file_picker.dart'; import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; import 'package:smartfit_app_mobile/modele/api/request_api.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/common_widget/container/workout_row.dart'; -import 'package:flutter/material.dart'; -import 'package:tuple/tuple.dart'; class WebListActivity extends StatefulWidget { const WebListActivity({super.key}); @@ -42,8 +38,7 @@ class _WebListActivityState extends State { return lines; // Ou retournez les lignes du fichier } - void readFile() async { - /* + void readFile(html.File file) async { ManagerFile x = ManagerFile(); final reader = html.FileReader(); reader.readAsArrayBuffer(file); @@ -54,7 +49,7 @@ class _WebListActivityState extends State { Provider.of(context, listen: false) .addActivity(ActivityOfUser(file.name, result)); } - });*/ + }); } List lastWorkoutArr = []; @@ -72,7 +67,7 @@ class _WebListActivityState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox(height: 20), + const SizedBox(height: 20), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -85,7 +80,6 @@ class _WebListActivityState extends State { ), TextButton( onPressed: () async { - /* html.FileUploadInputElement uploadInput = html.FileUploadInputElement(); uploadInput.click(); @@ -96,7 +90,7 @@ class _WebListActivityState extends State { readFile( files[0]); // Lecture du fichier sélectionné } - });*/ + }); }, child: Text( "Ajouter", diff --git a/lib/view/home/mobile/mobile_homeview.dart b/lib/view/home/mobile/mobile_homeview.dart index 9fd8957..f8a23cc 100644 --- a/lib/view/home/mobile/mobile_homeview.dart +++ b/lib/view/home/mobile/mobile_homeview.dart @@ -1,4 +1,3 @@ -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'; @@ -58,9 +57,9 @@ class _MobileHomeView extends State { height: media.width * 0.05, ), LigneContainerStats( - minBpm + " BPM", - maxBpm + " BPM", - avgBpm + " BPM", + "$minBpm BPM", + "$maxBpm BPM", + "$avgBpm BPM", "Minimum", "Maximum", "Moyenne", @@ -86,7 +85,19 @@ class _MobileHomeView extends State { SizedBox( height: media.width * 0.05, ), - const LigneContainerStats("1", "2", "3", "s", "s", "s"), + const LigneContainerStats( + "30 BPM", + "90 BPM", + "290 BPM", + "Minimum", + "Maximum", + "Moyenne", + Icons.trending_down, + Icons.trending_up, + Icons.favorite_outline), + SizedBox( + height: media.width * 0.05, + ), GraphAltitudeByTime(media, data) ], ), diff --git a/lib/view/home/web/web_homeview.dart b/lib/view/home/web/web_homeview.dart index 943b35f..0976901 100644 --- a/lib/view/home/web/web_homeview.dart +++ b/lib/view/home/web/web_homeview.dart @@ -1,4 +1,3 @@ -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'; @@ -22,7 +21,6 @@ class _WebHomeView extends State { late DataHomeView data; TextEditingController bpmController = TextEditingController(); - @override Widget build(BuildContext context) { var media = MediaQuery.of(context).size; @@ -31,7 +29,7 @@ class _WebHomeView extends State { String avgBpm = context.watch().listActivity[0].getAvgBpm(); data = HomeViewUtil().initData(context); - + return Scaffold( backgroundColor: TColor.white, body: SingleChildScrollView( @@ -62,8 +60,16 @@ class _WebHomeView extends State { SizedBox( height: media.width * 0.05, ), - - LigneContainerStats(minBpm+ " BPM",maxBpm+ " 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, ), @@ -86,8 +92,16 @@ class _WebHomeView extends State { SizedBox( height: media.width * 0.05, ), - const LigneContainerStats("30 BPM", "90 BPM", "290 BPM", "Minimum", "Maximum", "Moyenne", Icons.trending_down,Icons.trending_up,Icons.favorite_outline), - + const LigneContainerStats( + "30 BPM", + "90 BPM", + "290 BPM", + "Minimum", + "Maximum", + "Moyenne", + Icons.trending_down, + Icons.trending_up, + Icons.favorite_outline), SizedBox( height: media.width * 0.05, ),