From 195e78a7055271ef6aa1d2fc21b0c8973c56e450 Mon Sep 17 00:00:00 2001 From: Enzo Date: Tue, 5 Dec 2023 11:21:52 +0100 Subject: [PATCH] clean --- .../container/container_stats.dart | 6 +-- .../mobile_container_stats_activities.dart | 7 +-- .../mobile/mobile_ligne_container_stats.dart | 50 +++++++++--------- .../web/web_container_stats_activities.dart | 7 +-- .../web/web_ligne_container_stats.dart | 49 +++++++++-------- lib/common_widget/graph/bpm_by_time.dart | 12 ++--- .../func_bpm_and_speed_by_time.dart | 40 +++++++------- .../data_for_graph/func_bpm_by_time.dart | 39 +++++--------- .../graph/web/web_bpm_by_time.dart | 2 - lib/main.dart | 2 - lib/modele/manager_file.dart | 1 - .../activity/mobile/mobile_list_activity.dart | 1 - lib/view/main_tab/web/web_main_tab_view.dart | 52 ++++++++++--------- lib/view/test/page_test.dart | 4 +- 14 files changed, 129 insertions(+), 143 deletions(-) diff --git a/lib/common_widget/container/container_stats.dart b/lib/common_widget/container/container_stats.dart index e4e5548..5c2d657 100644 --- a/lib/common_widget/container/container_stats.dart +++ b/lib/common_widget/container/container_stats.dart @@ -11,11 +11,11 @@ class ContainerStats extends StatelessWidget { final String designation; final IconData icon; - @override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( - mobile: (_) => MobileContainerStats(this.value, this.designation, this.icon), - desktop: (_) => WebContainerStats(this.value, this.designation, this.icon), + mobile: (_) => MobileContainerStats(value, designation, icon), + desktop: (_) => WebContainerStats(value, designation, icon), ); } } diff --git a/lib/common_widget/container/mobile/mobile_container_stats_activities.dart b/lib/common_widget/container/mobile/mobile_container_stats_activities.dart index b21114d..96d7559 100644 --- a/lib/common_widget/container/mobile/mobile_container_stats_activities.dart +++ b/lib/common_widget/container/mobile/mobile_container_stats_activities.dart @@ -38,7 +38,8 @@ class MobileContainerStatsActivities extends StatelessWidget { ], ), child: Column( - crossAxisAlignment: CrossAxisAlignment.center, // Centrer horizontalement + crossAxisAlignment: + CrossAxisAlignment.center, // Centrer horizontalement mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -48,7 +49,7 @@ class MobileContainerStatsActivities extends StatelessWidget { iconBackground: TColor.secondaryColor1, sizeIcon: 30.0, ), - SizedBox(height: 20), // Espacement entre l'icône et le texte + const SizedBox(height: 20), // Espacement entre l'icône et le texte Text( designation, style: const TextStyle(fontSize: 12), @@ -57,7 +58,7 @@ class MobileContainerStatsActivities extends StatelessWidget { Text( value, style: const TextStyle( - fontSize: 17 , + fontSize: 17, fontWeight: FontWeight.w800, ), textAlign: TextAlign.center, diff --git a/lib/common_widget/container/mobile/mobile_ligne_container_stats.dart b/lib/common_widget/container/mobile/mobile_ligne_container_stats.dart index 157016a..2228112 100644 --- a/lib/common_widget/container/mobile/mobile_ligne_container_stats.dart +++ b/lib/common_widget/container/mobile/mobile_ligne_container_stats.dart @@ -3,9 +3,16 @@ import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/container/container_stats.dart'; class MobileLigneContainerStats extends StatelessWidget { - const MobileLigneContainerStats(this.value1, this.value2, this.value3, - this.designation1, this.designation2, this.designation3, - this.icon1, this.icon2, this.icon3, + const MobileLigneContainerStats( + this.value1, + this.value2, + this.value3, + this.designation1, + this.designation2, + this.designation3, + this.icon1, + this.icon2, + this.icon3, {Key? key}) : super(key: key); @@ -21,13 +28,11 @@ class MobileLigneContainerStats extends StatelessWidget { final IconData icon2; final IconData icon3; - @override Widget build(BuildContext context) { return Column( children: [ - Divider(height: 30), - + const Divider(height: 30), Padding( padding: const EdgeInsets.symmetric(horizontal: 30), child: Row( @@ -39,7 +44,7 @@ class MobileLigneContainerStats extends StatelessWidget { fontWeight: FontWeight.w800, ), ), - SizedBox(width: 8), + const SizedBox(width: 8), Icon( Icons.pie_chart_rounded, size: 15, @@ -48,24 +53,21 @@ class MobileLigneContainerStats extends StatelessWidget { ], ), ), - - SizedBox(height: 20), - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child:Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - ContainerStats(value1, designation1, icon1), - const SizedBox(width: 20), - ContainerStats(value2, designation2, icon2), - const SizedBox(width: 20), - ContainerStats(value3, designation3, icon3), - ],) - ), - Divider(height: 30), + const SizedBox(height: 20), + SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ContainerStats(value1, designation1, icon1), + const SizedBox(width: 20), + ContainerStats(value2, designation2, icon2), + const SizedBox(width: 20), + ContainerStats(value3, designation3, icon3), + ], + )), + const Divider(height: 30), ], ); - - } } diff --git a/lib/common_widget/container/web/web_container_stats_activities.dart b/lib/common_widget/container/web/web_container_stats_activities.dart index 2e5a7d2..e771c6c 100644 --- a/lib/common_widget/container/web/web_container_stats_activities.dart +++ b/lib/common_widget/container/web/web_container_stats_activities.dart @@ -38,7 +38,8 @@ class WebContainerStatsActivities extends StatelessWidget { ], ), child: Column( - crossAxisAlignment: CrossAxisAlignment.center, // Centrer horizontalement + crossAxisAlignment: + CrossAxisAlignment.center, // Centrer horizontalement mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -48,7 +49,7 @@ class WebContainerStatsActivities extends StatelessWidget { iconBackground: TColor.secondaryColor1, sizeIcon: 40.0, ), - SizedBox(height: 40), // Espacement entre l'icône et le texte + const SizedBox(height: 40), // Espacement entre l'icône et le texte Text( designation, style: const TextStyle(fontSize: 15), @@ -57,7 +58,7 @@ class WebContainerStatsActivities extends StatelessWidget { Text( value, style: const TextStyle( - fontSize: 20 , + fontSize: 20, fontWeight: FontWeight.w800, ), textAlign: TextAlign.center, diff --git a/lib/common_widget/container/web/web_ligne_container_stats.dart b/lib/common_widget/container/web/web_ligne_container_stats.dart index c0e9836..3558681 100644 --- a/lib/common_widget/container/web/web_ligne_container_stats.dart +++ b/lib/common_widget/container/web/web_ligne_container_stats.dart @@ -3,9 +3,16 @@ import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/container/container_stats.dart'; class WebLigneContainerStats extends StatelessWidget { - const WebLigneContainerStats(this.value1, this.value2, this.value3, - this.designation1, this.designation2, this.designation3, - this.icon1, this.icon2, this.icon3, + const WebLigneContainerStats( + this.value1, + this.value2, + this.value3, + this.designation1, + this.designation2, + this.designation3, + this.icon1, + this.icon2, + this.icon3, {Key? key}) : super(key: key); @@ -21,11 +28,10 @@ class WebLigneContainerStats extends StatelessWidget { final IconData icon2; final IconData icon3; - @override Widget build(BuildContext context) { return Column( - children: [ + children: [ Padding( padding: const EdgeInsets.symmetric(horizontal: 5), child: Column( @@ -37,7 +43,7 @@ class WebLigneContainerStats extends StatelessWidget { fontWeight: FontWeight.w800, ), ), - SizedBox(width: 8), + const SizedBox(width: 8), Icon( Icons.pie_chart_rounded, size: 15, @@ -46,24 +52,21 @@ class WebLigneContainerStats extends StatelessWidget { ], ), ), - - SizedBox(height: 20), - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child:Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - ContainerStats(value1, designation1, icon1), - const SizedBox(width: 20), - ContainerStats(value2, designation2, icon2), - const SizedBox(width: 20), - ContainerStats(value3, designation3, icon3), - ],) - ), - Divider(height: 30), + const SizedBox(height: 20), + SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ContainerStats(value1, designation1, icon1), + const SizedBox(width: 20), + ContainerStats(value2, designation2, icon2), + const SizedBox(width: 20), + ContainerStats(value3, designation3, icon3), + ], + )), + const Divider(height: 30), ], ); - - } } diff --git a/lib/common_widget/graph/bpm_by_time.dart b/lib/common_widget/graph/bpm_by_time.dart index e5d859f..bf0a09f 100644 --- a/lib/common_widget/graph/bpm_by_time.dart +++ b/lib/common_widget/graph/bpm_by_time.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common_widget/graph/data_for_graph/func_bpm_and_speed_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/data_for_graph/func_bpm_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/mobile/mobile_bpm_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/web/web_bpm_by_time.dart'; @@ -10,21 +9,20 @@ class BpmByTime extends StatefulWidget { final Size media; final DataHomeView data; - const BpmByTime(this.media, this.data, {Key? key}) - : super(key: key); + const BpmByTime(this.media, this.data, {Key? key}) : super(key: key); @override State createState() => _BpmByTime(); } class _BpmByTime extends State { - @override + @override Widget build(BuildContext context) { final FuncBpmByTime funcBpm = FuncBpmByTime(widget.data); return ScreenTypeLayout.builder( - mobile: (_) => MobileBpmByTime(widget.media, widget.data), - desktop: (_) => WebBpmByTime(widget.media, widget.data, funcBpm), + mobile: (_) => MobileBpmByTime(widget.media, widget.data), + desktop: (_) => WebBpmByTime(widget.media, widget.data, funcBpm), ); } -} \ No newline at end of file +} diff --git a/lib/common_widget/graph/data_for_graph/func_bpm_and_speed_by_time.dart b/lib/common_widget/graph/data_for_graph/func_bpm_and_speed_by_time.dart index 135c5af..92fafdb 100644 --- a/lib/common_widget/graph/data_for_graph/func_bpm_and_speed_by_time.dart +++ b/lib/common_widget/graph/data_for_graph/func_bpm_and_speed_by_time.dart @@ -58,26 +58,24 @@ class FuncBpmAndSpeedByTime { text = '0 BPM'; break; case 20: - text = (interval).toStringAsFixed(2)+" BPM"; + text = "${(interval).toStringAsFixed(2)} BPM"; break; case 40: - text = (interval*2).toStringAsFixed(2)+" BPM"; + text = "${(interval * 2).toStringAsFixed(2)} BPM"; break; case 60: - text = (interval*3).toStringAsFixed(2)+" BPM"; + text = "${(interval * 3).toStringAsFixed(2)} BPM"; break; case 80: - text = (interval*4).toStringAsFixed(2)+" BPM"; + text = "${(interval * 4).toStringAsFixed(2)} BPM"; break; case 100: - text = (interval*5).toString()+" BPM"; + text = "${interval * 5} BPM"; break; default: return Container(); } - - return Text(text, style: TextStyle( color: TColor.gray, @@ -85,34 +83,33 @@ class FuncBpmAndSpeedByTime { ), textAlign: TextAlign.center); } + Widget bottomTitleWidgets(double value, TitleMeta meta) { - double interval = data.time/ 5; + double interval = data.time / 5; String text; switch (value) { case 0: text = '0 s'; break; case 20: - text = (interval).toStringAsFixed(2)+" s"; + text = "${(interval).toStringAsFixed(2)} s"; break; case 40: - text = (interval*2).toStringAsFixed(2)+" s"; + text = "${(interval * 2).toStringAsFixed(2)} s"; break; case 60: - text = (interval*3).toStringAsFixed(2)+" s"; + text = "${(interval * 3).toStringAsFixed(2)} s"; break; case 80: - text = (interval*4).toStringAsFixed(2)+" s"; + text = "${(interval * 4).toStringAsFixed(2)} s"; break; case 100: - text = (interval*5).toStringAsFixed(2)+" s"; + text = "${(interval * 5).toStringAsFixed(2)} s"; break; default: return Container(); } - - return Text(text, style: TextStyle( color: TColor.gray, @@ -130,26 +127,24 @@ class FuncBpmAndSpeedByTime { text = '0 m/s'; break; case 20: - text = (interval / 5).toStringAsFixed(2)+" m/s"; + text = "${(interval / 5).toStringAsFixed(2)} m/s"; break; case 40: - text = (interval*2).toStringAsFixed(2)+" m/s"; + text = "${(interval * 2).toStringAsFixed(2)} m/s"; break; case 60: - text = (interval*3).toStringAsFixed(2)+" m/s"; + text = "${(interval * 3).toStringAsFixed(2)} m/s"; break; case 80: - text = (interval*4).toStringAsFixed(2)+" m/s"; + text = "${(interval * 4).toStringAsFixed(2)} m/s"; break; case 100: - text = (interval*5).toStringAsFixed(2)+" m/s"; + text = "${(interval * 5).toStringAsFixed(2)} m/s"; break; default: return Container(); } - - return Text(text, style: TextStyle( color: TColor.gray, @@ -157,6 +152,7 @@ class FuncBpmAndSpeedByTime { ), textAlign: TextAlign.center); } + List get lineBarsData1 => [ lineChartBarData1_1, lineChartBarData1_2, diff --git a/lib/common_widget/graph/data_for_graph/func_bpm_by_time.dart b/lib/common_widget/graph/data_for_graph/func_bpm_by_time.dart index 3c48bf9..afbed1b 100644 --- a/lib/common_widget/graph/data_for_graph/func_bpm_by_time.dart +++ b/lib/common_widget/graph/data_for_graph/func_bpm_by_time.dart @@ -8,7 +8,6 @@ class FuncBpmByTime { FuncBpmByTime(this.data); - SideTitles get rightTitles => SideTitles( getTitlesWidget: rightTitleWidgets, showTitles: true, @@ -23,40 +22,35 @@ class FuncBpmByTime { reservedSize: 20, ); - - Widget rightTitleWidgets(double value, TitleMeta meta) { int minBpm = data.minBPM; int maxBpm = data.maxBPM; - double interval = (maxBpm-minBpm)/ 5; + double interval = (maxBpm - minBpm) / 5; - print(value.toString()+ "tessst"); String text; switch (value.toInt()) { case 0: - text = (minBpm).toStringAsFixed(2)+" BPM"; + text = "${(minBpm).toStringAsFixed(2)} BPM"; break; case 20: - text = (minBpm+interval).toStringAsFixed(2)+" BPM"; + text = "${(minBpm + interval).toStringAsFixed(2)} BPM"; break; case 40: - text = (minBpm+interval*2).toStringAsFixed(2)+" BPM"; + text = "${(minBpm + interval * 2).toStringAsFixed(2)} BPM"; break; case 60: - text = (minBpm+interval*3).toStringAsFixed(2)+" BPM"; + text = "${(minBpm + interval * 3).toStringAsFixed(2)} BPM"; break; case 80: - text = (minBpm+interval*4).toStringAsFixed(2)+" BPM"; + text = "${(minBpm + interval * 4).toStringAsFixed(2)} BPM"; break; case 100: - text = (maxBpm).toStringAsFixed(2)+" BPM"; + text = "${(maxBpm).toStringAsFixed(2)} BPM"; break; default: return Container(); } - - return Text(text, style: TextStyle( color: TColor.gray, @@ -64,34 +58,33 @@ class FuncBpmByTime { ), textAlign: TextAlign.center); } + Widget bottomTitleWidgets(double value, TitleMeta meta) { - double interval = data.time/ 5; + double interval = data.time / 5; String text; switch (value) { case 0: text = '0 s'; break; case 20: - text = (interval).toStringAsFixed(2)+" s"; + text = "${(interval).toStringAsFixed(2)} s"; break; case 40: - text = (interval*2).toStringAsFixed(2)+" s"; + text = "${(interval * 2).toStringAsFixed(2)} s"; break; case 60: - text = (interval*3).toStringAsFixed(2)+" s"; + text = "${(interval * 3).toStringAsFixed(2)} s"; break; case 80: - text = (interval*4).toStringAsFixed(2)+" s"; + text = "${(interval * 4).toStringAsFixed(2)} s"; break; case 100: - text = (interval*5).toStringAsFixed(2)+" s"; + text = "${(interval * 5).toStringAsFixed(2)} s"; break; default: return Container(); } - - return Text(text, style: TextStyle( color: TColor.gray, @@ -99,8 +92,4 @@ class FuncBpmByTime { ), textAlign: TextAlign.center); } - - - - } diff --git a/lib/common_widget/graph/web/web_bpm_by_time.dart b/lib/common_widget/graph/web/web_bpm_by_time.dart index f6970a9..bf9a67f 100644 --- a/lib/common_widget/graph/web/web_bpm_by_time.dart +++ b/lib/common_widget/graph/web/web_bpm_by_time.dart @@ -1,9 +1,7 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/graph/data_for_graph/func_bpm_by_time.dart'; -import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; class WebBpmByTime extends StatefulWidget { diff --git a/lib/main.dart b/lib/main.dart index cf0fad3..f2f81e1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,9 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; -import 'package:smartfit_app_mobile/view/home/stats_activities_view.dart'; import 'package:smartfit_app_mobile/view/login/signup_view.dart'; -import 'package:smartfit_app_mobile/view/test/page_test.dart'; void main() { runApp(ChangeNotifierProvider( diff --git a/lib/modele/manager_file.dart b/lib/modele/manager_file.dart index 1361c3c..6dcebe0 100644 --- a/lib/modele/manager_file.dart +++ b/lib/modele/manager_file.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:io'; import 'dart:typed_data'; import 'package:csv/csv.dart'; import 'package:fit_tool/fit_tool.dart'; diff --git a/lib/view/activity/mobile/mobile_list_activity.dart b/lib/view/activity/mobile/mobile_list_activity.dart index 20af419..e67c7eb 100644 --- a/lib/view/activity/mobile/mobile_list_activity.dart +++ b/lib/view/activity/mobile/mobile_list_activity.dart @@ -61,7 +61,6 @@ class _MobileListActivity extends State { result.files.first.name, context); } else { - print("Picker"); // msg d'erreur // User canceled the picker } diff --git a/lib/view/main_tab/web/web_main_tab_view.dart b/lib/view/main_tab/web/web_main_tab_view.dart index 271fed6..2659728 100644 --- a/lib/view/main_tab/web/web_main_tab_view.dart +++ b/lib/view/main_tab/web/web_main_tab_view.dart @@ -50,31 +50,31 @@ class _WebMainTabViewState extends State { onTap: () => updateTab(1, const Activity()), ), InkWell( - onTap: () { - updateTab(4, const ListActivity()); - }, - child: Container( - width: 65, - height: 65, - decoration: BoxDecoration( - gradient: LinearGradient( - colors: TColor.primaryG, - ), - borderRadius: BorderRadius.circular(35), - boxShadow: const [ - BoxShadow( - color: Colors.black12, - blurRadius: 2, - ), - ], - ), - child: Icon( - Icons.search, - color: TColor.white, - size: 35, + onTap: () { + updateTab(4, const ListActivity()); + }, + child: Container( + width: 65, + height: 65, + decoration: BoxDecoration( + gradient: LinearGradient( + colors: TColor.primaryG, ), + borderRadius: BorderRadius.circular(35), + boxShadow: const [ + BoxShadow( + color: Colors.black12, + blurRadius: 2, + ), + ], + ), + child: Icon( + Icons.search, + color: TColor.white, + size: 35, ), ), + ), sideBarButton( icon: "assets/img/Camera_tab.svg", selectIcon: "assets/img/Camera_tab_select.svg", @@ -98,15 +98,17 @@ class _WebMainTabViewState extends State { BoxShadow( color: Colors.black12, blurRadius: 2, - offset: const Offset(-2, 0), // Ajout d'une ombre sur le côté + offset: + const Offset(-2, 0), // Ajout d'une ombre sur le côté ), ], ), child: Scaffold( backgroundColor: TColor.white, body: currentTab, - floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, - floatingActionButton: SizedBox( + floatingActionButtonLocation: + FloatingActionButtonLocation.centerDocked, + floatingActionButton: const SizedBox( width: 70, height: 70, ), diff --git a/lib/view/test/page_test.dart b/lib/view/test/page_test.dart index c5b6ec6..83fca6f 100644 --- a/lib/view/test/page_test.dart +++ b/lib/view/test/page_test.dart @@ -84,7 +84,7 @@ class _TestPage extends State { //late File x = File(file.path); Future readFile() async { - ManagerFile _managerFile = ManagerFile(); + ManagerFile managerFile = ManagerFile(); PlatformFile t = result!.files.single; String? y = t.path; @@ -97,7 +97,7 @@ class _TestPage extends State { //print(fitFile.toRows()); //print("${await _managerFile.localPath}\\test.csv"); - final outFile = File("${await _managerFile.localPath}\\test.csv"); + final outFile = File("${await managerFile.localPath}\\test.csv"); final csv = const ListToCsvConverter().convert(fitFile.toRows()); await outFile.writeAsString(csv);