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

Merge remote-tracking branch 'origin/master' into offline

Browse Source
pull/7/head
remrem 1 year ago
parent 7fc300c050 1eb9d648e9
commit 89652ae23b
10 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
IA/categoryByData.py
Unescape View File

@ -5,7 +5,7 @@ from sklearn.model_selection import train_test_split
from sklearn.linear_model import LinearRegression
# Load data from CSV
df = pd.read_csv("data\\data_emple.csv")
df = pd.read_csv("data//data_emple.csv")
category = df.iloc[0:len(df),0].values

2
IA/distanceByTime.py
Unescape View File

@ -3,7 +3,7 @@ import numpy as np
import matplotlib.pyplot as plt
from sklearn.linear_model import LinearRegression
from sklearn.model_selection import train_test_split
df = pd.read_csv("data\\data_emple.csv")
df = pd.read_csv("data//data_emple.csv")
distance = df.iloc[0:len(df),1].values.reshape(-1, 1)
time = df.iloc[0:len(df),2].values.reshape(-1, 1)

3
assets/img/prediction.svg
Unescape View File

@ -0,0 +1,3 @@
<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.5 1.91675C12.6053 1.91675 13.6458 2.19395 14.5559 2.68264C14.4828 3.10987 14.3412 3.41217 14.1475 3.60587C14.0415 3.71186 13.9029 3.80224 13.7289 3.87446C13.0564 3.54097 12.3 3.35425 11.5 3.35425C8.72132 3.35425 6.46875 5.60682 6.46875 8.3855C6.46875 10.4346 7.69371 12.1976 9.4513 12.9821C10.1107 13.2394 10.7196 13.3809 11.2779 13.4107L11.5 13.4167C12.1179 13.4167 12.8009 13.2738 13.5482 12.9833C14.4258 12.5911 15.1706 11.9553 15.6965 11.162C16.3092 11.3729 17.0465 11.2448 17.5114 10.7782C17.1136 11.7775 16.4739 12.6538 15.6648 13.3354L17.2187 17.9977C17.4738 18.7632 17.1477 19.6019 16.4424 19.9939C15.1278 20.7247 13.4782 21.0834 11.5 21.0834C9.52176 21.0834 7.87216 20.7247 6.55758 19.9939C5.85231 19.6019 5.52618 18.7632 5.78134 17.9978L7.33523 13.3354C5.92638 12.1488 5.03125 10.3717 5.03125 8.3855C5.03125 4.81291 7.92741 1.91675 11.5 1.91675ZM14.4292 14.1751L14.0846 14.3171L14.0672 14.3248C13.3709 14.6262 12.6112 14.8087 11.8136 14.8468C11.8076 14.8457 11.8022 14.846 11.7967 14.8463C11.7739 14.8486 11.7505 14.8495 11.7271 14.8503L11.5 14.8542L11.3122 14.8504L11.1869 14.8454C10.3888 14.8087 9.62909 14.6262 8.93278 14.3248L8.91544 14.3171C8.80137 14.2725 8.68649 14.2252 8.5708 14.1751L7.14507 18.4523C7.10862 18.5617 7.15521 18.6815 7.25597 18.7375C8.33757 19.3387 9.75013 19.6459 11.5 19.6459C13.2499 19.6459 14.6624 19.3387 15.744 18.7375C15.8448 18.6815 15.8914 18.5617 15.8549 18.4523L14.4292 14.1751ZM11.2028 14.8475L11.3122 14.8504L11.3441 14.852L11.5 14.8542C11.4004 14.8542 11.3013 14.852 11.2028 14.8475ZM17.2427 1.80195L17.25 1.91675C17.25 3.01846 17.5086 3.79432 17.9978 4.28351C18.4494 4.73508 19.1452 4.99018 20.1161 5.02675L20.3646 5.03133C21.283 5.03133 21.3213 6.35154 20.4794 6.46155L20.3646 6.46883C19.2629 6.46883 18.487 6.72745 17.9978 7.21665C17.5463 7.66821 17.2912 8.36404 17.2546 9.33494L17.25 9.58341C17.25 10.5417 15.8125 10.5417 15.8125 9.58341C15.8125 8.48171 15.5539 7.70584 15.0647 7.21665C14.6131 6.76508 13.9173 6.50998 12.9464 6.47341L12.6979 6.46883C11.7795 6.46883 11.7412 5.14863 12.5831 5.03861L12.6979 5.03133C13.7996 5.03133 14.5755 4.77271 15.0647 4.28351C15.5539 3.79432 15.8125 3.01846 15.8125 1.91675C15.8125 0.998345 17.1327 0.960078 17.2427 1.80195ZM16.5313 4.74623L16.3936 4.94141C16.2977 5.06801 16.1936 5.18758 16.0812 5.29998C15.9125 5.46859 15.7278 5.61853 15.5274 5.75008C15.7278 5.88163 15.9125 6.03157 16.0812 6.20018C16.2498 6.36879 16.3997 6.5535 16.5313 6.75393C16.6628 6.5535 16.8127 6.36879 16.9814 6.20018C17.15 6.03157 17.3347 5.88163 17.5351 5.75008C17.3347 5.61853 17.15 5.46859 16.9814 5.29998C16.8689 5.18758 16.7648 5.06801 16.6689 4.94141L16.5313 4.74623Z" fill="#ADA4A5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

9
assets/img/prediction_selected.svg
Unescape View File

@ -0,0 +1,9 @@
<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.5 1.91675C12.6053 1.91675 13.6458 2.19395 14.5559 2.68264C14.4828 3.10987 14.3412 3.41217 14.1475 3.60587C14.0415 3.71186 13.9029 3.80224 13.7289 3.87446C13.0564 3.54097 12.3 3.35425 11.5 3.35425C8.72132 3.35425 6.46875 5.60682 6.46875 8.3855C6.46875 10.4346 7.69371 12.1976 9.45129 12.9821C10.1107 13.2394 10.7196 13.3809 11.2779 13.4107L11.5 13.4167C12.1179 13.4167 12.8009 13.2738 13.5482 12.9833C14.4258 12.5911 15.1706 11.9553 15.6965 11.162C16.3092 11.3729 17.0465 11.2448 17.5114 10.7782C17.1136 11.7775 16.4739 12.6538 15.6648 13.3354L17.2187 17.9977C17.4738 18.7632 17.1477 19.6019 16.4424 19.9939C15.1278 20.7247 13.4782 21.0834 11.5 21.0834C9.52176 21.0834 7.87216 20.7247 6.55758 19.9939C5.85231 19.6019 5.52618 18.7632 5.78134 17.9978L7.33523 13.3354C5.92638 12.1488 5.03125 10.3717 5.03125 8.3855C5.03125 4.81291 7.92741 1.91675 11.5 1.91675ZM14.4292 14.1751L14.0846 14.3171L14.0672 14.3248C13.3709 14.6262 12.6112 14.8087 11.8136 14.8468C11.8076 14.8457 11.8022 14.846 11.7967 14.8463C11.7739 14.8486 11.7505 14.8495 11.7271 14.8503L11.5 14.8542L11.3122 14.8504L11.1869 14.8454C10.3888 14.8087 9.62909 14.6262 8.93278 14.3248L8.91544 14.3171C8.80137 14.2725 8.68649 14.2252 8.5708 14.1751L7.14507 18.4523C7.10862 18.5617 7.15521 18.6815 7.25597 18.7375C8.33757 19.3387 9.75013 19.6459 11.5 19.6459C13.2499 19.6459 14.6624 19.3387 15.744 18.7375C15.8448 18.6815 15.8914 18.5617 15.8549 18.4523L14.4292 14.1751ZM11.2028 14.8475L11.3122 14.8504L11.3441 14.852L11.5 14.8542C11.4004 14.8542 11.3013 14.852 11.2028 14.8475ZM17.2427 1.80195L17.25 1.91675C17.25 3.01846 17.5086 3.79432 17.9978 4.28351C18.4494 4.73508 19.1452 4.99018 20.1161 5.02675L20.3646 5.03133C21.283 5.03133 21.3213 6.35154 20.4794 6.46155L20.3646 6.46883C19.2629 6.46883 18.487 6.72745 17.9978 7.21665C17.5463 7.66821 17.2912 8.36404 17.2546 9.33494L17.25 9.58342C17.25 10.5417 15.8125 10.5417 15.8125 9.58342C15.8125 8.48171 15.5539 7.70584 15.0647 7.21665C14.6131 6.76508 13.9173 6.50998 12.9464 6.47341L12.6979 6.46883C11.7795 6.46883 11.7412 5.14863 12.5831 5.03861L12.6979 5.03133C13.7996 5.03133 14.5755 4.77271 15.0647 4.28351C15.5539 3.79432 15.8125 3.01846 15.8125 1.91675C15.8125 0.998345 17.1327 0.960079 17.2427 1.80195ZM16.5312 4.74623L16.3936 4.94141C16.2977 5.06801 16.1936 5.18758 16.0812 5.29998C15.9125 5.46859 15.7278 5.61853 15.5274 5.75008C15.7278 5.88163 15.9125 6.03157 16.0812 6.20018C16.2498 6.36879 16.3997 6.5535 16.5312 6.75393C16.6628 6.5535 16.8127 6.36879 16.9813 6.20018C17.15 6.03157 17.3347 5.88163 17.5351 5.75008C17.3347 5.61853 17.15 5.46859 16.9813 5.29998C16.8689 5.18758 16.7648 5.06801 16.6689 4.94141L16.5312 4.74623Z" fill="url(#paint0_linear_1058_2886)"/>
<defs>
<linearGradient id="paint0_linear_1058_2886" x1="21.0833" y1="21.0834" x2="-0.355231" y2="19.7443" gradientUnits="userSpaceOnUse">
<stop stop-color="#6131AD"/>
<stop offset="1" stop-color="#D4B9FF"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

3
assets/img/volumes.svg
Unescape View File

@ -0,0 +1,3 @@
<svg width="22" height="21" viewBox="0 0 22 21" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.09929 2.53496L4.94686 2.71946C5.01286 2.49446 5.06157 2.31746 5.09457 2.18396L5.24229 1.58396C5.39315 1.14896 5.29572 0.889457 4.84157 0.743957C4.499 0.688457 4.19729 0.736457 4.04643 1.02596L3.32043 3.94796C3.21986 4.29296 3.18529 4.55096 3.63943 4.69646L6.48529 5.38646C6.941 5.53046 7.26629 5.34746 7.39672 4.98746C7.524 4.62596 7.24586 4.27046 6.90643 4.20446L5.70115 3.90746C5.81272 3.83096 5.80486 3.78446 5.96357 3.66446C7.76757 2.31446 9.32958 1.58246 11.2986 1.58246C15.84 1.58246 19.8236 5.48546 19.8236 9.82046C19.8236 14.157 15.84 17.985 11.2986 17.985C6.75715 17.985 2.77357 14.157 2.77357 9.82046C2.77357 9.38696 2.475 9.04046 2.01929 9.04046C1.56515 9.04046 1.28857 9.38696 1.28857 9.82046C1.28857 15.0255 5.84729 19.4145 11.2986 19.4145C16.7483 19.4145 21.3463 15.012 21.3463 9.80846C21.3463 4.60496 16.9934 0.230957 11.3174 0.230957C9.01956 0.247181 6.8075 1.06628 5.09929 2.53346V2.53496ZM10.1043 6.75146V11.313C10.1043 11.748 10.4076 12.036 10.8617 12.036H14.3C14.7557 12.036 15.0386 11.7465 15.0386 11.313C15.0386 10.8795 14.7557 10.677 14.3 10.677H11.5814V6.75296C11.5814 6.31946 11.3237 6.02246 10.868 6.02246C10.4139 6.02246 10.1059 6.31946 10.1059 6.75296L10.1043 6.75146Z" fill="#ADA4A5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

9
assets/img/volumes_selected.svg
Unescape View File

@ -0,0 +1,9 @@
<svg width="22" height="21" viewBox="0 0 22 21" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.09929 2.53496L4.94686 2.71946C5.01286 2.49446 5.06157 2.31746 5.09457 2.18396L5.24229 1.58396C5.39315 1.14896 5.29572 0.889457 4.84157 0.743957C4.499 0.688457 4.19729 0.736457 4.04643 1.02596L3.32043 3.94796C3.21986 4.29296 3.18529 4.55096 3.63943 4.69646L6.48529 5.38646C6.941 5.53046 7.26629 5.34746 7.39672 4.98746C7.524 4.62596 7.24586 4.27046 6.90643 4.20446L5.70115 3.90746C5.81272 3.83096 5.80486 3.78446 5.96357 3.66446C7.76757 2.31446 9.32958 1.58246 11.2986 1.58246C15.84 1.58246 19.8236 5.48546 19.8236 9.82046C19.8236 14.157 15.84 17.985 11.2986 17.985C6.75715 17.985 2.77357 14.157 2.77357 9.82046C2.77357 9.38696 2.475 9.04046 2.01929 9.04046C1.56515 9.04046 1.28857 9.38696 1.28857 9.82046C1.28857 15.0255 5.84729 19.4145 11.2986 19.4145C16.7483 19.4145 21.3463 15.012 21.3463 9.80846C21.3463 4.60496 16.9934 0.230957 11.3174 0.230957C9.01956 0.247181 6.8075 1.06628 5.09929 2.53346V2.53496ZM10.1043 6.75146V11.313C10.1043 11.748 10.4076 12.036 10.8617 12.036H14.3C14.7557 12.036 15.0386 11.7465 15.0386 11.313C15.0386 10.8795 14.7557 10.677 14.3 10.677H11.5814V6.75296C11.5814 6.31946 11.3237 6.02246 10.868 6.02246C10.4139 6.02246 10.1059 6.31946 10.1059 6.75296L10.1043 6.75146Z" fill="url(#paint0_linear_1059_2890)"/>
<defs>
<linearGradient id="paint0_linear_1059_2890" x1="21.3463" y1="19.4145" x2="-5.37167" y2="17.2528" gradientUnits="userSpaceOnUse">
<stop stop-color="#6131AD"/>
<stop offset="1" stop-color="#D4B9FF"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

10
lib/common_widget/button/tab_button.dart
Unescape View File

@ -20,19 +20,19 @@ class TabButton extends StatelessWidget {
onTap: onTap,
child: Column(mainAxisSize: MainAxisSize.min, children: [
SvgPicture.asset(isActive ? selectIcon : icon,
width: 28, height: 28, fit: BoxFit.fitWidth),
width: 15, height: 25, fit: BoxFit.fitWidth),
SizedBox(
height: isActive ? 12: 8,
height: isActive ? 10: 6,
),
if(isActive)
Container(
width: 4,
height: 4,
width: 3,
height: 3,
decoration: BoxDecoration(
gradient: LinearGradient(
colors: TColor.secondaryG,
),
borderRadius: BorderRadius.circular(2)),
borderRadius: BorderRadius.circular(1.5)),
)
]),
);

22
lib/view/home/web/web_homeview.dart
Unescape View File

@ -63,11 +63,10 @@ class _WebHomeView extends State<WebHomeView> {
return Scaffold(
backgroundColor: TColor.white,
body: SingleChildScrollView(
child: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 50),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 30),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: media.width * 0.03,
@ -76,9 +75,9 @@ class _WebHomeView extends State<WebHomeView> {
SizedBox(
height: media.width * 0.03,
),
Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
Column(mainAxisAlignment: MainAxisAlignment.center, children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"Status d'activité",
@ -90,7 +89,8 @@ class _WebHomeView extends State<WebHomeView> {
SizedBox(
height: media.width * 0.02,
),
Row(children: [
Row(mainAxisAlignment: MainAxisAlignment.center,
children: [
BpmByTime(media, data),
SizedBox(
width: media.width * 0.01,
@ -111,7 +111,7 @@ class _WebHomeView extends State<WebHomeView> {
height: media.width * 0.05,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"Rythme cardique et vitesse",
@ -124,7 +124,7 @@ class _WebHomeView extends State<WebHomeView> {
height: media.width * 0.03,
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
GraphBpmAndSpeedByTime(media, data),
SizedBox(
@ -156,7 +156,7 @@ class _WebHomeView extends State<WebHomeView> {
fontSize: 16,
fontWeight: FontWeight.w700),
),
Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(mainAxisAlignment: MainAxisAlignment.center, children: [
GraphAltitudeByTime(media, data),
LigneContainerStats(
"${minAltitude.toInt()} m",
@ -172,8 +172,8 @@ class _WebHomeView extends State<WebHomeView> {
],
),
),
),
),
);
}
}

25
lib/view/main_tab/mobile/mobile_main_tab_view.dart
Unescape View File

@ -30,7 +30,7 @@ class _MobileMainTabViewState extends State<MobileMainTabView> {
height: 70,
child: InkWell(
onTap: () {
selectTab = 4;
selectTab = 10;
currentTab = const ListActivity();
if (mounted) {
setState(() {});
@ -90,8 +90,8 @@ class _MobileMainTabViewState extends State<MobileMainTabView> {
}
}),
TabButton(
icon: "assets/img/Activity_tab.svg",
selectIcon: "assets/img/Activity_tab_select.svg",
icon: "assets/img/volumes.svg",
selectIcon: "assets/img/volumes_selected.svg",
isActive: selectTab == 2,
onTap: () {
selectTab = 2;
@ -104,8 +104,8 @@ class _MobileMainTabViewState extends State<MobileMainTabView> {
width: 40,
),
TabButton(
icon: "assets/img/mapIcon.svg",
selectIcon: "assets/img/mapIcon_selected.svg",
icon: "assets/img/prediction.svg",
selectIcon: "assets/img/prediction_selected.svg",
isActive: selectTab == 3,
onTap: () {
selectTab = 3;
@ -115,11 +115,22 @@ class _MobileMainTabViewState extends State<MobileMainTabView> {
}
}),
TabButton(
icon: "assets/img/Profile_tab.svg",
selectIcon: "assets/img/Profile_tab_select.svg",
icon: "assets/img/mapIcon.svg",
selectIcon: "assets/img/mapIcon_selected.svg",
isActive: selectTab == 4,
onTap: () {
selectTab = 4;
currentTab = const MyMap();
if (mounted) {
setState(() {});
}
}),
TabButton(
icon: "assets/img/Profile_tab.svg",
selectIcon: "assets/img/Profile_tab_select.svg",
isActive: selectTab == 5,
onTap: () {
selectTab = 5;
currentTab = const ProfileView();
if (mounted) {
setState(() {});

25
lib/view/main_tab/web/web_main_tab_view.dart
Unescape View File

@ -6,6 +6,7 @@ import 'package:smartfit_app_mobile/view/activity/activity.dart';
import 'package:smartfit_app_mobile/view/home/home_view.dart';
import 'package:smartfit_app_mobile/view/map/my_map.dart';
import 'package:smartfit_app_mobile/view/profile/profile_view.dart';
import 'package:smartfit_app_mobile/view/volumes/volumes_view.dart';
class WebMainTabView extends StatefulWidget {
const WebMainTabView({Key? key}) : super(key: key);
@ -15,7 +16,7 @@ class WebMainTabView extends StatefulWidget {
}
class _WebMainTabViewState extends State<WebMainTabView> {
int selectTab = 4; // Définissez l'onglet initial ici
int selectTab = 10; // Définissez l'onglet initial ici
late Widget currentTab;
@override
@ -49,9 +50,15 @@ class _WebMainTabViewState extends State<WebMainTabView> {
index: 1,
onTap: () => updateTab(1, const Activity()),
),
sideBarButton(
icon: "assets/img/volumes.svg",
selectIcon: "assets/img/volumes_selected.svg",
index: 2,
onTap: () => updateTab(2, const VolumesView()),
),
InkWell(
onTap: () {
updateTab(4, const ListActivity());
updateTab(10, const ListActivity());
},
child: Container(
width: 65,
@ -75,17 +82,23 @@ class _WebMainTabViewState extends State<WebMainTabView> {
),
),
),
sideBarButton(
icon: "assets/img/prediction.svg",
selectIcon: "assets/img/prediction_selected.svg",
index: 3,
onTap: () => updateTab(3, const MyMap()),
),
sideBarButton(
icon: "assets/img/mapIcon.svg",
selectIcon: "assets/img/mapIcon_selected.svg",
index: 2,
onTap: () => updateTab(2, const MyMap()),
index: 4,
onTap: () => updateTab(4, const MyMap()),
),
sideBarButton(
icon: "assets/img/Profile_tab.svg",
selectIcon: "assets/img/Profile_tab_select.svg",
index: 3,
onTap: () => updateTab(3, const ProfileView()),
index: 5,
onTap: () => updateTab(5, const ProfileView()),
),
],
),

Write Preview
Loading…
Cancel
Save