Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2020-045
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2020-045
2020-045
Commits
54cc15ad
Commit
54cc15ad
authored
Oct 13, 2020
by
Boteju W.J.M.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
10/13
parent
7f212daf
Pipeline
#1725
failed with stages
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
97 additions
and
80 deletions
+97
-80
fitnessapp/lib/Screens/Home/home.dart
fitnessapp/lib/Screens/Home/home.dart
+2
-3
fitnessapp/lib/Screens/WalkingPatternRecognition/MainNavigation.dart
...lib/Screens/WalkingPatternRecognition/MainNavigation.dart
+19
-4
fitnessapp/lib/Screens/WalkingPatternRecognition/Navigation.dart
...app/lib/Screens/WalkingPatternRecognition/Navigation.dart
+1
-3
fitnessapp/lib/Screens/WalkingPatternRecognition/daily_details_screen.dart
...reens/WalkingPatternRecognition/daily_details_screen.dart
+6
-6
fitnessapp/lib/Screens/WalkingPatternRecognition/home.dart
fitnessapp/lib/Screens/WalkingPatternRecognition/home.dart
+1
-0
fitnessapp/lib/Screens/WalkingPatternRecognition/service.dart
...essapp/lib/Screens/WalkingPatternRecognition/service.dart
+1
-1
fitnessapp/lib/Screens/WalkingPatternRecognition/widgets/daily_chart.dart
...creens/WalkingPatternRecognition/widgets/daily_chart.dart
+67
-63
No files found.
fitnessapp/lib/Screens/Home/home.dart
View file @
54cc15ad
...
...
@@ -45,7 +45,7 @@ class _HomePageState extends State<HomePage> {
var
birthdayYear
=
birthdayParse
.
year
;
var
month
=
months
[
dateParse
.
month
-
1
];
var
formattedDate
=
"
${dateParse.day}
$month
${dateParse.year}
"
;
String
datee
=
"
${dateParse.year}
-
0
${dateParse.month}
-
${dateParse.day}
"
;
String
datee
=
"
${dateParse.year}
-
${dateParse.month}
-
${dateParse.day}
"
;
var
dogBirthdayAge
=
currentYear
-
birthdayYear
;
setState
(()
{
finalDate
=
formattedDate
.
toString
();
...
...
@@ -99,6 +99,7 @@ class _HomePageState extends State<HomePage> {
totalActivityMins
=
totalActivityMins
%
60
;
totalActivityHrs
+=
extraHours
;
}
int
totalTime
=
(
totalActivityHrs
*
60
)
+
totalActivityMins
;
compare
(
globals
.
dogBreed
,
totalTime
);
});
...
...
@@ -106,10 +107,8 @@ class _HomePageState extends State<HomePage> {
}
compare
(
breed
,
totalTime
)
async
{
print
(
"in"
);
SearchService
.
compare
(
breed
,
totalTime
).
then
((
responseBody
)
{
dynamic
data
=
jsonDecode
(
responseBody
);
print
(
data
);
setState
(()
{
if
(
data
[
'status'
]
==
'low'
)
{
sliderValue
=
1
;
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/MainNavigation.dart
View file @
54cc15ad
import
'package:fitnessapp/Screens/WalkingPatternRecognition/home.dart'
;
import
'package:fitnessapp/constants.dart'
;
import
'package:flutter/material.dart'
;
import
'package:fitnessapp/globals.dart'
as
globals
;
class
MainNavigation
extends
StatefulWidget
{
Function
open
;
...
...
@@ -37,12 +38,26 @@ class _MainNavigationState extends State<MainNavigation>
top:
MediaQuery
.
of
(
context
).
padding
.
top
,
),
),
Padding
(
padding:
const
EdgeInsets
.
only
(
top:
20
,
Container
(
padding:
EdgeInsets
.
only
(
top:
10
,
left:
280
),
child:
Column
(
children:
[
Column
(
children:
[
CircleAvatar
(
backgroundColor:
Colors
.
black87
,
backgroundImage:
new
NetworkImage
(
globals
.
url
),
radius:
35.0
,
),
],
)
],
),
),
Padding
(
padding:
const
EdgeInsets
.
only
(
left:
40
),
child:
SizedBox
(
height:
6
0
,
height:
5
0
,
width:
300
,
child:
TabBar
(
indicatorColor:
kPrimaryColor
,
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/Navigation.dart
View file @
54cc15ad
...
...
@@ -37,9 +37,7 @@ class _NavigationState extends State<Navigation> with TickerProviderStateMixin {
child:
Column
(
children:
<
Widget
>[
Padding
(
padding:
const
EdgeInsets
.
only
(
top:
15
,
),
padding:
const
EdgeInsets
.
only
(
top:
15
,
left:
20
),
child:
SizedBox
(
height:
60
,
width:
300
,
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/daily_details_screen.dart
View file @
54cc15ad
...
...
@@ -3,8 +3,8 @@ import 'package:fitnessapp/Screens/WalkingPatternRecognition/widgets/daily_chart
import
'package:fitnessapp/Screens/WalkingPatternRecognition/service.dart'
;
import
'package:fitnessapp/loading.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter_svg/svg.dart'
;
import
'dart:convert'
;
import
'package:fitnessapp/globals.dart'
as
globals
;
class
DailyDetailsScreen
extends
StatefulWidget
{
@override
...
...
@@ -39,7 +39,7 @@ class _DailyDetailsScreenState extends State<DailyDetailsScreen> {
var
dateParse
=
DateTime
.
parse
(
date
);
var
month
=
months
[
dateParse
.
month
-
1
];
var
formattedDate
=
"
${dateParse.day}
$month
${dateParse.year}
"
;
String
datee
=
"
${dateParse.year}
-
0
${dateParse.month}
-
${dateParse.day}
"
;
String
datee
=
"
${dateParse.year}
-
${dateParse.month}
-
${dateParse.day}
"
;
setState
(()
{
finalDate
=
formattedDate
.
toString
();
...
...
@@ -77,7 +77,6 @@ class _DailyDetailsScreenState extends State<DailyDetailsScreen> {
}
getHighlightsPerDay
(
datee
)
async
{
print
(
datee
);
SearchService
.
getHighlightsPerDay
(
datee
).
then
((
responseBody
)
{
dynamic
data
=
jsonDecode
(
responseBody
);
setState
(()
{
...
...
@@ -104,11 +103,12 @@ class _DailyDetailsScreenState extends State<DailyDetailsScreen> {
child:
SingleChildScrollView
(
child:
Column
(
children:
<
Widget
>[
SizedBox
(
height:
50
),
Container
(
padding:
EdgeInsets
.
symmetric
(
horizontal:
20
,
vertical:
25
),
decoration:
BoxDecoration
(
color:
Colors
.
white
,
color:
kGreyColour
,
borderRadius:
BorderRadius
.
circular
(
20
),
boxShadow:
[
BoxShadow
(
...
...
@@ -132,11 +132,11 @@ class _DailyDetailsScreenState extends State<DailyDetailsScreen> {
],
),
),
SizedBox
(
height:
2
0
),
SizedBox
(
height:
3
0
),
Container
(
padding:
EdgeInsets
.
all
(
20
),
decoration:
BoxDecoration
(
color:
Colors
.
white
,
color:
kGreyColour
,
borderRadius:
BorderRadius
.
circular
(
20
),
boxShadow:
[
BoxShadow
(
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/home.dart
View file @
54cc15ad
import
'package:fitnessapp/constants.dart'
;
import
'package:flutter/material.dart'
;
import
'Navigation.dart'
;
import
'package:fitnessapp/globals.dart'
as
globals
;
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/service.dart
View file @
54cc15ad
...
...
@@ -90,7 +90,7 @@ class SearchService {
}
static
Future
<
String
>
getTotalMinutesPerHour
(
day
)
async
{
String
url
=
'
$ip
/getTotalMinutesPer
Day
'
;
String
url
=
'
$ip
/getTotalMinutesPer
Hour
'
;
var
body
=
jsonEncode
({
"activity"
:
globals
.
activityId
,
"dog"
:
dog
,
...
...
fitnessapp/lib/Screens/WalkingPatternRecognition/widgets/daily_chart.dart
View file @
54cc15ad
...
...
@@ -3,7 +3,7 @@ import 'package:fitnessapp/constants.dart';
import
'package:fl_chart/fl_chart.dart'
;
import
'package:flutter/material.dart'
;
import
'package:intl/intl.dart'
;
import
'../../../loading.dart'
;
import
'../service.dart'
;
class
DailyChart
extends
StatefulWidget
{
...
...
@@ -23,11 +23,15 @@ class _DailyChartState extends State<DailyChart> {
}
getTotalMinutesPerHour
(
date
)
async
{
SearchService
.
getTotalMinutesPerHour
(
date
).
then
((
responseBody
)
{
SearchService
.
getTotalMinutesPerHour
(
date
).
then
((
responseBody
)
{
dynamic
data
=
jsonDecode
(
responseBody
);
data
=
data
[
'hour array'
];
for
(
var
i
=
0
;
i
<
data
.
length
;
i
++)
{
if
(
data
[
i
]
==
null
)
{
data
[
i
]
=
0
;
}
}
setState
(()
{
data
=
data
[
0
][
'hour array'
];
timePeriods
[
0
]
=
data
[
0
].
toDouble
();
timePeriods
[
1
]
=
data
[
1
].
toDouble
();
timePeriods
[
2
]
=
data
[
2
].
toDouble
();
...
...
@@ -52,7 +56,6 @@ class _DailyChartState extends State<DailyChart> {
timePeriods
[
21
]
=
data
[
21
].
toDouble
();
timePeriods
[
22
]
=
data
[
22
].
toDouble
();
timePeriods
[
23
]
=
data
[
23
].
toDouble
();
});
loading
=
false
;
});
...
...
@@ -68,32 +71,33 @@ class _DailyChartState extends State<DailyChart> {
Widget
build
(
BuildContext
context
)
{
return
AspectRatio
(
aspectRatio:
1.7
,
child:
BarChart
(
BarChartData
(
barGroups:
getBarGroups
(
timePeriods
),
borderData:
FlBorderData
(
show:
false
),
titlesData:
FlTitlesData
(
leftTitles:
SideTitles
(
showTitles:
false
,
),
bottomTitles:
SideTitles
(
// showTitles: true,
// getTitles: getDay,
textStyle:
TextStyle
(
color:
Color
(
0xFF7589A2
),
fontSize:
10
,
fontWeight:
FontWeight
.
w200
,
child:
loading
?
Loading
()
:
BarChart
(
BarChartData
(
barGroups:
getBarGroups
(
timePeriods
),
borderData:
FlBorderData
(
show:
false
),
titlesData:
FlTitlesData
(
leftTitles:
SideTitles
(
showTitles:
false
,
),
bottomTitles:
SideTitles
(
showTitles:
true
,
getTitles:
getDay
,
textStyle:
TextStyle
(
color:
Color
(
0xFF7589A2
),
fontSize:
10
,
fontWeight:
FontWeight
.
bold
,
),
),
),
),
),
),
),
),
);
}
}
getBarGroups
(
List
<
double
>
barChartData
)
{
getBarGroups
(
List
<
double
>
barChartDatas
)
{
// List<double> barChartDatas = [
// 0,
// 0,
...
...
@@ -105,20 +109,20 @@ getBarGroups(List<double> barChartData) {
// 3,
// 0,
// 2,
//
3,
//
0.5,
//
5,
//
3.5,
//
4,
//
3,
//
3,
//
2,
//
1,
//
0.5,
//
2,
//
2,
//
2,
//
5
//
3,
//
0.5,
//
5,
//
3.5,
//
4,
//
3,
//
3,
//
2,
//
1,
//
0.5,
//
2,
//
2,
//
2,
//
5
// ];
List
<
BarChartGroupData
>
barChartGroups
=
[];
barChartDatas
.
asMap
().
forEach
(
...
...
@@ -141,53 +145,53 @@ getBarGroups(List<double> barChartData) {
String
getDay
(
double
value
)
{
switch
(
value
.
toInt
())
{
case
0
:
return
'00
:00
'
;
return
'00'
;
case
1
:
return
'01
:00
'
;
return
'01'
;
case
2
:
return
'02
:00
'
;
return
'02'
;
case
3
:
return
'03
:00
'
;
return
'03'
;
case
4
:
return
'04
:00
'
;
return
'04'
;
case
5
:
return
'05
:00
'
;
return
'05'
;
case
6
:
return
'06
:00
'
;
return
'06'
;
case
7
:
return
'07
:00
'
;
return
'07'
;
case
8
:
return
'08
:00
'
;
return
'08'
;
case
9
:
return
'09
:00
'
;
return
'09'
;
case
10
:
return
'10
:00
'
;
return
'10'
;
case
11
:
return
'11
:00
'
;
return
'11'
;
case
12
:
return
'12
:00
'
;
return
'12'
;
case
13
:
return
'13
:00
'
;
return
'13'
;
case
14
:
return
'14
:00
'
;
return
'14'
;
case
15
:
return
'15
:00
'
;
return
'15'
;
case
16
:
return
'16
:00
'
;
return
'16'
;
case
17
:
return
'17
:00
'
;
return
'17'
;
case
18
:
return
'18
:00
'
;
return
'18'
;
case
19
:
return
'19
:00
'
;
return
'19'
;
case
20
:
return
'20
:00
'
;
return
'20'
;
case
21
:
return
'21
:00
'
;
return
'21'
;
case
22
:
return
'22
:00
'
;
return
'22'
;
case
23
:
return
'23
:00
'
;
return
'23'
;
default
:
return
''
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment