SmartFit
/
SmartFit_Mobile
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Enzo

Browse Source
pull/4/head
Enzo 1 year ago
parent 38fdb6d4e8 407664c1d5
commit ed66e21aff
15 changed files with 27 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
.drone.yml
Unescape View File

@ -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 ]

12
lib/common_widget/graph/altitude_by_time.dart
Unescape View File

@ -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<GraphAltitudeByTime> {
@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),
);
}
}
}

10
lib/common_widget/graph/bpm_and_speed_by_time.dart
Unescape View File

@ -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<GraphBpmAndSpeedByTime> {
@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),
);
}
}
}

2
lib/common_widget/graph/mobile/mobile_bpm_and_speed_by_time.dart
Unescape View File

@ -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 {

2
lib/common_widget/graph/mobile/mobile_bpm_by_time.dart
Unescape View File

@ -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 {

2
lib/common_widget/graph/web/web_bpm_and_speed_by_time.dart
Unescape View File

@ -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 {

2
lib/common_widget/graph/web/web_bpm_by_time.dart
Unescape View File

@ -24,7 +24,7 @@ class _WebBpmByTime extends State<WebBpmByTime> {
context.watch<User>().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,

10
lib/common_widget/info.dart
Unescape View File

@ -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,
),

2
lib/modele/utile/home_view/home_view_util.dart
Unescape View File

@ -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';

6
lib/modele/utile/maps/maps_utile.dart
Unescape View File

@ -5,12 +5,12 @@ 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(
Set<Polyline> polylines = {};
polylines.add(Polyline(
polylineId: const PolylineId("Polyline"),
color: couleur,
points: context.watch<User>().managerSelectedActivity.getPosition(),
width: largueur));
return _polylines;
return polylines;
}
}

11
lib/view/main_tab/main_tab_view.dart
Unescape View File

@ -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<MainTabView> {
@override
@override
Widget build(BuildContext context) {
return ScreenTypeLayout.builder(
mobile: (_) => const MobileMainTabView(),
desktop: (_) => const WebMainTabView(),
);
}
}
}

60
lib/view/main_tab/select_view.dart
Unescape View File

@ -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(),
),
);
})
],
),
),
);
}
}
*/

7
lib/view/profile/change_password.dart
Unescape View File

@ -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<ChangePasswordView> {
@override
@override
Widget build(BuildContext context) {
return ScreenTypeLayout.builder(
mobile: (_) => const MobileChangePasswordView(),

7
lib/view/profile/change_username.dart
Unescape View File

@ -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<ChangeUsernameView> {
@override
@override
Widget build(BuildContext context) {
return ScreenTypeLayout.builder(
mobile: (_) => const MobileChangeUsernameView(),

17
lib/view/test/page_test.dart
Unescape View File

@ -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<String> get _localPath async {
final directory = await getApplicationDocumentsDirectory();
return directory.path;
//final directory = await getApplicationDocumentsDirectory();
//return directory.path;
return "PATH";
}
// Uri du fichier
@ -81,11 +79,9 @@ class _TestPage extends State<TestPage> {
FilePickerResult? result;
IDataStrategy strategy = RequestApi();
String platforme = getPlatforme();
final ManagerFile _managerFile = ManagerFile();
//late File x = File(file.path);
Future<void> readFile() async {
ManagerFile x = ManagerFile();
PlatformFile t = result!.files.single;
String? y = t.path;
if (t.path == null) {
@ -169,7 +165,7 @@ class _TestPage extends State<TestPage> {
}
csvData.insert(0, enteteCSV);
final csv = const ListToCsvConverter().convert(csvData);
//final csv = const ListToCsvConverter().convert(csvData);
//await outFile.writeAsString(csv);
// ------- FIN --------------- //
@ -261,7 +257,6 @@ class _TestPage extends State<TestPage> {
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);
@ -307,9 +302,7 @@ class _TestPage extends State<TestPage> {
if (result == null) {
print("No file selected");
} else {
for (var element in result!.files) {
readFile();
}
readFile();
}
},
child: const Text("File - ")),

Write Preview
Loading…
Cancel
Save