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

petit menage

Browse Source
pull/1/head
Enzo 2 years ago
parent 8533c7d503
commit 2111345ce4
7 changed files with 69 additions and 79 deletions
Show Stats Download Patch File Download Diff File

1
lib/Modele/manager_file.dart
Unescape View File

@ -1,5 +1,4 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:ffi';
import 'dart:io'; import 'dart:io';
import 'package:csv/csv.dart'; import 'package:csv/csv.dart';
import 'package:fit_tool/fit_tool.dart'; import 'package:fit_tool/fit_tool.dart';

1
lib/View/activity/activity.dart
Unescape View File

@ -1,5 +1,4 @@
import 'package:smartfit_app_mobile/common_widget/steps.dart'; 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/graph.dart';
import 'package:smartfit_app_mobile/common_widget/info.dart' hide Stats; import 'package:smartfit_app_mobile/common_widget/info.dart' hide Stats;
import 'package:smartfit_app_mobile/common_widget/stats.dart'; import 'package:smartfit_app_mobile/common_widget/stats.dart';

79
lib/View/home/activity_tracker.dart
Unescape View File

@ -2,7 +2,6 @@ import 'package:fl_chart/fl_chart.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../common/colo_extension.dart'; import '../../common/colo_extension.dart';
import '../../common_widget/latest_activity_row.dart';
import '../../common_widget/today_target_cell.dart'; import '../../common_widget/today_target_cell.dart';
class ActivityTrackerView extends StatefulWidget { class ActivityTrackerView extends StatefulWidget {
@ -13,7 +12,7 @@ class ActivityTrackerView extends StatefulWidget {
} }
class _ActivityTrackerViewState extends State<ActivityTrackerView> { class _ActivityTrackerViewState extends State<ActivityTrackerView> {
int touchedIndex = -1; int touchedIndex = -1;
List latestArr = [ List latestArr = [
{ {
@ -209,23 +208,20 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
)), )),
], ],
), ),
SizedBox( SizedBox(
height: media.width * 0.05, height: media.width * 0.05,
), ),
Container( Container(
height: media.width * 0.5, height: media.width * 0.5,
padding: const EdgeInsets.symmetric(vertical: 15 , horizontal: 0), padding:
const EdgeInsets.symmetric(vertical: 15, horizontal: 0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: TColor.white, color: TColor.white,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
boxShadow: const [ boxShadow: const [
BoxShadow(color: Colors.black12, blurRadius: 3) BoxShadow(color: Colors.black12, blurRadius: 3)
]), ]),
child: BarChart( child: BarChart(BarChartData(
BarChartData(
barTouchData: BarTouchData( barTouchData: BarTouchData(
touchTooltipData: BarTouchTooltipData( touchTooltipData: BarTouchTooltipData(
tooltipBgColor: Colors.grey, tooltipBgColor: Colors.grey,
@ -293,10 +289,10 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
), ),
titlesData: FlTitlesData( titlesData: FlTitlesData(
show: true, show: true,
rightTitles: AxisTitles( rightTitles: AxisTitles(
sideTitles: SideTitles(showTitles: false), sideTitles: SideTitles(showTitles: false),
), ),
topTitles: AxisTitles( topTitles: AxisTitles(
sideTitles: SideTitles(showTitles: false), sideTitles: SideTitles(showTitles: false),
), ),
bottomTitles: AxisTitles( bottomTitles: AxisTitles(
@ -306,7 +302,7 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
reservedSize: 38, reservedSize: 38,
), ),
), ),
leftTitles: AxisTitles( leftTitles: AxisTitles(
sideTitles: SideTitles( sideTitles: SideTitles(
showTitles: false, showTitles: false,
), ),
@ -316,16 +312,12 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
show: false, show: false,
), ),
barGroups: showingGroups(), barGroups: showingGroups(),
gridData: FlGridData(show: false), gridData: FlGridData(show: false),
) )),
),
), ),
SizedBox( SizedBox(
height: media.width * 0.05, height: media.width * 0.05,
), ),
SizedBox( SizedBox(
height: media.width * 0.1, height: media.width * 0.1,
), ),
@ -345,28 +337,28 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
Widget text; Widget text;
switch (value.toInt()) { switch (value.toInt()) {
case 0: case 0:
text = Text('Dim', style: style); text = Text('Dim', style: style);
break; break;
case 1: case 1:
text = Text('Lun', style: style); text = Text('Lun', style: style);
break; break;
case 2: case 2:
text = Text('Mar', style: style); text = Text('Mar', style: style);
break; break;
case 3: case 3:
text = Text('Mer', style: style); text = Text('Mer', style: style);
break; break;
case 4: case 4:
text = Text('Jeu', style: style); text = Text('Jeu', style: style);
break; break;
case 5: case 5:
text = Text('Ven', style: style); text = Text('Ven', style: style);
break; break;
case 6: case 6:
text = Text('Sam', style: style); text = Text('Sam', style: style);
break; break;
default: default:
text = Text('', style: style); text = Text('', style: style);
break; break;
} }
return SideTitleWidget( return SideTitleWidget(
@ -375,44 +367,52 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
child: text, child: text,
); );
} }
List<BarChartGroupData> showingGroups() => List.generate(7, (i) {
List<BarChartGroupData> showingGroups() => List.generate(7, (i) {
switch (i) { switch (i) {
case 0: case 0:
return makeGroupData(0, 5, TColor.primaryG , isTouched: i == touchedIndex); return makeGroupData(0, 5, TColor.primaryG,
isTouched: i == touchedIndex);
case 1: case 1:
return makeGroupData(1, 10.5, TColor.secondaryG, isTouched: i == touchedIndex); return makeGroupData(1, 10.5, TColor.secondaryG,
isTouched: i == touchedIndex);
case 2: case 2:
return makeGroupData(2, 5, TColor.primaryG , isTouched: i == touchedIndex); return makeGroupData(2, 5, TColor.primaryG,
isTouched: i == touchedIndex);
case 3: case 3:
return makeGroupData(3, 7.5, TColor.secondaryG, isTouched: i == touchedIndex); return makeGroupData(3, 7.5, TColor.secondaryG,
isTouched: i == touchedIndex);
case 4: case 4:
return makeGroupData(4, 15, TColor.primaryG , isTouched: i == touchedIndex); return makeGroupData(4, 15, TColor.primaryG,
isTouched: i == touchedIndex);
case 5: case 5:
return makeGroupData(5, 5.5, TColor.secondaryG, isTouched: i == touchedIndex); return makeGroupData(5, 5.5, TColor.secondaryG,
isTouched: i == touchedIndex);
case 6: case 6:
return makeGroupData(6, 8.5, TColor.primaryG , isTouched: i == touchedIndex); return makeGroupData(6, 8.5, TColor.primaryG,
isTouched: i == touchedIndex);
default: default:
return throw Error(); return throw Error();
} }
}); });
BarChartGroupData makeGroupData( BarChartGroupData makeGroupData(
int x, int x,
double y, double y,
List<Color> barColor, List<Color> barColor, {
{
bool isTouched = false, bool isTouched = false,
double width = 22, double width = 22,
List<int> showTooltips = const [], List<int> showTooltips = const [],
}) { }) {
return BarChartGroupData( return BarChartGroupData(
x: x, x: x,
barRods: [ barRods: [
BarChartRodData( BarChartRodData(
toY: isTouched ? y + 1 : y, 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, width: width,
borderSide: isTouched borderSide: isTouched
? const BorderSide(color: Colors.green) ? const BorderSide(color: Colors.green)
@ -427,5 +427,4 @@ class _ActivityTrackerViewState extends State<ActivityTrackerView> {
showingTooltipIndicators: showTooltips, showingTooltipIndicators: showTooltips,
); );
} }
} }

1
lib/View/home/home_view.dart
Unescape View File

@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
import 'package:simple_animation_progress_bar/simple_animation_progress_bar.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: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/activity_tracker.dart';
import 'package:smartfit_app_mobile/view/home/blank_view.dart';
import 'package:smartfit_app_mobile/view/home/notification_view.dart'; import 'package:smartfit_app_mobile/view/home/notification_view.dart';
import '../../common/colo_extension.dart'; import '../../common/colo_extension.dart';
//import 'activity_tracker_view.dart'; //import 'activity_tracker_view.dart';

21
lib/View/login/signup_view.dart
Unescape View File

@ -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/colo_extension.dart';
import 'package:smartfit_app_mobile/common_widget/round_button.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/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/complete_profile_view.dart';
import 'package:smartfit_app_mobile/view/login/login_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart'; import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart';
@ -101,11 +99,10 @@ class _SignUpViewState extends State<SignUpView> {
), ),
Padding( Padding(
padding: const EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: Text( child: Text(
"En continuant, vous acceptez notre Politique de\nconfidentialité et nos Conditions d'utilisation.", "En continuant, vous acceptez notre Politique de\nconfidentialité et nos Conditions d'utilisation.",
style: TextStyle(color: TColor.gray, fontSize: 10), style: TextStyle(color: TColor.gray, fontSize: 10),
), ),
) )
], ],
), ),
@ -162,11 +159,9 @@ class _SignUpViewState extends State<SignUpView> {
), ),
), ),
), ),
SizedBox(
SizedBox(
width: media.width * 0.04, width: media.width * 0.04,
), ),
GestureDetector( GestureDetector(
onTap: () {}, onTap: () {},
child: Container( child: Container(
@ -195,10 +190,10 @@ class _SignUpViewState extends State<SignUpView> {
), ),
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => const MainTabView())); builder: (context) => const MainTabView()));
}, },
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

34
lib/View/main_tab/main_tab_view.dart
Unescape View File

@ -1,16 +1,12 @@
import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart';
import 'package:smartfit_app_mobile/common_widget/tab_button.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/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/home/home_view.dart';
import 'package:smartfit_app_mobile/view/main_tab/select_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:smartfit_app_mobile/view/map/my_map.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/page_test.dart';
import 'package:smartfit_app_mobile/view/profile/profile_view.dart'; import 'package:smartfit_app_mobile/view/profile/profile_view.dart';
class MainTabView extends StatefulWidget { class MainTabView extends StatefulWidget {
const MainTabView({super.key}); const MainTabView({super.key});
@ -34,10 +30,10 @@ class _MainTabViewState extends State<MainTabView> {
child: InkWell( child: InkWell(
onTap: () { onTap: () {
selectTab = 0; selectTab = 0;
currentTab = const TestPage(); currentTab = const TestPage();
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
}, },
child: Container( child: Container(
width: 65, width: 65,
@ -49,10 +45,15 @@ class _MainTabViewState extends State<MainTabView> {
borderRadius: BorderRadius.circular(35), borderRadius: BorderRadius.circular(35),
boxShadow: const [ boxShadow: const [
BoxShadow( BoxShadow(
color: Colors.black12, color: Colors.black12,
blurRadius: 2,) 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<MainTabView> {
setState(() {}); setState(() {});
} }
}), }),
const SizedBox(
const SizedBox(width: 40,), width: 40,
),
TabButton( TabButton(
icon: "assets/img/Camera_tab.svg", icon: "assets/img/Camera_tab.svg",
selectIcon: "assets/img/Camera_tab_select.svg", selectIcon: "assets/img/Camera_tab_select.svg",
isActive: selectTab == 2, isActive: selectTab == 2,
onTap: () { onTap: () {
selectTab = 2; selectTab = 2;
currentTab = const MyMap(); currentTab = const MyMap();
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
@ -106,13 +108,11 @@ class _MainTabViewState extends State<MainTabView> {
isActive: selectTab == 3, isActive: selectTab == 3,
onTap: () { onTap: () {
selectTab = 3; selectTab = 3;
currentTab = const ProfileView(); currentTab = const ProfileView();
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
}) })
], ],
), ),
)), )),

1
lib/main.dart
Unescape View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:smartfit_app_mobile/Modele/user.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/on_boarding/started_view.dart';
import 'package:smartfit_app_mobile/View/page_test.dart';
import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart';
void main() { void main() {

Write Preview
Loading…
Cancel
Save