From 2e3793ea6d7bc2909019c4d730fae92205ce5650 Mon Sep 17 00:00:00 2001 From: rem Date: Wed, 29 Nov 2023 16:02:22 +0100 Subject: [PATCH 1/3] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e380b6d..5208750 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,5 +40,5 @@ steps: - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - export SONAR_SCANNER_OPTS="-server" - - sonar-scanner -D sonar.projectKey=SmartFit_Mobile -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar -D sonar.login=$${SONAR_TOKEN} + - sonar-scanner -D sonar.projectKey=SmartFit_Mobile -D sonar.sources=./lib -D sonar.host.url=https://codefirst.iut.uca.fr/sonar -D sonar.login=$${SONAR_TOKEN} depends_on: [ build-apk, build-web ] From 2ed8ccf2a5edb4559b915c28395bde2b4a8acfe5 Mon Sep 17 00:00:00 2001 From: Enzo Date: Wed, 29 Nov 2023 16:33:12 +0100 Subject: [PATCH 2/3] code smell --- lib/common_widget/graph/altitude_by_time.dart | 12 ++-- .../graph/bpm_and_speed_by_time.dart | 10 ++-- .../mobile/mobile_bpm_and_speed_by_time.dart | 2 - .../graph/mobile/mobile_bpm_by_time.dart | 2 - .../graph/web/web_bpm_and_speed_by_time.dart | 2 - .../graph/web/web_bpm_by_time.dart | 2 +- .../utile/home_view/home_view_util.dart | 2 - lib/modele/utile/maps/maps_utile.dart | 6 +- lib/view/main_tab/main_tab_view.dart | 11 +--- lib/view/main_tab/select_view.dart | 60 ------------------- lib/view/profile/change_password.dart | 7 +-- lib/view/profile/change_username.dart | 7 +-- lib/view/test/page_test.dart | 4 +- 13 files changed, 17 insertions(+), 110 deletions(-) delete mode 100644 lib/view/main_tab/select_view.dart diff --git a/lib/common_widget/graph/altitude_by_time.dart b/lib/common_widget/graph/altitude_by_time.dart index 63a9885..076c86b 100644 --- a/lib/common_widget/graph/altitude_by_time.dart +++ b/lib/common_widget/graph/altitude_by_time.dart @@ -1,11 +1,7 @@ -import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/graph/mobile/mobile_altitude_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/web/web_altitude_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 GraphAltitudeByTime extends StatefulWidget { @@ -20,11 +16,11 @@ class GraphAltitudeByTime extends StatefulWidget { } class _GraphAltitudeByTime extends State { - @override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( - mobile: (_) => MobileGraphAltitudeByTime(widget.media, widget.data), - desktop: (_) => WebGraphAltitudeByTime(widget.media, widget.data), + mobile: (_) => MobileGraphAltitudeByTime(widget.media, widget.data), + desktop: (_) => WebGraphAltitudeByTime(widget.media, widget.data), ); } -} \ No newline at end of file +} diff --git a/lib/common_widget/graph/bpm_and_speed_by_time.dart b/lib/common_widget/graph/bpm_and_speed_by_time.dart index 2232b27..4530156 100644 --- a/lib/common_widget/graph/bpm_and_speed_by_time.dart +++ b/lib/common_widget/graph/bpm_and_speed_by_time.dart @@ -1,7 +1,5 @@ -import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart'; import 'package:smartfit_app_mobile/common_widget/graph/web/web_bpm_and_speed_by_time.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; @@ -18,11 +16,11 @@ class GraphBpmAndSpeedByTime extends StatefulWidget { } class _GraphBpmAndSpeedByTime extends State { - @override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( - mobile: (_) => MobileGraphBpmAndSpeedByTime(widget.media, widget.data), - desktop: (_) => WebGraphBpmAndSpeedByTime(widget.media, widget.data), + mobile: (_) => MobileGraphBpmAndSpeedByTime(widget.media, widget.data), + desktop: (_) => WebGraphBpmAndSpeedByTime(widget.media, widget.data), ); } -} \ No newline at end of file +} diff --git a/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart b/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart index 350db88..2e3d786 100644 --- a/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart +++ b/lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart @@ -1,8 +1,6 @@ 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/modele/user.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; class MobileGraphBpmAndSpeedByTime extends StatefulWidget { diff --git a/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart b/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart index 070b11c..d14962c 100644 --- a/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart +++ b/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart @@ -1,8 +1,6 @@ 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/modele/user.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; class MobileBpmByTime extends StatefulWidget { diff --git a/lib/common_widget/graph/web/web_bpm_and_speed_by_time.dart b/lib/common_widget/graph/web/web_bpm_and_speed_by_time.dart index 061439c..ea15e37 100644 --- a/lib/common_widget/graph/web/web_bpm_and_speed_by_time.dart +++ b/lib/common_widget/graph/web/web_bpm_and_speed_by_time.dart @@ -1,8 +1,6 @@ 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/modele/user.dart'; import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart'; class WebGraphBpmAndSpeedByTime extends StatefulWidget { 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 b39cab2..c9d202b 100644 --- a/lib/common_widget/graph/web/web_bpm_by_time.dart +++ b/lib/common_widget/graph/web/web_bpm_by_time.dart @@ -24,7 +24,7 @@ class _WebBpmByTime extends State { context.watch().managerSelectedActivity.getMinBpm() - 2; final double maxX = widget.data.bpmSecondes[widget.data.bpmSecondes.length - 1].x; - final double minX = 0.0; + const double minX = 0.0; final lineBarsData = [ LineChartBarData( spots: widget.data.bpmSecondes, diff --git a/lib/modele/utile/home_view/home_view_util.dart b/lib/modele/utile/home_view/home_view_util.dart index 131f6fd..b1e2a94 100644 --- a/lib/modele/utile/home_view/home_view_util.dart +++ b/lib/modele/utile/home_view/home_view_util.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/modele/activity.dart'; import 'package:smartfit_app_mobile/modele/manager_file.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/utile/home_view/data_home_view.dart'; diff --git a/lib/modele/utile/maps/maps_utile.dart b/lib/modele/utile/maps/maps_utile.dart index 300c417..173e8ff 100644 --- a/lib/modele/utile/maps/maps_utile.dart +++ b/lib/modele/utile/maps/maps_utile.dart @@ -5,12 +5,12 @@ import 'package:smartfit_app_mobile/modele/user.dart'; class MapUtil { Set initPolines(BuildContext context, int largueur, Color couleur) { - Set _polylines = {}; - _polylines.add(Polyline( + Set polylines = {}; + polylines.add(Polyline( polylineId: const PolylineId("Polyline"), color: couleur, points: context.watch().managerSelectedActivity.getPosition(), width: largueur)); - return _polylines; + return polylines; } } diff --git a/lib/view/main_tab/main_tab_view.dart b/lib/view/main_tab/main_tab_view.dart index 1d894c2..feed785 100644 --- a/lib/view/main_tab/main_tab_view.dart +++ b/lib/view/main_tab/main_tab_view.dart @@ -1,14 +1,7 @@ import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/view/activity/list_activity.dart'; -import 'package:smartfit_app_mobile/common/colo_extension.dart'; -import 'package:smartfit_app_mobile/common_widget/button/tab_button.dart'; -import 'package:smartfit_app_mobile/view/activity/activity.dart'; -import 'package:smartfit_app_mobile/view/home/home_view.dart'; import 'package:flutter/material.dart'; import 'package:smartfit_app_mobile/view/main_tab/mobile/mobile_main_tab_view.dart'; import 'package:smartfit_app_mobile/view/main_tab/web/web_main_tab_view.dart'; -import 'package:smartfit_app_mobile/view/map/my_map.dart'; -import 'package:smartfit_app_mobile/view/profile/profile_view.dart'; class MainTabView extends StatefulWidget { const MainTabView({super.key}); @@ -18,11 +11,11 @@ class MainTabView extends StatefulWidget { } class _MainTabViewState extends State { -@override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( mobile: (_) => const MobileMainTabView(), desktop: (_) => const WebMainTabView(), ); } -} \ No newline at end of file +} diff --git a/lib/view/main_tab/select_view.dart b/lib/view/main_tab/select_view.dart deleted file mode 100644 index a2786bd..0000000 --- a/lib/view/main_tab/select_view.dart +++ /dev/null @@ -1,60 +0,0 @@ - - -//import '../sleep_tracker/sleep_tracker_view.dart'; -/* -class SelectView extends StatelessWidget { - const SelectView({super.key}); - - @override - Widget build(BuildContext context) { - // var media = MediaQuery.of(context).size; - - return Scaffold( - body: Padding( - padding: const EdgeInsets.symmetric(horizontal: 20), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - RoundButton( - title: "Workout Tracker", - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const BlankView(), - ), - ); - }), - const SizedBox( - height: 15, - ), - RoundButton( - title: "Meal Planner", - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const BlankView(), - ), - ); - }), - const SizedBox( - height: 15, - ), - RoundButton( - title: "Sleep Tracker", - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const BlankView(), - ), - ); - }) - ], - ), - ), - ); - } -} -*/ \ No newline at end of file diff --git a/lib/view/profile/change_password.dart b/lib/view/profile/change_password.dart index 6ff6525..afe2b7f 100644 --- a/lib/view/profile/change_password.dart +++ b/lib/view/profile/change_password.dart @@ -1,13 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common_widget/button/round_button.dart'; -import 'package:smartfit_app_mobile/common_widget/text_field/round_text_field.dart'; import 'package:smartfit_app_mobile/view/profile/mobile/mobile_change_password.dart'; import 'package:smartfit_app_mobile/view/profile/web/web_change_password.dart'; -import '../../common/colo_extension.dart'; - class ChangePasswordView extends StatefulWidget { const ChangePasswordView({super.key}); @@ -16,7 +11,7 @@ class ChangePasswordView extends StatefulWidget { } class _ChangePasswordViewState extends State { - @override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( mobile: (_) => const MobileChangePasswordView(), diff --git a/lib/view/profile/change_username.dart b/lib/view/profile/change_username.dart index c7591f6..5978262 100644 --- a/lib/view/profile/change_username.dart +++ b/lib/view/profile/change_username.dart @@ -1,13 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/common_widget/button/round_button.dart'; -import 'package:smartfit_app_mobile/common_widget/text_field/round_text_field.dart'; import 'package:smartfit_app_mobile/view/profile/mobile/mobile_change_username.dart'; import 'package:smartfit_app_mobile/view/profile/web/web_change_username.dart'; -import '../../common/colo_extension.dart'; - class ChangeUsernameView extends StatefulWidget { const ChangeUsernameView({super.key}); @@ -16,7 +11,7 @@ class ChangeUsernameView extends StatefulWidget { } class _ChangeUsernameViewState extends State { - @override + @override Widget build(BuildContext context) { return ScreenTypeLayout.builder( mobile: (_) => const MobileChangeUsernameView(), diff --git a/lib/view/test/page_test.dart b/lib/view/test/page_test.dart index c051ed1..f78e141 100644 --- a/lib/view/test/page_test.dart +++ b/lib/view/test/page_test.dart @@ -81,11 +81,9 @@ class _TestPage extends State { FilePickerResult? result; IDataStrategy strategy = RequestApi(); String platforme = getPlatforme(); - final ManagerFile _managerFile = ManagerFile(); //late File x = File(file.path); Future readFile() async { - ManagerFile x = ManagerFile(); PlatformFile t = result!.files.single; String? y = t.path; if (t.path == null) { @@ -169,7 +167,7 @@ class _TestPage extends State { } csvData.insert(0, enteteCSV); - final csv = const ListToCsvConverter().convert(csvData); + //final csv = const ListToCsvConverter().convert(csvData); //await outFile.writeAsString(csv); // ------- FIN --------------- // From 407664c1d529f16bc93e0db07f31b66946ba5edc Mon Sep 17 00:00:00 2001 From: Enzo Date: Wed, 29 Nov 2023 16:43:06 +0100 Subject: [PATCH 3/3] fin codeSmell --- lib/common_widget/info.dart | 10 +++++----- lib/view/test/page_test.dart | 13 ++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/lib/common_widget/info.dart b/lib/common_widget/info.dart index d17ad64..f28d9f1 100644 --- a/lib/common_widget/info.dart +++ b/lib/common_widget/info.dart @@ -22,11 +22,11 @@ class Info extends StatelessWidget { } class Stats extends StatelessWidget { - String value; - String unit; - String label; + final String value; + final String unit; + final String label; - Stats({ + const Stats({ Key? key, required this.value, required this.unit, @@ -50,7 +50,7 @@ class Stats extends StatelessWidget { const TextSpan(text: ' '), TextSpan( text: unit, - style: TextStyle( + style: const TextStyle( fontSize: 10, fontWeight: FontWeight.w500, ), diff --git a/lib/view/test/page_test.dart b/lib/view/test/page_test.dart index f78e141..0ccb04c 100644 --- a/lib/view/test/page_test.dart +++ b/lib/view/test/page_test.dart @@ -1,16 +1,13 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; -import 'package:csv/csv.dart'; import 'package:fit_tool/fit_tool.dart'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter/material.dart'; -import 'package:path_provider/path_provider.dart'; import 'package:file_picker/file_picker.dart'; import 'package:provider/provider.dart'; import 'dart:io'; import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; -import 'package:smartfit_app_mobile/modele/manager_file.dart'; import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/modele/api/request_api.dart'; import 'package:tuple/tuple.dart'; @@ -19,8 +16,9 @@ import 'package:tuple/tuple.dart'; // Dossier de l'application Future get _localPath async { - final directory = await getApplicationDocumentsDirectory(); - return directory.path; + //final directory = await getApplicationDocumentsDirectory(); + //return directory.path; + return "PATH"; } // Uri du fichier @@ -259,7 +257,6 @@ class _TestPage extends State { print(res.item1); print(res.item2); - ManagerFile x = ManagerFile(); //File file = File("${await x.localPath}/Walking_2023-11-08T10_57_28.fit"); //await file.create(); //await file.writeAsBytes(res.item2); @@ -305,9 +302,7 @@ class _TestPage extends State { if (result == null) { print("No file selected"); } else { - for (var element in result!.files) { - readFile(); - } + readFile(); } }, child: const Text("File - ")),