Merge branch 'feature/NA-10' into develop

# Conflicts:
#	lib/styles/global_styles.dart
#	pubspec.yaml

lib/pages/routine_plan_registration.dart

+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:notar_e_anotar_app/pages/weekly_routine_registration.dart';
 
+//https://api.flutter.dev/flutter/material/Slider-class.html
+//https://flutter.dev/docs/release/breaking-changes/buttons
 class RoutinePlanRegistration extends StatelessWidget {
+  double _currentSliderValue = 20;
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+
       appBar: AppBar(
         textTheme: Theme.of(context).textTheme,
         title: Text("Routine Plan Registration"),
       ),
-      body: Container(
-        color: Colors.tealAccent,
+      body: SizedBox(
+        child: Card(
+            margin: EdgeInsets.all(8),
+            child: Column(
+              children: <Widget>[
+                Stack(// elementos em pilha
+                children: [
+                    Image.asset('images/routine.png',
+                        fit: BoxFit.fill, height: 300),
+                    Positioned(
+                      child: Center(
+                          child: Text(
+                        'Quantas semanas quer monitorar?',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(fontSize: 24, color: Colors.white),
+                      )),
+                    ),
+
+                  ],
+                ),
+                Slider(value: _currentSliderValue,
+                  min: 0,
+                  max: 100,
+                  divisions: 4,
+                  label: _currentSliderValue.round().toString(),
+                  onChanged: (double value) {
+                    setState(() {
+                      _currentSliderValue = value;
+                    });
+                  },
+                ),
+             /*   FlatButton(
+                  child: Text(
+                    "Voltar",
+                    style: TextStyle(fontSize: 20.0, color: Colors.teal),
+                  ),
+                  onPressed: () {
+                    print("Clicou no Botão");
+                  },
+                ),*/
+              ],
+            )),
       ),
       floatingActionButton: FloatingActionButton(
         child: Icon(
@@ -26,3 +71,6 @@ class RoutinePlanRegistration extends StatelessWidget {
     );
   }
 }
+
+void setState(Null Function() param0) {
+}

lib/pages/routine_theme_selection.dart

 import 'package:flutter/material.dart';
+import 'package:notar_e_anotar_app/pages/routine_period_selection.dart';
+import 'package:notar_e_anotar_app/styles/global_styles.dart';
 import 'package:notar_e_anotar_app/pages/routine_plan_registration.dart';
 
 class RoutineThemeSelection extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    alignedButtons() {
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          TextButton(
+            style: TextButton.styleFrom(
+              backgroundColor: backgroundWhite,
+              primary: primary,
+              minimumSize: Size(134, 44),
+              side: BorderSide(color: primary, width: 1),
+            ),
+            onPressed: () {
+              Navigator.pop(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => RoutinePeriodSelection()));
+            },
+            child: Text('Voltar'),
+          ),
+          TextButton(
+            style: TextButton.styleFrom(
+              backgroundColor: primary,
+              primary: backgroundWhite,
+              minimumSize: Size(134, 44),
+            ),
+            onPressed: () {
+              Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => RoutinePlanRegistration()));
+            },
+            child: Text('Confirmar'),
+          ),
+        ],
+      );
+    }
+
     return Scaffold(
-      appBar: AppBar(
-        textTheme: Theme.of(context).textTheme,
-        title: Text("Routine Theme Selection"),
-      ),
-      body: Container(
-        color: Colors.deepPurpleAccent,
-      ),
-      floatingActionButton: FloatingActionButton(
-        child: Icon(
-          Icons.navigate_next,
+      appBar: PreferredSize(
+        preferredSize: Size.fromHeight(170),
+        child: AppBar(
+          iconTheme: IconThemeData(
+            color: backgroundWhite,
+          ),
+          flexibleSpace: Container(
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage("images/blob_background.png"),
+                fit: BoxFit.fill,
+              ),
+            ),
+          ),
+          title: Text(
+            "Selection",
+            style: TextStyle(
+              color: backgroundWhite,
+            ),
+          ),
         ),
-        onPressed: () {
-          Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) => RoutinePlanRegistration()));
-        },
+      ),
+      body: Column(
+        children: [
+          // width: 300,
+          //height: 100,
+          //color: backgroundWhite,
+          Text(
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+            style: TextStyle(
+              color: gray,
+              backgroundColor: backgroundWhite,
+              fontSize: 16,
+            ),
+            textAlign: TextAlign.justify,
+          ),
+          alignedButtons(),
+        ],
       ),
     );
   }

lib/styles/global_styles.dart

@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
 // Theme colors
 const primary = Color.fromRGBO(0x14, 0x78, 0x74, 1);
 const primaryAccent = Color.fromRGBO(0x3B, 0x84, 0x82, 1);
+const gray = Color.fromRGBO(0x94, 0x90, 0x90, 1);
+const backgroundWhite = Colors.white;
 const primaryDark = Color.fromRGBO(0x16, 0x73, 0x6F, 1);
 const transparentGrey = Color.fromRGBO(0x00, 0x00, 0x00, 0.33);
 const backgroundGrey = Color.fromRGBO(0xEF, 0xEE, 0xEE, 1);

pubspec.yaml

@@ -51,7 +51,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - images/
-    
+    - images/blob_background.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.