Skip to content

GitLab

Commit ec3bc58f authored by Thiago Nitschke Simões's avatar Thiago Nitschke Simões
Browse files

Merge branch 'release/sprint_2'

parents fb781cb6 16005ca5
Hide whitespace changes
Inline Side-by-side
Showing
with 101 additions and 39 deletions
+101 -39
images/Image_01_Onboarding.png 0 → 100644
View file @ ec3bc58f
images/Image_01_Onboarding.png

124 KB

images/Image_02_Onboarding.png 0 → 100644
View file @ ec3bc58f
images/Image_02_Onboarding.png

88.6 KB

images/Image_03_Onboarding.png 0 → 100644
View file @ ec3bc58f
images/Image_03_Onboarding.png

152 KB

lib/pages/onboarding.dart
View file @ ec3bc58f
......@@ -29,49 +29,100 @@ class _OnboardingState extends State<Onboarding> {
body: IntroductionScreen(
pages: [
PageViewModel(
title: 'Título Aqui',
bodyWidget: Image(
image: AssetImage(
'images/onboarding_image_1.png',
),
title: 'A Rotina Merece\n Ser Cuidada',
bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
SizedBox(height: 16),
Center(
child: Container(
child: Image(
image: AssetImage('images/Image_01_Onboarding.png'),
),
margin: const EdgeInsets.all(10.0),
width: 209.0,
height: 267.0,
),
),
SizedBox(height: 16),
Center(
child: Text(
'Notar e Anotar ajuda a cuidar da rotina de sua família Ensine desde cedo as crianças',
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Colors.grey,
fontSize: 14),
),
),
],
),
footer: Text(
'Lorem ipsum '
'lorem ipsum',
style: TextStyle(fontSize: 20),
),
//image: buildImage('images/group_25.png'),
decoration: getPageDecoration(),
),
PageViewModel(
title: 'Título Aqui',
bodyWidget: Image(
image: AssetImage('images/onboarding_image_2.png'),
),
footer: Text(
'Lorem ipsum '
'lorem ipsum',
style: TextStyle(fontSize: 20),
title: 'Organize Sua Rotina',
bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
SizedBox(height: 16),
Center(
child: Container(
child: Image(
image: AssetImage('images/Image_02_Onboarding.png'),
),
margin: const EdgeInsets.all(10.0),
width: 209.0,
height: 267.0,
),
),
SizedBox(height: 16),
Center(
child: Text(
'Programe a semana!\nEvite imprevistos e confusões em sua casa \nValorize seu tempo!',
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Colors.grey,
fontSize: 14),
),
),
],
),
//image: buildImage('images/group_26.png'),
decoration: getPageDecoration(),
),
PageViewModel(
title: 'Título Aqui',
bodyWidget: Image(
image: AssetImage('images/onboarding_image_3.png'),
),
footer: ButtonWidget(
text: 'Começar App',
onClicked: () => goToHome(context),
title: 'Valorize cada conquista \nde seu filho!',
bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
SizedBox(height: 16),
Center(
child: Container(
child: Image(
image: AssetImage('images/Image_03_Onboarding.png'),
),
//margin: const EdgeInsets.all(10.0),
width: 720.0,
height: 326.0,
),
),
Center(
child: Text(
'Reconheça e elogie! \nEstimule seu filho nas tarefas do dia a dia',
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Colors.grey,
fontSize: 14),
),
),
],
),
//image: buildImage('images/family.png'),
decoration: getPageDecoration(),
),
)
],
done: Text(
'Read',
'PRONTO',
style: TextStyle(
fontWeight: FontWeight.bold,
color: customizedGreen,
......@@ -124,11 +175,11 @@ class _OnboardingState extends State<Onboarding> {
PageDecoration getPageDecoration() => PageDecoration(
titleTextStyle: TextStyle(
fontSize: 35, fontWeight: FontWeight.bold, color: customizedGreen),
fontSize: 28, fontWeight: FontWeight.bold, color: customizedGreen),
bodyTextStyle: TextStyle(fontSize: 20),
titlePadding: EdgeInsets.all(20).copyWith(top: 0),
descriptionPadding: EdgeInsets.all(16).copyWith(bottom: 0),
imagePadding: EdgeInsets.all(24),
titlePadding: EdgeInsets.all(8).copyWith(top: 0),
descriptionPadding: EdgeInsets.all(8).copyWith(bottom: 0),
imagePadding: EdgeInsets.all(8),
pageColor: Colors.white,
);
}
lib/pages/routine_period_selection.dart
View file @ ec3bc58f
......@@ -8,7 +8,10 @@ class RoutinePeriodSelection extends StatefulWidget {
}
class _RoutinePeriodSelectionState extends State<RoutinePeriodSelection> {
int _value = 8;
int _value = 4;
List <int> valueWeek = [];
int valWeek;
@override
Widget build(BuildContext context) {
......@@ -16,7 +19,7 @@ class _RoutinePeriodSelectionState extends State<RoutinePeriodSelection> {
appBar: AppBar(
textTheme: Theme.of(context).textTheme,
title: Text(
'Monitoração',
'Monitoramento',
style: TextStyle(color: Colors.white),
),
iconTheme: IconThemeData(color: Colors.white),
......@@ -59,17 +62,19 @@ class _RoutinePeriodSelectionState extends State<RoutinePeriodSelection> {
value: _value.toDouble(),
min: 4,
max: 16,
divisions: 16,
divisions: 12,
activeColor: Colors.teal,
// inactiveColor: Colors,
label: '$_value',
onChanged: (double newValue) {
setState(() {
_value = newValue.round();
valueWeeks(_value);
});
},
semanticFormatterCallback: (double newValue) {
return '${newValue.round()} week';
}),
),
),
......@@ -111,9 +116,14 @@ class _RoutinePeriodSelectionState extends State<RoutinePeriodSelection> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => RoutineThemeSelection()));
builder: (context) => RoutineThemeSelection()) );
},
),
));
}
void valueWeeks(value){
// valueWeek = value;
valWeek = value;
}
}
lib/pages/routine_plan_registration.dart
View file @ ec3bc58f
......@@ -30,6 +30,7 @@ class _RoutinePlanRegistrationState extends State<RoutinePlanRegistration> {
];
@override
int _value = 1;
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment