Merge branch 'Enzo'
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Enzo
1 year ago
commit
8834a0e780
@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../common/colo_extension.dart';
|
||||
import '../../common/colo_extension.dart';
|
||||
|
||||
enum RoundButtonType { bgGradient, bgSGradient, textGradient }
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/stats.dart';
|
||||
|
||||
class ContainerStats extends StatelessWidget {
|
||||
const ContainerStats(this.value, this.designation, this.icon, {Key? key})
|
||||
: super(key: key);
|
||||
|
||||
final String value;
|
||||
final String designation;
|
||||
final IconData icon;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 100,
|
||||
width: 100,
|
||||
padding: const EdgeInsets.all(8),
|
||||
margin: const EdgeInsets.symmetric(vertical: 5),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: BorderRadius.circular(15),
|
||||
border: Border.all(
|
||||
color: const Color(0xffe1e1e1),
|
||||
),
|
||||
boxShadow: const [
|
||||
BoxShadow(
|
||||
color: Colors.black12,
|
||||
offset: Offset(3, 3),
|
||||
blurRadius: 3,
|
||||
),
|
||||
]),
|
||||
child: Stack(
|
||||
children: [
|
||||
StatIcon(
|
||||
icon: icon,
|
||||
iconColor: TColor.white,
|
||||
iconBackground: TColor.secondaryColor1,
|
||||
),
|
||||
Align(
|
||||
alignment: Alignment.bottomLeft,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
designation,
|
||||
style: const TextStyle(fontSize: 10),
|
||||
),
|
||||
Text(
|
||||
value,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w800,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/container/container_stats.dart';
|
||||
|
||||
class LigneContainerStats extends StatelessWidget {
|
||||
const LigneContainerStats(this.value1, this.value2, this.value3,
|
||||
this.designation1, this.designation2, this.designation3,
|
||||
this.icon1, this.icon2, this.icon3,
|
||||
{Key? key})
|
||||
: super(key: key);
|
||||
|
||||
final String value1;
|
||||
final String value2;
|
||||
final String value3;
|
||||
|
||||
final String designation1;
|
||||
final String designation2;
|
||||
final String designation3;
|
||||
|
||||
final IconData icon1;
|
||||
final IconData icon2;
|
||||
final IconData icon3;
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
children: [
|
||||
Divider(height: 30),
|
||||
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 30),
|
||||
child: Row(
|
||||
children: [
|
||||
const Text(
|
||||
'Statistiques',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w800,
|
||||
),
|
||||
),
|
||||
SizedBox(width: 8),
|
||||
Icon(
|
||||
Icons.pie_chart_rounded,
|
||||
size: 15,
|
||||
color: TColor.secondaryColor1,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
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),
|
||||
],
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
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 GraphAltitudeByTime extends StatefulWidget {
|
||||
final Size media;
|
||||
final DataHomeView data;
|
||||
|
||||
const GraphAltitudeByTime(this.media, this.data, {Key? key})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
State<GraphAltitudeByTime> createState() => _GraphAltitudeByTime();
|
||||
}
|
||||
|
||||
class _GraphAltitudeByTime extends State<GraphAltitudeByTime> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final double maxY =
|
||||
context.watch<User>().listActivity[0].getMaxAltitude() + 2;
|
||||
final double minY =
|
||||
context.watch<User>().listActivity[0].getMinAltitude() - 2;
|
||||
|
||||
final lineBarsData = [
|
||||
LineChartBarData(
|
||||
spots: widget.data.altitudeSeconde,
|
||||
isCurved: false,
|
||||
gradient: LinearGradient(
|
||||
colors: TColor.primaryG,
|
||||
),
|
||||
dotData: const FlDotData(show: false))
|
||||
];
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.only(left: 15),
|
||||
height: widget.media.width * 0.5,
|
||||
width: double.maxFinite,
|
||||
child: LineChart(LineChartData(
|
||||
lineBarsData: lineBarsData,
|
||||
borderData: FlBorderData(show: false),
|
||||
maxY: maxY,
|
||||
minY: minY,
|
||||
gridData: FlGridData(
|
||||
drawVerticalLine: false,
|
||||
drawHorizontalLine: true,
|
||||
horizontalInterval: (maxY - minY) / 5,
|
||||
getDrawingHorizontalLine: (value) {
|
||||
return FlLine(
|
||||
color: TColor.gray.withOpacity(0.15),
|
||||
strokeWidth: 2,
|
||||
);
|
||||
}),
|
||||
titlesData: FlTitlesData(
|
||||
leftTitles: const AxisTitles(),
|
||||
topTitles: const AxisTitles(),
|
||||
bottomTitles: const AxisTitles(),
|
||||
rightTitles: AxisTitles(
|
||||
sideTitles: SideTitles(
|
||||
reservedSize: 60,
|
||||
showTitles: true,
|
||||
getTitlesWidget: (value, meta) {
|
||||
return Text("${double.parse(value.toStringAsFixed(2))} m");
|
||||
},
|
||||
)),
|
||||
))));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,223 @@
|
||||
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/modele/utile/home_view/data_home_view.dart';
|
||||
|
||||
class GraphBpmAndSpeedByTime extends StatefulWidget {
|
||||
final Size media;
|
||||
final DataHomeView data;
|
||||
|
||||
const GraphBpmAndSpeedByTime(this.media, this.data, {Key? key})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
State<GraphBpmAndSpeedByTime> createState() => _GraphBpmAndSpeedByTime();
|
||||
}
|
||||
|
||||
class _GraphBpmAndSpeedByTime extends State<GraphBpmAndSpeedByTime> {
|
||||
TextEditingController bpmController = TextEditingController();
|
||||
|
||||
List<int> showingTooltipOnSpots = [0];
|
||||
|
||||
SideTitles get rightTitles => SideTitles(
|
||||
getTitlesWidget: rightTitleWidgets,
|
||||
showTitles: true,
|
||||
interval: 20,
|
||||
reservedSize: 40,
|
||||
);
|
||||
|
||||
Widget rightTitleWidgets(double value, TitleMeta meta) {
|
||||
String text;
|
||||
switch (value.toInt()) {
|
||||
case 0:
|
||||
text = '0%';
|
||||
break;
|
||||
case 20:
|
||||
text = '20%';
|
||||
break;
|
||||
case 40:
|
||||
text = '40%';
|
||||
break;
|
||||
case 60:
|
||||
text = '60%';
|
||||
break;
|
||||
case 80:
|
||||
text = '80%';
|
||||
break;
|
||||
case 100:
|
||||
text = '100%';
|
||||
break;
|
||||
default:
|
||||
return Container();
|
||||
}
|
||||
|
||||
return Text(text,
|
||||
style: TextStyle(
|
||||
color: TColor.gray,
|
||||
fontSize: 12,
|
||||
),
|
||||
textAlign: TextAlign.center);
|
||||
}
|
||||
|
||||
List<LineChartBarData> get lineBarsData1 => [
|
||||
lineChartBarData1_1,
|
||||
lineChartBarData1_2,
|
||||
];
|
||||
|
||||
LineChartBarData get lineChartBarData1_1 => LineChartBarData(
|
||||
isCurved: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.primaryColor2.withOpacity(0.5),
|
||||
TColor.primaryColor1.withOpacity(0.5),
|
||||
]),
|
||||
barWidth: 4,
|
||||
isStrokeCapRound: true,
|
||||
dotData: const FlDotData(show: false),
|
||||
belowBarData: BarAreaData(show: false),
|
||||
spots: widget.data.vitesseSecondes,
|
||||
);
|
||||
|
||||
LineChartBarData get lineChartBarData1_2 => LineChartBarData(
|
||||
isCurved: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.secondaryColor2.withOpacity(0.5),
|
||||
TColor.secondaryColor1.withOpacity(0.5),
|
||||
]),
|
||||
barWidth: 2,
|
||||
isStrokeCapRound: true,
|
||||
dotData: const FlDotData(show: false),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
spots: widget.data.bpmSecondes2,
|
||||
);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final lineBarsData = [
|
||||
LineChartBarData(
|
||||
spots: widget.data.bpmSecondes,
|
||||
isCurved: false,
|
||||
barWidth: 2,
|
||||
belowBarData: BarAreaData(
|
||||
show: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.secondaryColor1.withOpacity(0.4),
|
||||
TColor.secondaryColor2.withOpacity(0.1),
|
||||
], begin: Alignment.topCenter, end: Alignment.bottomCenter),
|
||||
),
|
||||
dotData: const FlDotData(show: false),
|
||||
gradient: LinearGradient(
|
||||
colors: TColor.secondaryG,
|
||||
),
|
||||
),
|
||||
];
|
||||
final tooltipsOnBar = lineBarsData[0];
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.only(left: 15),
|
||||
height: widget.media.width * 0.3,
|
||||
width: double.maxFinite,
|
||||
child: LineChart(
|
||||
LineChartData(
|
||||
showingTooltipIndicators: showingTooltipOnSpots.map((index) {
|
||||
return ShowingTooltipIndicators([
|
||||
LineBarSpot(
|
||||
tooltipsOnBar,
|
||||
lineBarsData.indexOf(tooltipsOnBar),
|
||||
tooltipsOnBar.spots[index],
|
||||
),
|
||||
]);
|
||||
}).toList(),
|
||||
lineTouchData: LineTouchData(
|
||||
enabled: true,
|
||||
handleBuiltInTouches: false,
|
||||
touchCallback: (FlTouchEvent event, LineTouchResponse? response) {
|
||||
if (response == null || response.lineBarSpots == null) {
|
||||
return;
|
||||
}
|
||||
if (event is FlTapUpEvent) {
|
||||
final spotIndex = response.lineBarSpots!.first.spotIndex;
|
||||
showingTooltipOnSpots.clear();
|
||||
setState(() {
|
||||
showingTooltipOnSpots.add(spotIndex);
|
||||
});
|
||||
}
|
||||
},
|
||||
mouseCursorResolver:
|
||||
(FlTouchEvent event, LineTouchResponse? response) {
|
||||
if (response == null || response.lineBarSpots == null) {
|
||||
return SystemMouseCursors.basic;
|
||||
}
|
||||
return SystemMouseCursors.click;
|
||||
},
|
||||
getTouchedSpotIndicator:
|
||||
(LineChartBarData barData, List<int> spotIndexes) {
|
||||
return spotIndexes.map((index) {
|
||||
return TouchedSpotIndicatorData(
|
||||
const FlLine(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
FlDotData(
|
||||
show: true,
|
||||
getDotPainter: (spot, percent, barData, index) =>
|
||||
FlDotCirclePainter(
|
||||
radius: 3,
|
||||
color: Colors.white,
|
||||
strokeWidth: 3,
|
||||
strokeColor: TColor.secondaryColor1,
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
},
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: TColor.secondaryColor1,
|
||||
tooltipRoundedRadius: 20,
|
||||
getTooltipItems: (List<LineBarSpot> lineBarsSpot) {
|
||||
return lineBarsSpot.map((lineBarSpot) {
|
||||
return LineTooltipItem(
|
||||
"Seconde ${lineBarSpot.x.toInt() / 10} ",
|
||||
const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
},
|
||||
),
|
||||
),
|
||||
lineBarsData: lineBarsData1,
|
||||
minY: 0,
|
||||
maxY: 110,
|
||||
titlesData: FlTitlesData(
|
||||
show: true,
|
||||
leftTitles: const AxisTitles(),
|
||||
topTitles: const AxisTitles(),
|
||||
bottomTitles: const AxisTitles(),
|
||||
rightTitles: AxisTitles(
|
||||
sideTitles: rightTitles,
|
||||
)),
|
||||
gridData: FlGridData(
|
||||
show: true,
|
||||
drawHorizontalLine: true,
|
||||
horizontalInterval: 25,
|
||||
drawVerticalLine: false,
|
||||
getDrawingHorizontalLine: (value) {
|
||||
return FlLine(
|
||||
color: TColor.gray.withOpacity(0.15),
|
||||
strokeWidth: 2,
|
||||
);
|
||||
},
|
||||
),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: Border.all(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,213 @@
|
||||
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/modele/utile/home_view/data_home_view.dart';
|
||||
|
||||
class GraphBpmByTime extends StatefulWidget {
|
||||
final Size media;
|
||||
final DataHomeView data;
|
||||
|
||||
const GraphBpmByTime(this.media, this.data, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<GraphBpmByTime> createState() => _GraphBpmByTime();
|
||||
}
|
||||
|
||||
class _GraphBpmByTime extends State<GraphBpmByTime> {
|
||||
TextEditingController bpmController = TextEditingController();
|
||||
|
||||
// Il faut chercher à le suprimer
|
||||
List<int> showingTooltipOnSpots = [0];
|
||||
|
||||
List<LineChartBarData> get lineBarsData1 => [
|
||||
lineChartBarData1_1,
|
||||
lineChartBarData1_2,
|
||||
];
|
||||
|
||||
LineChartBarData get lineChartBarData1_1 => LineChartBarData(
|
||||
isCurved: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.primaryColor2.withOpacity(0.5),
|
||||
TColor.primaryColor1.withOpacity(0.5),
|
||||
]),
|
||||
barWidth: 4,
|
||||
isStrokeCapRound: true,
|
||||
dotData: const FlDotData(show: false),
|
||||
belowBarData: BarAreaData(show: false),
|
||||
spots: widget.data.vitesseSecondes,
|
||||
);
|
||||
|
||||
LineChartBarData get lineChartBarData1_2 => LineChartBarData(
|
||||
isCurved: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.secondaryColor2.withOpacity(0.5),
|
||||
TColor.secondaryColor1.withOpacity(0.5),
|
||||
]),
|
||||
barWidth: 2,
|
||||
isStrokeCapRound: true,
|
||||
dotData: const FlDotData(show: false),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
spots: widget.data.bpmSecondes2,
|
||||
);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Size media = MediaQuery.of(context).size;
|
||||
|
||||
final lineBarsData = [
|
||||
LineChartBarData(
|
||||
spots: widget.data.bpmSecondes,
|
||||
isCurved: false,
|
||||
barWidth: 2,
|
||||
belowBarData: BarAreaData(
|
||||
show: true,
|
||||
gradient: LinearGradient(colors: [
|
||||
TColor.secondaryColor1.withOpacity(0.4),
|
||||
TColor.secondaryColor2.withOpacity(0.1),
|
||||
], begin: Alignment.topCenter, end: Alignment.bottomCenter),
|
||||
),
|
||||
dotData: const FlDotData(show: false),
|
||||
gradient: LinearGradient(
|
||||
colors: TColor.secondaryG,
|
||||
),
|
||||
),
|
||||
];
|
||||
|
||||
final tooltipsOnBar = lineBarsData[0];
|
||||
|
||||
return ClipRRect(
|
||||
borderRadius: BorderRadius.circular(25),
|
||||
child: Container(
|
||||
height: media.height * 0.3,
|
||||
width: double.maxFinite,
|
||||
decoration: BoxDecoration(
|
||||
color: TColor.primaryColor2.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(25),
|
||||
),
|
||||
child: Stack(
|
||||
alignment: Alignment.topLeft,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Rythme cardiaque",
|
||||
style: TextStyle(
|
||||
color: TColor.black,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
TextField(
|
||||
controller: bpmController,
|
||||
readOnly: true,
|
||||
style: TextStyle(
|
||||
color: TColor.primaryColor1.withOpacity(0.8),
|
||||
fontWeight: FontWeight.w700,
|
||||
fontSize: 18),
|
||||
decoration: const InputDecoration(
|
||||
border: InputBorder
|
||||
.none, // Ajoutez cette ligne pour supprimer la bordure
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
LineChart(
|
||||
LineChartData(
|
||||
showingTooltipIndicators: showingTooltipOnSpots.map((index) {
|
||||
return ShowingTooltipIndicators([
|
||||
LineBarSpot(
|
||||
tooltipsOnBar,
|
||||
lineBarsData.indexOf(tooltipsOnBar),
|
||||
tooltipsOnBar.spots[index],
|
||||
),
|
||||
]);
|
||||
}).toList(),
|
||||
lineTouchData: LineTouchData(
|
||||
enabled: true,
|
||||
handleBuiltInTouches: false,
|
||||
touchCallback:
|
||||
(FlTouchEvent event, LineTouchResponse? response) {
|
||||
if (response == null || response.lineBarSpots == null) {
|
||||
return;
|
||||
}
|
||||
if (event is FlTapUpEvent) {
|
||||
final spotIndex = response.lineBarSpots!.first.spotIndex;
|
||||
showingTooltipOnSpots.clear();
|
||||
setState(() {
|
||||
showingTooltipOnSpots.add(spotIndex);
|
||||
});
|
||||
}
|
||||
},
|
||||
mouseCursorResolver:
|
||||
(FlTouchEvent event, LineTouchResponse? response) {
|
||||
if (response == null || response.lineBarSpots == null) {
|
||||
return SystemMouseCursors.basic;
|
||||
}
|
||||
return SystemMouseCursors.click;
|
||||
},
|
||||
getTouchedSpotIndicator:
|
||||
(LineChartBarData barData, List<int> spotIndexes) {
|
||||
return spotIndexes.map((index) {
|
||||
return TouchedSpotIndicatorData(
|
||||
FlLine(
|
||||
color: TColor.secondaryColor1,
|
||||
),
|
||||
FlDotData(
|
||||
show: true,
|
||||
getDotPainter: (spot, percent, barData, index) =>
|
||||
FlDotCirclePainter(
|
||||
radius: 3,
|
||||
color: Colors.white,
|
||||
strokeWidth: 3,
|
||||
strokeColor: TColor.secondaryColor1,
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
},
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: TColor.secondaryColor1,
|
||||
tooltipRoundedRadius: 20,
|
||||
getTooltipItems: (List<LineBarSpot> lineBarsSpot) {
|
||||
return lineBarsSpot.map((lineBarSpot) {
|
||||
bpmController.text = "${lineBarSpot.y} BPM";
|
||||
return LineTooltipItem(
|
||||
"Seconde ${lineBarSpot.x.toInt() / 10}",
|
||||
const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
},
|
||||
),
|
||||
),
|
||||
lineBarsData: lineBarsData,
|
||||
minY: 50,
|
||||
maxY: 250,
|
||||
titlesData: const FlTitlesData(
|
||||
show: false,
|
||||
),
|
||||
gridData: const FlGridData(show: false),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: Border.all(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:smartfit_app_mobile/view/home/notification_view.dart';
|
||||
|
||||
class EnteteHomeView extends StatelessWidget {
|
||||
const EnteteHomeView({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Bienvenue,",
|
||||
style: TextStyle(color: TColor.gray, fontSize: 12),
|
||||
),
|
||||
Text(
|
||||
"Benjelloun Othmane",
|
||||
style: TextStyle(
|
||||
color: TColor.black,
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
],
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => const NotificationView(),
|
||||
),
|
||||
);
|
||||
},
|
||||
icon: Image.asset(
|
||||
"assets/img/notification_active.png",
|
||||
width: 25,
|
||||
height: 25,
|
||||
fit: BoxFit.fitHeight,
|
||||
))
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
|
||||
import '../common/colo_extension.dart';
|
||||
import '../../common/colo_extension.dart';
|
||||
|
||||
class RoundTextField extends StatelessWidget {
|
||||
final TextEditingController? controller;
|
||||
@ -0,0 +1,11 @@
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
|
||||
class DataHomeView {
|
||||
late List<FlSpot> bpmSecondes;
|
||||
late List<FlSpot> bpmSecondes2;
|
||||
late List<FlSpot> vitesseSecondes;
|
||||
late List<FlSpot> altitudeSeconde;
|
||||
|
||||
DataHomeView(this.bpmSecondes, this.bpmSecondes2, this.vitesseSecondes,
|
||||
this.altitudeSeconde);
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
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/user.dart';
|
||||
import 'package:smartfit_app_mobile/modele/utile/home_view/data_home_view.dart';
|
||||
|
||||
class HomeViewUtil {
|
||||
DataHomeView initData(BuildContext context) {
|
||||
ActivityOfUser activity = Provider.of<User>(context).listActivity[0];
|
||||
|
||||
List<FlSpot> bpmSecondes = activity.getHeartRateWithTime();
|
||||
List<FlSpot> vitesseSecondes = activity.getSpeedWithTime();
|
||||
List<FlSpot> altitudeSeconde = activity.getAltitudeWithTime();
|
||||
|
||||
List<FlSpot> bpmSecondes2 = List.from(bpmSecondes);
|
||||
|
||||
return DataHomeView(bpmSecondes, normaliserDeuxiemeElement(bpmSecondes2),
|
||||
normaliserDeuxiemeElement(vitesseSecondes), altitudeSeconde);
|
||||
}
|
||||
|
||||
List<FlSpot> normaliserDeuxiemeElement(List<FlSpot> liste) {
|
||||
// Trouver le plus grand élément dans la liste
|
||||
double maxElement = 0.0;
|
||||
for (var spot in liste) {
|
||||
if (spot.y > maxElement) {
|
||||
maxElement = spot.y;
|
||||
}
|
||||
}
|
||||
// Calculer le facteur de normalisation
|
||||
double normalisationFactor = maxElement != 0.0 ? 100 / maxElement : 1.0;
|
||||
// Mettre à jour tous les éléments de la liste
|
||||
for (int i = 0; i < liste.length; i++) {
|
||||
liste[i] = FlSpot(liste[i].x, liste[i].y * normalisationFactor);
|
||||
}
|
||||
return liste;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:smartfit_app_mobile/modele/user.dart';
|
||||
|
||||
class MapUtil {
|
||||
Set<Polyline> initPolines(BuildContext context, int largueur, Color couleur) {
|
||||
Set<Polyline> _polylines = {};
|
||||
_polylines.add(Polyline(
|
||||
polylineId: const PolylineId("Polyline"),
|
||||
color: couleur,
|
||||
points: context.watch<User>().listActivity[0].getPosition(),
|
||||
width: largueur));
|
||||
return _polylines;
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/steps.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/graph.dart';
|
||||
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';
|
||||
@ -0,0 +1,151 @@
|
||||
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';
|
||||
|
||||
class MobileListActivity extends StatefulWidget {
|
||||
const MobileListActivity({super.key});
|
||||
|
||||
@override
|
||||
State<MobileListActivity> createState() => _MobileListActivity();
|
||||
}
|
||||
|
||||
class _MobileListActivity extends State<MobileListActivity> {
|
||||
FilePickerResult? result;
|
||||
IDataStrategy strategy = RequestApi();
|
||||
|
||||
Future<void> readFile(String nom) async {
|
||||
ManagerFile x = ManagerFile();
|
||||
PlatformFile t = result!.files.single;
|
||||
String? y = t.path;
|
||||
if (t.path == null) {
|
||||
print("t");
|
||||
} else {
|
||||
List<dynamic> result = await x.readFitFile(y!);
|
||||
print("test11");
|
||||
print(result);
|
||||
print("test22");
|
||||
print(ActivityOfUser(nom, result).getHeartRateWithTime());
|
||||
print("test33");
|
||||
Provider.of<User>(context, listen: false)
|
||||
.addActivity(ActivityOfUser(nom, result));
|
||||
//print(x.getDistanceWithTime(ActivityOfUser(result)));
|
||||
//print(x.getDistance(ActivityOfUser(result)));
|
||||
//print(x.getAltitudeWithTime(ActivityOfUser(result)));
|
||||
//print(x.getSpeedWithTime(ActivityOfUser(result)));
|
||||
}
|
||||
}
|
||||
|
||||
List lastWorkoutArr = [];
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var media = MediaQuery.of(context).size;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: TColor.white,
|
||||
body: SingleChildScrollView(
|
||||
child: SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 15),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 20),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"List Activités",
|
||||
style: TextStyle(
|
||||
color: TColor.black,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () async {
|
||||
result = await FilePicker.platform.pickFiles();
|
||||
if (result == null) {
|
||||
print("No file selected");
|
||||
} else {
|
||||
for (var element in result!.files) {
|
||||
readFile(element.name);
|
||||
print(element.name);
|
||||
}
|
||||
}
|
||||
},
|
||||
child: Text(
|
||||
"Ajouter",
|
||||
style: TextStyle(
|
||||
color: TColor.gray,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
Provider.of<User>(context, listen: true).listActivity.isEmpty
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 20),
|
||||
Text(
|
||||
"Vous n'avez pas d'activités pour le moment, veuillez en ajouter.",
|
||||
style: TextStyle(
|
||||
color: TColor.gray,
|
||||
fontSize: 11,
|
||||
fontStyle: FontStyle.italic,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
)
|
||||
])
|
||||
: ListView.builder(
|
||||
padding: EdgeInsets.zero,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
shrinkWrap: true,
|
||||
itemCount: Provider.of<User>(context, listen: true)
|
||||
.listActivity
|
||||
.length,
|
||||
itemBuilder: (context, index) {
|
||||
var activityObj =
|
||||
Provider.of<User>(context, listen: true)
|
||||
.listActivity[index] as ActivityOfUser;
|
||||
var activityMap = activityObj.toMap();
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
Provider.of<User>(context, listen: false)
|
||||
.insertActivity(0, activityObj);
|
||||
},
|
||||
child: WorkoutRow(
|
||||
wObj: activityMap,
|
||||
onDelete: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
},
|
||||
onClick: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
Provider.of<User>(context, listen: false)
|
||||
.insertActivity(0, activityObj);
|
||||
},
|
||||
));
|
||||
}),
|
||||
SizedBox(
|
||||
height: media.width * 0.1,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
import 'package:smartfit_app_mobile/common_widget/steps.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/graph.dart';
|
||||
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';
|
||||
@ -0,0 +1,163 @@
|
||||
import 'dart:convert';
|
||||
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: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/user.dart';
|
||||
import 'package:smartfit_app_mobile/common_widget/container/workout_row.dart';
|
||||
|
||||
class WebListActivity extends StatefulWidget {
|
||||
const WebListActivity({super.key});
|
||||
|
||||
@override
|
||||
State<WebListActivity> createState() => _WebListActivityState();
|
||||
}
|
||||
|
||||
class _WebListActivityState extends State<WebListActivity> {
|
||||
FilePickerResult? result;
|
||||
IDataStrategy strategy = RequestApi();
|
||||
|
||||
//late File x = File(file.path);
|
||||
List<String> parseFile(Uint8List bytes) {
|
||||
String csvString =
|
||||
utf8.decode(bytes); // Convertit les bytes en chaîne UTF-8
|
||||
List<String> lines =
|
||||
LineSplitter.split(csvString).toList(); // Sépare les lignes
|
||||
|
||||
for (String line in lines) {
|
||||
print(line); // Affiche chaque ligne du fichier
|
||||
}
|
||||
|
||||
return lines; // Ou retournez les lignes du fichier
|
||||
}
|
||||
|
||||
void readFile(html.File file) async {
|
||||
ManagerFile x = ManagerFile();
|
||||
final reader = html.FileReader();
|
||||
reader.readAsArrayBuffer(file);
|
||||
reader.onLoadEnd.listen((event) {
|
||||
if (reader.readyState == html.FileReader.DONE) {
|
||||
Uint8List bytes = reader.result as Uint8List;
|
||||
List<dynamic> result = x.readFitFileWeb(bytes);
|
||||
Provider.of<User>(context, listen: false)
|
||||
.addActivity(ActivityOfUser(file.name, result));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
List lastWorkoutArr = [];
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var media = MediaQuery.of(context).size;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: TColor.white,
|
||||
body: SingleChildScrollView(
|
||||
child: SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 15),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 20),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"List Activités",
|
||||
style: TextStyle(
|
||||
color: TColor.black,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () async {
|
||||
html.FileUploadInputElement uploadInput =
|
||||
html.FileUploadInputElement();
|
||||
uploadInput.click();
|
||||
|
||||
uploadInput.onChange.listen((e) {
|
||||
final files = uploadInput.files;
|
||||
if (files != null && files.isNotEmpty) {
|
||||
readFile(
|
||||
files[0]); // Lecture du fichier sélectionné
|
||||
}
|
||||
});
|
||||
},
|
||||
child: Text(
|
||||
"Ajouter",
|
||||
style: TextStyle(
|
||||
color: TColor.gray,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w700),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
Provider.of<User>(context, listen: true).listActivity.isEmpty
|
||||
? Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 20),
|
||||
Text(
|
||||
"Vous n'avez pas d'activités pour le moment, veuillez en ajouter.",
|
||||
style: TextStyle(
|
||||
color: TColor.gray,
|
||||
fontSize: 11,
|
||||
fontStyle: FontStyle.italic,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
)
|
||||
])
|
||||
: ListView.builder(
|
||||
padding: EdgeInsets.zero,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
shrinkWrap: true,
|
||||
itemCount: Provider.of<User>(context, listen: true)
|
||||
.listActivity
|
||||
.length,
|
||||
itemBuilder: (context, index) {
|
||||
var activityObj =
|
||||
Provider.of<User>(context, listen: true)
|
||||
.listActivity[index] as ActivityOfUser;
|
||||
var activityMap = activityObj.toMap();
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
Provider.of<User>(context, listen: false)
|
||||
.insertActivity(0, activityObj);
|
||||
},
|
||||
child: WorkoutRow(
|
||||
wObj: activityMap,
|
||||
onDelete: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
},
|
||||
onClick: () {
|
||||
Provider.of<User>(context, listen: false)
|
||||
.removeActivity(activityObj);
|
||||
Provider.of<User>(context, listen: false)
|
||||
.insertActivity(0, activityObj);
|
||||
},
|
||||
));
|
||||
}),
|
||||
SizedBox(
|
||||
height: media.width * 0.1,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,46 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:smartfit_app_mobile/modele/utile/maps/maps_utile.dart';
|
||||
|
||||
class MobileMyMaps extends StatefulWidget {
|
||||
const MobileMyMaps({super.key});
|
||||
|
||||
@override
|
||||
State<MobileMyMaps> createState() => _MobileMyMaps();
|
||||
}
|
||||
|
||||
class _MobileMyMaps extends State<MobileMyMaps> {
|
||||
final Completer<GoogleMapController> _googleMapController = Completer();
|
||||
CameraPosition? _cameraPosition;
|
||||
Set<Polyline> _polylines = {};
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_polylines = MapUtil().initPolines(context, 10, TColor.primaryColor1);
|
||||
_cameraPosition =
|
||||
CameraPosition(target: _polylines.first.points.first, zoom: 18);
|
||||
|
||||
return Scaffold(
|
||||
body: _getMap(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _getMap() {
|
||||
return Stack(
|
||||
children: [
|
||||
GoogleMap(
|
||||
initialCameraPosition: _cameraPosition!,
|
||||
mapType: MapType.normal,
|
||||
onMapCreated: (GoogleMapController controller) {
|
||||
if (!_googleMapController.isCompleted) {
|
||||
_googleMapController.complete(controller);
|
||||
}
|
||||
},
|
||||
polylines: _polylines,
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,154 +1,29 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:location/location.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:responsive_builder/responsive_builder.dart';
|
||||
import 'package:smartfit_app_mobile/modele/user.dart';
|
||||
import 'package:smartfit_app_mobile/view/map/mobile/mobile_my_map.dart';
|
||||
import 'package:smartfit_app_mobile/view/map/web/web_my_map.dart';
|
||||
import 'package:smartfit_app_mobile/view/profile/profile_view.dart';
|
||||
|
||||
class MyMap extends StatefulWidget {
|
||||
const MyMap({ Key? key }) : super(key: key);
|
||||
const MyMap({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<MyMap> createState() => _MyMapState();
|
||||
}
|
||||
|
||||
class _MyMapState extends State<MyMap> {
|
||||
|
||||
Completer<GoogleMapController> _googleMapController = Completer();
|
||||
CameraPosition? _cameraPosition;
|
||||
Location? _location;
|
||||
LocationData? _currentLocation;
|
||||
List<LatLng> _polylineCoordinates = [];
|
||||
Set<Polyline> _polylines = {};
|
||||
Set<Marker> _markers = {}; // Add a set to store markers
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
_init();
|
||||
super.initState();
|
||||
}
|
||||
|
||||
_init() async {
|
||||
_location = Location();
|
||||
_cameraPosition = CameraPosition(
|
||||
target: LatLng(0, 0), // this is just the example lat and lng for initializing
|
||||
zoom: 20
|
||||
);
|
||||
_initLocation();
|
||||
}
|
||||
|
||||
//function to listen when we move position
|
||||
_initLocation() {
|
||||
|
||||
_location?.getLocation().then((location) {
|
||||
_currentLocation = location;
|
||||
});
|
||||
|
||||
_location?.onLocationChanged.listen((newLocation) {
|
||||
setState(() {
|
||||
_currentLocation = newLocation;
|
||||
_polylineCoordinates.add(LatLng(
|
||||
_currentLocation?.latitude ?? 0,
|
||||
_currentLocation?.longitude ?? 0,
|
||||
));
|
||||
_updatePolyline();
|
||||
|
||||
});
|
||||
|
||||
moveToPosition(LatLng(_currentLocation?.latitude ?? 0,
|
||||
_currentLocation?.longitude ?? 0));
|
||||
});
|
||||
}
|
||||
|
||||
_updatePolyline() {
|
||||
setState(() {
|
||||
_polylines.clear();
|
||||
_polylines.add(Polyline(
|
||||
polylineId: PolylineId("polyline"),
|
||||
color: TColor.primaryColor1,
|
||||
points: _polylineCoordinates,
|
||||
width: 10,
|
||||
));
|
||||
});
|
||||
}
|
||||
|
||||
// Updated _updateMarker to use the custom marker
|
||||
_updateMarker(LatLng position) async {
|
||||
final markerId = MarkerId('marker');
|
||||
final marker = Marker(
|
||||
markerId: markerId,
|
||||
position: position
|
||||
);
|
||||
_markers.clear();
|
||||
_markers.add(marker);
|
||||
}
|
||||
|
||||
|
||||
moveToPosition(LatLng latLng) async {
|
||||
GoogleMapController mapController = await _googleMapController.future;
|
||||
mapController.animateCamera(
|
||||
CameraUpdate.newCameraPosition(
|
||||
CameraPosition(
|
||||
target: latLng,
|
||||
zoom: 15
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: _buildBody(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBody() {
|
||||
return _getMap();
|
||||
}
|
||||
|
||||
Widget _getMarker() {
|
||||
return Container(
|
||||
width: 25,
|
||||
height: 25,
|
||||
padding: EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.grey,
|
||||
offset: Offset(0,3),
|
||||
spreadRadius: 4,
|
||||
blurRadius: 6
|
||||
)
|
||||
]
|
||||
),
|
||||
child: ClipOval(child: Image.asset("assets/img/u1.png")),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _getMap() {
|
||||
return Stack(
|
||||
children: [
|
||||
GoogleMap(
|
||||
initialCameraPosition: _cameraPosition!,
|
||||
mapType: MapType.normal,
|
||||
onMapCreated: (GoogleMapController controller) {
|
||||
if (!_googleMapController.isCompleted) {
|
||||
_googleMapController.complete(controller);
|
||||
}
|
||||
},
|
||||
polylines: _polylines,
|
||||
markers: _markers,
|
||||
),
|
||||
Positioned.fill(
|
||||
child: Align(
|
||||
alignment: Alignment.center,
|
||||
child: _getMarker()
|
||||
return context.watch<User>().listActivity.isEmpty
|
||||
? ScreenTypeLayout.builder(
|
||||
mobile: (_) => const ProfileView(),
|
||||
desktop: (_) => const ProfileView(),
|
||||
)
|
||||
)
|
||||
],
|
||||
);
|
||||
: ScreenTypeLayout.builder(
|
||||
mobile: (_) => const MobileMyMaps(),
|
||||
desktop: (_) => const WebMyMaps(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
import 'package:smartfit_app_mobile/modele/utile/maps/maps_utile.dart';
|
||||
|
||||
class WebMyMaps extends StatefulWidget {
|
||||
const WebMyMaps({super.key});
|
||||
|
||||
@override
|
||||
State<WebMyMaps> createState() => _WebMyMaps();
|
||||
}
|
||||
|
||||
class _WebMyMaps extends State<WebMyMaps> {
|
||||
final Completer<GoogleMapController> _googleMapController = Completer();
|
||||
CameraPosition? _cameraPosition;
|
||||
Set<Polyline> _polylines = {};
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_polylines = MapUtil().initPolines(context, 10, TColor.primaryColor1);
|
||||
_cameraPosition =
|
||||
CameraPosition(target: _polylines.first.points.first, zoom: 18);
|
||||
|
||||
return Scaffold(
|
||||
body: _getMap(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _getMap() {
|
||||
return Stack(
|
||||
children: [
|
||||
GoogleMap(
|
||||
initialCameraPosition: _cameraPosition!,
|
||||
mapType: MapType.normal,
|
||||
onMapCreated: (GoogleMapController controller) {
|
||||
if (!_googleMapController.isCompleted) {
|
||||
_googleMapController.complete(controller);
|
||||
}
|
||||
},
|
||||
polylines: _polylines,
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,131 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:location/location.dart';
|
||||
import 'package:smartfit_app_mobile/common/colo_extension.dart';
|
||||
|
||||
class MobileMyMaps extends StatefulWidget {
|
||||
const MobileMyMaps({super.key});
|
||||
|
||||
@override
|
||||
State<MobileMyMaps> createState() => _MobileMyMaps();
|
||||
}
|
||||
|
||||
class _MobileMyMaps extends State<MobileMyMaps> {
|
||||
Completer<GoogleMapController> _googleMapController = Completer();
|
||||
CameraPosition? _cameraPosition;
|
||||
Location? _location;
|
||||
LocationData? _currentLocation;
|
||||
List<LatLng> _polylineCoordinates = [];
|
||||
Set<Polyline> _polylines = {};
|
||||
Set<Marker> _markers = {}; // Add a set to store markers
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
_init();
|
||||
super.initState();
|
||||
}
|
||||
|
||||
_init() async {
|
||||
_location = Location();
|
||||
_cameraPosition = const CameraPosition(
|
||||
target: LatLng(
|
||||
0, 0), // this is just the example lat and lng for initializing
|
||||
zoom: 20);
|
||||
_initLocation();
|
||||
}
|
||||
|
||||
//function to listen when we move position
|
||||
_initLocation() {
|
||||
_location?.getLocation().then((location) {
|
||||
_currentLocation = location;
|
||||
});
|
||||
|
||||
_location?.onLocationChanged.listen((newLocation) {
|
||||
setState(() {
|
||||
_currentLocation = newLocation;
|
||||
_polylineCoordinates.add(LatLng(
|
||||
_currentLocation?.latitude ?? 0,
|
||||
_currentLocation?.longitude ?? 0,
|
||||
));
|
||||
_updatePolyline();
|
||||
});
|
||||
|
||||
moveToPosition(LatLng(
|
||||
_currentLocation?.latitude ?? 0, _currentLocation?.longitude ?? 0));
|
||||
});
|
||||
}
|
||||
|
||||
_updatePolyline() {
|
||||
setState(() {
|
||||
_polylines.clear();
|
||||
_polylines.add(Polyline(
|
||||
polylineId: PolylineId("polyline"),
|
||||
color: TColor.primaryColor1,
|
||||
points: _polylineCoordinates,
|
||||
width: 10,
|
||||
));
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
// Updated _updateMarker to use the custom marker
|
||||
_updateMarker(LatLng position) async {
|
||||
final markerId = MarkerId('marker');
|
||||
final marker = Marker(markerId: markerId, position: position);
|
||||
_markers.clear();
|
||||
_markers.add(marker);
|
||||
}*/
|
||||
|
||||
moveToPosition(LatLng latLng) async {
|
||||
GoogleMapController mapController = await _googleMapController.future;
|
||||
mapController.animateCamera(CameraUpdate.newCameraPosition(
|
||||
CameraPosition(target: latLng, zoom: 15)));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: _getMap(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _getMarker() {
|
||||
return Container(
|
||||
width: 25,
|
||||
height: 25,
|
||||
padding: EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.grey,
|
||||
offset: Offset(0, 3),
|
||||
spreadRadius: 4,
|
||||
blurRadius: 6)
|
||||
]),
|
||||
child: ClipOval(child: Image.asset("assets/img/u1.png")),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _getMap() {
|
||||
return Stack(
|
||||
children: [
|
||||
GoogleMap(
|
||||
initialCameraPosition: _cameraPosition!,
|
||||
mapType: MapType.normal,
|
||||
onMapCreated: (GoogleMapController controller) {
|
||||
if (!_googleMapController.isCompleted) {
|
||||
_googleMapController.complete(controller);
|
||||
}
|
||||
},
|
||||
polylines: _polylines,
|
||||
markers: _markers,
|
||||
),
|
||||
Positioned.fill(
|
||||
child: Align(alignment: Alignment.center, child: _getMarker()))
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue