diff --git a/lib/Modele/manager_file.dart b/lib/Modele/manager_file.dart index babd950..b06ce01 100644 --- a/lib/Modele/manager_file.dart +++ b/lib/Modele/manager_file.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:ffi'; import 'dart:io'; import 'package:csv/csv.dart'; import 'package:fit_tool/fit_tool.dart'; diff --git a/lib/View/activity/activity.dart b/lib/View/activity/activity.dart index 8f46e03..db26c3f 100644 --- a/lib/View/activity/activity.dart +++ b/lib/View/activity/activity.dart @@ -1,5 +1,4 @@ import 'package:smartfit_app_mobile/common_widget/steps.dart'; -import 'package:smartfit_app_mobile/common_widget/dates.dart'; import 'package:smartfit_app_mobile/common_widget/graph.dart'; import 'package:smartfit_app_mobile/common_widget/info.dart' hide Stats; import 'package:smartfit_app_mobile/common_widget/stats.dart'; @@ -25,4 +24,4 @@ class Activity extends StatelessWidget { ), ); } -} \ No newline at end of file +} diff --git a/lib/View/home/activity_tracker.dart b/lib/View/home/activity_tracker.dart index d87d351..ad5abdd 100644 --- a/lib/View/home/activity_tracker.dart +++ b/lib/View/home/activity_tracker.dart @@ -2,7 +2,6 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; import '../../common/colo_extension.dart'; -import '../../common_widget/latest_activity_row.dart'; import '../../common_widget/today_target_cell.dart'; class ActivityTrackerView extends StatefulWidget { @@ -13,7 +12,7 @@ class ActivityTrackerView extends StatefulWidget { } class _ActivityTrackerViewState extends State { - int touchedIndex = -1; + int touchedIndex = -1; List latestArr = [ { @@ -209,23 +208,20 @@ class _ActivityTrackerViewState extends State { )), ], ), - SizedBox( height: media.width * 0.05, ), - Container( height: media.width * 0.5, - padding: const EdgeInsets.symmetric(vertical: 15 , horizontal: 0), + padding: + const EdgeInsets.symmetric(vertical: 15, horizontal: 0), decoration: BoxDecoration( color: TColor.white, borderRadius: BorderRadius.circular(15), boxShadow: const [ BoxShadow(color: Colors.black12, blurRadius: 3) ]), - child: BarChart( - - BarChartData( + child: BarChart(BarChartData( barTouchData: BarTouchData( touchTooltipData: BarTouchTooltipData( tooltipBgColor: Colors.grey, @@ -293,10 +289,10 @@ class _ActivityTrackerViewState extends State { ), titlesData: FlTitlesData( show: true, - rightTitles: AxisTitles( + rightTitles: AxisTitles( sideTitles: SideTitles(showTitles: false), ), - topTitles: AxisTitles( + topTitles: AxisTitles( sideTitles: SideTitles(showTitles: false), ), bottomTitles: AxisTitles( @@ -306,7 +302,7 @@ class _ActivityTrackerViewState extends State { reservedSize: 38, ), ), - leftTitles: AxisTitles( + leftTitles: AxisTitles( sideTitles: SideTitles( showTitles: false, ), @@ -316,16 +312,12 @@ class _ActivityTrackerViewState extends State { show: false, ), barGroups: showingGroups(), - gridData: FlGridData(show: false), - ) - - ), + gridData: FlGridData(show: false), + )), ), - SizedBox( height: media.width * 0.05, ), - SizedBox( height: media.width * 0.1, ), @@ -345,28 +337,28 @@ class _ActivityTrackerViewState extends State { Widget text; switch (value.toInt()) { case 0: - text = Text('Dim', style: style); + text = Text('Dim', style: style); break; case 1: - text = Text('Lun', style: style); + text = Text('Lun', style: style); break; case 2: - text = Text('Mar', style: style); + text = Text('Mar', style: style); break; case 3: - text = Text('Mer', style: style); + text = Text('Mer', style: style); break; case 4: - text = Text('Jeu', style: style); + text = Text('Jeu', style: style); break; case 5: - text = Text('Ven', style: style); + text = Text('Ven', style: style); break; case 6: - text = Text('Sam', style: style); + text = Text('Sam', style: style); break; default: - text = Text('', style: style); + text = Text('', style: style); break; } return SideTitleWidget( @@ -375,44 +367,52 @@ class _ActivityTrackerViewState extends State { child: text, ); } - List showingGroups() => List.generate(7, (i) { + + List showingGroups() => List.generate(7, (i) { switch (i) { case 0: - return makeGroupData(0, 5, TColor.primaryG , isTouched: i == touchedIndex); + return makeGroupData(0, 5, TColor.primaryG, + isTouched: i == touchedIndex); case 1: - return makeGroupData(1, 10.5, TColor.secondaryG, isTouched: i == touchedIndex); + return makeGroupData(1, 10.5, TColor.secondaryG, + isTouched: i == touchedIndex); case 2: - return makeGroupData(2, 5, TColor.primaryG , isTouched: i == touchedIndex); + return makeGroupData(2, 5, TColor.primaryG, + isTouched: i == touchedIndex); case 3: - return makeGroupData(3, 7.5, TColor.secondaryG, isTouched: i == touchedIndex); + return makeGroupData(3, 7.5, TColor.secondaryG, + isTouched: i == touchedIndex); case 4: - return makeGroupData(4, 15, TColor.primaryG , isTouched: i == touchedIndex); + return makeGroupData(4, 15, TColor.primaryG, + isTouched: i == touchedIndex); case 5: - return makeGroupData(5, 5.5, TColor.secondaryG, isTouched: i == touchedIndex); + return makeGroupData(5, 5.5, TColor.secondaryG, + isTouched: i == touchedIndex); case 6: - return makeGroupData(6, 8.5, TColor.primaryG , isTouched: i == touchedIndex); + return makeGroupData(6, 8.5, TColor.primaryG, + isTouched: i == touchedIndex); default: return throw Error(); } }); - BarChartGroupData makeGroupData( + BarChartGroupData makeGroupData( int x, double y, - List barColor, - { + List barColor, { bool isTouched = false, - double width = 22, List showTooltips = const [], }) { - return BarChartGroupData( x: x, barRods: [ BarChartRodData( toY: isTouched ? y + 1 : y, - gradient: LinearGradient(colors: barColor, begin: Alignment.topCenter, end: Alignment.bottomCenter ), + gradient: LinearGradient( + colors: barColor, + begin: Alignment.topCenter, + end: Alignment.bottomCenter), width: width, borderSide: isTouched ? const BorderSide(color: Colors.green) @@ -427,5 +427,4 @@ class _ActivityTrackerViewState extends State { showingTooltipIndicators: showTooltips, ); } - -} \ No newline at end of file +} diff --git a/lib/View/home/home_view.dart b/lib/View/home/home_view.dart index 069099b..ea65d98 100644 --- a/lib/View/home/home_view.dart +++ b/lib/View/home/home_view.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:simple_animation_progress_bar/simple_animation_progress_bar.dart'; import 'package:simple_circular_progress_bar/simple_circular_progress_bar.dart'; import 'package:smartfit_app_mobile/view/home/activity_tracker.dart'; -import 'package:smartfit_app_mobile/view/home/blank_view.dart'; import 'package:smartfit_app_mobile/view/home/notification_view.dart'; import '../../common/colo_extension.dart'; //import 'activity_tracker_view.dart'; diff --git a/lib/View/login/signup_view.dart b/lib/View/login/signup_view.dart index 0efce72..8df0c9c 100644 --- a/lib/View/login/signup_view.dart +++ b/lib/View/login/signup_view.dart @@ -2,9 +2,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/round_button.dart'; import 'package:smartfit_app_mobile/common_widget/round_text_field.dart'; -import 'package:smartfit_app_mobile/view/home/home_view.dart'; //import 'package:smartfit_app_mobile/view/login/complete_profile_view.dart'; -import 'package:smartfit_app_mobile/view/login/login_view.dart'; import 'package:flutter/material.dart'; import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart'; @@ -101,11 +99,10 @@ class _SignUpViewState extends State { ), Padding( padding: const EdgeInsets.only(top: 8), - child: Text( - "En continuant, vous acceptez notre Politique de\nconfidentialité et nos Conditions d'utilisation.", - style: TextStyle(color: TColor.gray, fontSize: 10), - ), - + child: Text( + "En continuant, vous acceptez notre Politique de\nconfidentialité et nos Conditions d'utilisation.", + style: TextStyle(color: TColor.gray, fontSize: 10), + ), ) ], ), @@ -162,11 +159,9 @@ class _SignUpViewState extends State { ), ), ), - - SizedBox( + SizedBox( width: media.width * 0.04, ), - GestureDetector( onTap: () {}, child: Container( @@ -195,10 +190,10 @@ class _SignUpViewState extends State { ), TextButton( onPressed: () { - Navigator.push( - context, + Navigator.push( + context, MaterialPageRoute( - builder: (context) => const MainTabView())); + builder: (context) => const MainTabView())); }, child: Row( mainAxisSize: MainAxisSize.min, @@ -230,4 +225,4 @@ class _SignUpViewState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/View/main_tab/main_tab_view.dart b/lib/View/main_tab/main_tab_view.dart index 41c2386..85e45f1 100644 --- a/lib/View/main_tab/main_tab_view.dart +++ b/lib/View/main_tab/main_tab_view.dart @@ -1,16 +1,12 @@ import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common_widget/tab_button.dart'; import 'package:smartfit_app_mobile/view/activity/activity.dart'; -import 'package:smartfit_app_mobile/view/home/blank_view.dart'; import 'package:smartfit_app_mobile/view/home/home_view.dart'; -import 'package:smartfit_app_mobile/view/main_tab/select_view.dart'; import 'package:flutter/material.dart'; import 'package:smartfit_app_mobile/view/map/my_map.dart'; import 'package:smartfit_app_mobile/view/page_test.dart'; import 'package:smartfit_app_mobile/view/profile/profile_view.dart'; - - class MainTabView extends StatefulWidget { const MainTabView({super.key}); @@ -20,7 +16,7 @@ class MainTabView extends StatefulWidget { class _MainTabViewState extends State { int selectTab = 0; - final PageStorageBucket pageBucket = PageStorageBucket(); + final PageStorageBucket pageBucket = PageStorageBucket(); Widget currentTab = const HomeView(); @override Widget build(BuildContext context) { @@ -34,10 +30,10 @@ class _MainTabViewState extends State { child: InkWell( onTap: () { selectTab = 0; - currentTab = const TestPage(); - if (mounted) { - setState(() {}); - } + currentTab = const TestPage(); + if (mounted) { + setState(() {}); + } }, child: Container( width: 65, @@ -49,10 +45,15 @@ class _MainTabViewState extends State { borderRadius: BorderRadius.circular(35), boxShadow: const [ BoxShadow( - color: Colors.black12, - blurRadius: 2,) + color: Colors.black12, + blurRadius: 2, + ) ]), - child: Icon(Icons.search,color: TColor.white, size: 35, ), + child: Icon( + Icons.search, + color: TColor.white, + size: 35, + ), ), ), ), @@ -87,15 +88,16 @@ class _MainTabViewState extends State { setState(() {}); } }), - - const SizedBox(width: 40,), + const SizedBox( + width: 40, + ), TabButton( icon: "assets/img/Camera_tab.svg", selectIcon: "assets/img/Camera_tab_select.svg", isActive: selectTab == 2, onTap: () { selectTab = 2; - currentTab = const MyMap(); + currentTab = const MyMap(); if (mounted) { setState(() {}); } @@ -106,16 +108,14 @@ class _MainTabViewState extends State { isActive: selectTab == 3, onTap: () { selectTab = 3; - currentTab = const ProfileView(); + currentTab = const ProfileView(); if (mounted) { setState(() {}); } }) - - ], ), )), ); } -} \ No newline at end of file +} diff --git a/lib/main.dart b/lib/main.dart index 4aaa768..408ec98 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:smartfit_app_mobile/Modele/user.dart'; import 'package:smartfit_app_mobile/View/on_boarding/started_view.dart'; -import 'package:smartfit_app_mobile/View/page_test.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart'; void main() {