diff --git a/assets/img/mapIcon.svg b/assets/img/mapIcon.svg new file mode 100644 index 0000000..576fc90 --- /dev/null +++ b/assets/img/mapIcon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/img/mapIcon_selected.svg b/assets/img/mapIcon_selected.svg new file mode 100644 index 0000000..6ab505c --- /dev/null +++ b/assets/img/mapIcon_selected.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/common_widget/container/profile/profile_entete.dart b/lib/common_widget/container/profile/profile_entete.dart index b95d21e..7a73c6b 100644 --- a/lib/common_widget/container/profile/profile_entete.dart +++ b/lib/common_widget/container/profile/profile_entete.dart @@ -45,17 +45,7 @@ class ProfileEntete extends StatelessWidget { ], ), ), - SizedBox( - width: 70, - height: 25, - child: RoundButton( - title: "Editer", - type: RoundButtonType.bgGradient, - fontSize: 12, - fontWeight: FontWeight.w400, - onPressed: () {}, - ), - ) + ], ); } diff --git a/lib/common_widget/container/profile/profile_info_user.dart b/lib/common_widget/container/profile/profile_info_user.dart index 3b1d1c1..9f48af8 100644 --- a/lib/common_widget/container/profile/profile_info_user.dart +++ b/lib/common_widget/container/profile/profile_info_user.dart @@ -21,7 +21,7 @@ class ProfileInfoUser extends StatelessWidget { ), Expanded( child: TitleSubtitleCell( - title: context.watch().getTotalTimeAllActivity().toString(), + title: context.watch().getTotalTimeAllActivity().toStringAsFixed(2), subtitle: "Temps en activité", ), ), @@ -31,7 +31,7 @@ class ProfileInfoUser extends StatelessWidget { Expanded( child: TitleSubtitleCell( title: - "${context.watch().getTotalDenivelePositifAllActivity().toString()} + m", + "${context.watch().getTotalDenivelePositifAllActivity().toStringAsFixed(2)} + m", subtitle: "Total dénivelé positif", ), ), @@ -41,7 +41,7 @@ class ProfileInfoUser extends StatelessWidget { Expanded( child: TitleSubtitleCell( title: - "${context.watch().getTotalDeniveleNegatifAllActivity().toString()} - m", + "${context.watch().getTotalDeniveleNegatifAllActivity().toStringAsFixed(2)} - m", subtitle: "Total dénivelé négatif", ), ), diff --git a/lib/common_widget/graph/altitude_by_time.dart b/lib/common_widget/graph/altitude_by_time.dart index 076c86b..c8e8f76 100644 --- a/lib/common_widget/graph/altitude_by_time.dart +++ b/lib/common_widget/graph/altitude_by_time.dart @@ -1,5 +1,6 @@ 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_by_time.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/utile/home_view/data_home_view.dart'; @@ -18,9 +19,10 @@ class GraphAltitudeByTime extends StatefulWidget { class _GraphAltitudeByTime extends State { @override Widget build(BuildContext context) { + final FuncBpmByTime funcBpm = FuncBpmByTime(widget.data); return ScreenTypeLayout.builder( - mobile: (_) => MobileGraphAltitudeByTime(widget.media, widget.data), - desktop: (_) => WebGraphAltitudeByTime(widget.media, widget.data), + mobile: (_) => MobileGraphAltitudeByTime(widget.media, widget.data, funcBpm), + desktop: (_) => WebGraphAltitudeByTime(widget.media, widget.data, funcBpm), ); } } diff --git a/lib/common_widget/graph/bpm_by_time.dart b/lib/common_widget/graph/bpm_by_time.dart index bf0a09f..e51f4ba 100644 --- a/lib/common_widget/graph/bpm_by_time.dart +++ b/lib/common_widget/graph/bpm_by_time.dart @@ -21,7 +21,7 @@ class _BpmByTime extends State { final FuncBpmByTime funcBpm = FuncBpmByTime(widget.data); return ScreenTypeLayout.builder( - mobile: (_) => MobileBpmByTime(widget.media, widget.data), + mobile: (_) => MobileBpmByTime(widget.media, widget.data, funcBpm), desktop: (_) => WebBpmByTime(widget.media, widget.data, funcBpm), ); } 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 92fafdb..32388d6 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 @@ -14,14 +14,14 @@ class FuncBpmAndSpeedByTime { getTitlesWidget: rightTitleWidgets, showTitles: true, interval: 20, - reservedSize: 40, + reservedSize: 42, ); SideTitles get leftTitles => SideTitles( getTitlesWidget: leftTitleWidgets, showTitles: true, interval: 20, - reservedSize: 40, + reservedSize: 42, ); SideTitles get bottomTitles => SideTitles( getTitlesWidget: bottomTitleWidgets, @@ -79,7 +79,7 @@ class FuncBpmAndSpeedByTime { return Text(text, style: TextStyle( color: TColor.gray, - fontSize: 12, + fontSize: 8, ), textAlign: TextAlign.center); } @@ -113,7 +113,7 @@ class FuncBpmAndSpeedByTime { return Text(text, style: TextStyle( color: TColor.gray, - fontSize: 12, + fontSize: 8, ), textAlign: TextAlign.center); } @@ -148,7 +148,7 @@ class FuncBpmAndSpeedByTime { return Text(text, style: TextStyle( color: TColor.gray, - fontSize: 12, + fontSize: 8, ), textAlign: TextAlign.center); } 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 afbed1b..a8aea75 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 @@ -67,19 +67,19 @@ class FuncBpmByTime { text = '0 s'; break; case 20: - text = "${(interval).toStringAsFixed(2)} s"; + text = "${(interval).toStringAsFixed(0)} s"; break; case 40: - text = "${(interval * 2).toStringAsFixed(2)} s"; + text = "${(interval * 2).toStringAsFixed(0)} s"; break; case 60: - text = "${(interval * 3).toStringAsFixed(2)} s"; + text = "${(interval * 3).toStringAsFixed(0)} s"; break; case 80: - text = "${(interval * 4).toStringAsFixed(2)} s"; + text = "${(interval * 4).toStringAsFixed(0)} s"; break; case 100: - text = "${(interval * 5).toStringAsFixed(2)} s"; + text = "${(interval * 5).toStringAsFixed(0)} s"; break; default: return Container(); diff --git a/lib/common_widget/graph/mobile/mobile_altitude_by_time.dart b/lib/common_widget/graph/mobile/mobile_altitude_by_time.dart index e37bee9..1846fb1 100644 --- a/lib/common_widget/graph/mobile/mobile_altitude_by_time.dart +++ b/lib/common_widget/graph/mobile/mobile_altitude_by_time.dart @@ -2,14 +2,16 @@ 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 MobileGraphAltitudeByTime extends StatefulWidget { final Size media; final DataHomeView data; + final FuncBpmByTime func; - const MobileGraphAltitudeByTime(this.media, this.data, {Key? key}) + const MobileGraphAltitudeByTime(this.media, this.data, this.func, {Key? key}) : super(key: key); @override @@ -70,20 +72,19 @@ class _MobileGraphAltitudeByTime extends State { leftTitles: const AxisTitles(), topTitles: const AxisTitles(), bottomTitles: AxisTitles( - sideTitles: SideTitles( - reservedSize: 20, - showTitles: true, - getTitlesWidget: (value, meta) { - return Text( - "${double.parse((value / 10).toStringAsFixed(2))}s"); - }, - )), + sideTitles: widget.func.bottomTitles, + ), rightTitles: AxisTitles( sideTitles: SideTitles( reservedSize: 60, showTitles: true, getTitlesWidget: (value, meta) { - return Text("${double.parse(value.toStringAsFixed(2))} m"); + return Text("${double.parse(value.toStringAsFixed(2))} m", + style: TextStyle( + color: TColor.gray, + fontSize: 12, + ), + textAlign: TextAlign.center); }, )), )))); 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 3dc8afc..60516e5 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 @@ -111,27 +111,16 @@ class _MobileGraphBpmAndSpeedByTime titlesData: FlTitlesData( show: true, leftTitles: AxisTitles( - sideTitles: widget.func.rightTitles, + sideTitles: widget.func.leftTitles, ), topTitles: const AxisTitles(), bottomTitles: AxisTitles( - sideTitles: SideTitles( - reservedSize: 20, - showTitles: true, - getTitlesWidget: (value, meta) { - return Text( - "${double.parse((value / 10).toStringAsFixed(2))}s"); - }, - )), + sideTitles: widget.func.bottomTitles, + ), rightTitles: AxisTitles( - sideTitles: SideTitles( - reservedSize: 70, - showTitles: true, - getTitlesWidget: (value, meta) { - return Text( - "${double.parse(value.toStringAsFixed(2))} BPM"); - }, - ))), + sideTitles: widget.func.rightTitles, + + ),), gridData: FlGridData( drawVerticalLine: true, drawHorizontalLine: true, 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 9190259..fe420bf 100644 --- a/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart +++ b/lib/common_widget/graph/mobile/mobile_bpm_by_time.dart @@ -1,13 +1,15 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.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/utile/home_view/data_home_view.dart'; class MobileBpmByTime extends StatefulWidget { final Size media; final DataHomeView data; + final FuncBpmByTime func; - const MobileBpmByTime(this.media, this.data, {Key? key}) : super(key: key); + const MobileBpmByTime(this.media, this.data,this.func, {Key? key}) : super(key: key); @override State createState() => _MobileBpmByTime(); @@ -57,19 +59,19 @@ class _MobileBpmByTime extends State { leftTitles: const AxisTitles(), topTitles: const AxisTitles(), bottomTitles: AxisTitles( - sideTitles: SideTitles( - reservedSize: 20, - showTitles: true, - getTitlesWidget: (value, meta) { - return Text("${double.parse((value/10).toStringAsFixed(2))}s"); - }, - )), + sideTitles: widget.func.bottomTitles, + ), rightTitles: AxisTitles( sideTitles: SideTitles( reservedSize: 70, showTitles: true, getTitlesWidget: (value, meta) { - return Text("${double.parse(value.toStringAsFixed(2))} BPM"); + return Text("${double.parse(value.toStringAsFixed(2))} BPM", + style: TextStyle( + color: TColor.gray, + fontSize: 12, + ), + textAlign: TextAlign.center); }, )), )))); diff --git a/lib/common_widget/graph/web/web_altitude_by_time.dart b/lib/common_widget/graph/web/web_altitude_by_time.dart index 8868894..a9e108c 100644 --- a/lib/common_widget/graph/web/web_altitude_by_time.dart +++ b/lib/common_widget/graph/web/web_altitude_by_time.dart @@ -2,14 +2,16 @@ 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 WebGraphAltitudeByTime extends StatefulWidget { final Size media; final DataHomeView data; + final FuncBpmByTime func; - const WebGraphAltitudeByTime(this.media, this.data, {Key? key}) + const WebGraphAltitudeByTime(this.media, this.data, this.func, {Key? key}) : super(key: key); @override @@ -69,20 +71,19 @@ class _WebGraphAltitudeByTime extends State { leftTitles: const AxisTitles(), topTitles: const AxisTitles(), bottomTitles: AxisTitles( - sideTitles: SideTitles( - reservedSize: 20, - showTitles: true, - getTitlesWidget: (value, meta) { - return Text( - "${double.parse((value / 10).toStringAsFixed(2))}s"); - }, - )), + sideTitles: widget.func.bottomTitles, + ), rightTitles: AxisTitles( sideTitles: SideTitles( reservedSize: 60, showTitles: true, getTitlesWidget: (value, meta) { - return Text("${double.parse(value.toStringAsFixed(2))} m"); + return Text("${double.parse(value.toStringAsFixed(2))} m", + style: TextStyle( + color: TColor.gray, + fontSize: 12, + ), + textAlign: TextAlign.center); }, )), )))); diff --git a/lib/modele/utile/home_view/home_view_util.dart b/lib/modele/utile/home_view/home_view_util.dart index 36bec08..4cc56ad 100644 --- a/lib/modele/utile/home_view/home_view_util.dart +++ b/lib/modele/utile/home_view/home_view_util.dart @@ -22,7 +22,7 @@ class HomeViewUtil { List bpmSecondes2 = List.from(bpmSecondes); return DataHomeView(normaliserPremierElement(bpmSecondes), normaliserPremierElement(normaliserDeuxiemeElement(bpmSecondes2)), - normaliserPremierElement(normaliserDeuxiemeElement(vitesseSecondes)), altitudeSeconde); + normaliserPremierElement(normaliserDeuxiemeElement(vitesseSecondes)), normaliserPremierElement(altitudeSeconde)); } List normaliserDeuxiemeElement(List liste) { diff --git a/lib/view/home/mobile/mobile_homeview.dart b/lib/view/home/mobile/mobile_homeview.dart index 9794461..5aba44d 100644 --- a/lib/view/home/mobile/mobile_homeview.dart +++ b/lib/view/home/mobile/mobile_homeview.dart @@ -47,7 +47,8 @@ class _MobileHomeView extends State { // -- Speed -- // double maxSpeed = managerSelectedActivity.getMaxSpeedAllActivitySelected(); double avgSpeed = managerSelectedActivity.getAvgSpeedAllActivitySelected(); - + data.maxSpeed = maxSpeed; + data.time = context.watch().managerSelectedActivity.getTimeAllActivitySelected(); return Scaffold( backgroundColor: TColor.white, body: SingleChildScrollView( diff --git a/lib/view/main_tab/mobile/mobile_main_tab_view.dart b/lib/view/main_tab/mobile/mobile_main_tab_view.dart index 7b0c1c5..5fbd638 100644 --- a/lib/view/main_tab/mobile/mobile_main_tab_view.dart +++ b/lib/view/main_tab/mobile/mobile_main_tab_view.dart @@ -92,8 +92,8 @@ class _MobileMainTabViewState extends State { width: 40, ), TabButton( - icon: "assets/img/Camera_tab.svg", - selectIcon: "assets/img/Camera_tab_select.svg", + icon: "assets/img/mapIcon.svg", + selectIcon: "assets/img/mapIcon_selected.svg", isActive: selectTab == 2, onTap: () { selectTab = 2; 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 3a077d1..759558e 100644 --- a/lib/view/main_tab/web/web_main_tab_view.dart +++ b/lib/view/main_tab/web/web_main_tab_view.dart @@ -76,8 +76,8 @@ class _WebMainTabViewState extends State { ), ), sideBarButton( - icon: "assets/img/icon_map.svg", - selectIcon: "assets/img/icon_map.svg", + icon: "assets/img/mapIcon.svg", + selectIcon: "assets/img/mapIcon_selected.svg", index: 2, onTap: () => updateTab(2, const MyMap()), ), diff --git a/lib/view/map/chose_map.dart b/lib/view/map/chose_map.dart index 1ddd3bd..6788c11 100644 --- a/lib/view/map/chose_map.dart +++ b/lib/view/map/chose_map.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; +import 'package:smartfit_app_mobile/common_widget/button/round_button.dart'; import 'package:smartfit_app_mobile/view/map/mobile/mobile_my_map.dart'; import 'package:smartfit_app_mobile/view/map/my_map_osm.dart'; @@ -13,6 +15,58 @@ class ChoseMap extends StatefulWidget { class _ChoseMap extends State { @override Widget build(BuildContext context) { + var media = MediaQuery.of(context).size; + return Scaffold( + backgroundColor: TColor.white, + body: SafeArea( + child: Center( + // Utilisation du widget Center pour centrer verticalement + child: Container( + width: media.width, + padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 25), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize + .min, // Utilisation de MainAxisSize.min pour que la colonne prenne la hauteur minimale nécessaire + children: [ + SizedBox( + height: media.height * 0.1, + ), + SvgPicture.asset( + "assets/img/group.svg", + width: media.width * 0.75, + height: media.height * 0.4, + fit: BoxFit.fitWidth, + ), + SizedBox( + height: media.height * 0.1, + ), + RoundButton( + title: "Use map with google map", + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const MobileMyMaps())); + }, + ), + SizedBox( + height: media.height * 0.03, + ), + RoundButton( + title : "Use map with Open Street Map", + onPressed: () { + Navigator.push(context, + MaterialPageRoute(builder: (context) => const MyMapOSM())); + }, + ), + Spacer(), + ], + ), + ), + ), + ), + ); return Scaffold( backgroundColor: TColor.white, body: SafeArea( @@ -20,20 +74,7 @@ class _ChoseMap extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - TextButton( - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const MobileMyMaps())); - }, - child: const Text("Use map with google map")), - TextButton( - onPressed: () { - Navigator.push(context, - MaterialPageRoute(builder: (context) => const MyMapOSM())); - }, - child: const Text("Use map with Open Street Map")), + const Text( "Mettre une image la en mode une personne avec des jumelles") ], diff --git a/lib/view/map/mobile/mobile_my_map.dart b/lib/view/map/mobile/mobile_my_map.dart index 4657afe..98171c3 100644 --- a/lib/view/map/mobile/mobile_my_map.dart +++ b/lib/view/map/mobile/mobile_my_map.dart @@ -25,7 +25,7 @@ class _MobileMyMaps extends State { return Scaffold( appBar: AppBar( title: const Text("Carte Google Map "), - backgroundColor: TColor.primaryColor1, + backgroundColor: TColor.secondaryColor1, ), body: _getMap()); } diff --git a/lib/view/map/my_map_osm.dart b/lib/view/map/my_map_osm.dart index 3d5a074..02cae4f 100644 --- a/lib/view/map/my_map_osm.dart +++ b/lib/view/map/my_map_osm.dart @@ -23,7 +23,7 @@ class _MyMapOSM extends State { return Scaffold( appBar: AppBar( title: const Text("Carte Open Street Map "), - backgroundColor: TColor.primaryColor1, + backgroundColor: TColor.secondaryColor1, ), body: FlutterMap( options: MapOptions(center: listPolynines.first), diff --git a/lib/view/profile/all_platforme/profile_view_allplatforme.dart b/lib/view/profile/all_platforme/profile_view_allplatforme.dart index 0aab244..bc12c92 100644 --- a/lib/view/profile/all_platforme/profile_view_allplatforme.dart +++ b/lib/view/profile/all_platforme/profile_view_allplatforme.dart @@ -35,26 +35,6 @@ class _ProfileViewAllPlatforme extends State { style: TextStyle( color: TColor.black, fontSize: 16, fontWeight: FontWeight.w700), ), - actions: [ - InkWell( - onTap: () {}, - child: Container( - margin: const EdgeInsets.all(8), - height: 20, - width: 20, - alignment: Alignment.center, - decoration: BoxDecoration( - color: TColor.lightGray, - borderRadius: BorderRadius.circular(10)), - child: Image.asset( - "assets/img/more_btn.png", - width: 15, - height: 15, - fit: BoxFit.contain, - ), - ), - ) - ], ), backgroundColor: TColor.white, body: SingleChildScrollView( @@ -75,10 +55,7 @@ class _ProfileViewAllPlatforme extends State { const SizedBox( height: 25, ), - ProfileNotification(widget.positive), - const SizedBox( - height: 25, - ), + ProfileOther(widget.otherArr) ], ),