Browse Source

Merge branch 'oniel-progreso'

Oniel Mendez 4 years ago
parent
commit
e68ba6ffff

+ 2
- 0
fast_med_flutter/lib/main.dart View File

@@ -1,5 +1,6 @@
1 1
 import 'package:fast_med_flutter/routes/home.dart';
2 2
 import 'package:fast_med_flutter/routes/ver_oficinas.dart';
3
+import 'package:fast_med_flutter/routes/calendario.dart';
3 4
 import 'package:flutter/material.dart';
4 5
 
5 6
 void main() => runApp(MaterialApp(
@@ -7,5 +8,6 @@ void main() => runApp(MaterialApp(
7 8
     routes: {
8 9
       '/home': (context) => Home(),
9 10
       '/verOficinas': (context) => VerOficinas(),
11
+      '/calendario': (context) => Calendario(),
10 12
     }
11 13
 ));

+ 3
- 3
fast_med_flutter/lib/routes/calendario.dart View File

@@ -10,12 +10,12 @@ final Map<DateTime, List> _holidays = {
10 10
 };
11 11
 
12 12
 void main() {
13
-  initializeDateFormatting().then((_) => runApp(MyApp()));
13
+  initializeDateFormatting().then((_) => runApp(Calendario()));
14 14
 }
15 15
 
16 16
 
17 17
 
18
-class MyApp extends StatelessWidget {
18
+class Calendario extends StatelessWidget {
19 19
   @override
20 20
   Widget build(BuildContext context) {
21 21
     return MaterialApp(
@@ -344,4 +344,4 @@ class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
344 344
           .toList(),
345 345
     );
346 346
   }
347
-}
347
+}

+ 12
- 0
fast_med_flutter/lib/routes/home.dart View File

@@ -41,6 +41,18 @@ class _HomeState extends State<Home>{
41 41
               color: Colors.purple,
42 42
 
43 43
             ),
44
+            new FlatButton(
45
+              minWidth: 300.0,
46
+              height: 100.0,
47
+              onPressed: (){
48
+                Navigator.pushNamed(context, '/calendario');
49
+              },
50
+              child: Text('Calendario',
51
+                style: TextStyle(fontSize: 36),
52
+              ),
53
+              color: Colors.purple,
54
+
55
+            ),
44 56
             ],
45 57
         ),
46 58
 

+ 22
- 0
fast_med_flutter/pubspec.lock View File

@@ -81,6 +81,13 @@ packages:
81 81
       url: "https://pub.dartlang.org"
82 82
     source: hosted
83 83
     version: "3.1.4"
84
+  intl:
85
+    dependency: transitive
86
+    description:
87
+      name: intl
88
+      url: "https://pub.dartlang.org"
89
+    source: hosted
90
+    version: "0.16.1"
84 91
   matcher:
85 92
     dependency: transitive
86 93
     description:
@@ -109,6 +116,13 @@ packages:
109 116
       url: "https://pub.dartlang.org"
110 117
     source: hosted
111 118
     version: "1.9.2"
119
+  simple_gesture_detector:
120
+    dependency: transitive
121
+    description:
122
+      name: simple_gesture_detector
123
+      url: "https://pub.dartlang.org"
124
+    source: hosted
125
+    version: "0.1.4"
112 126
   sky_engine:
113 127
     dependency: transitive
114 128
     description: flutter
@@ -142,6 +156,13 @@ packages:
142 156
       url: "https://pub.dartlang.org"
143 157
     source: hosted
144 158
     version: "1.1.0-nullsafety.1"
159
+  table_calendar:
160
+    dependency: "direct main"
161
+    description:
162
+      name: table_calendar
163
+      url: "https://pub.dartlang.org"
164
+    source: hosted
165
+    version: "2.3.0"
145 166
   term_glyph:
146 167
     dependency: transitive
147 168
     description:
@@ -172,3 +193,4 @@ packages:
172 193
     version: "2.1.0-nullsafety.3"
173 194
 sdks:
174 195
   dart: ">=2.10.0-110 <2.11.0"
196
+  flutter: ">=1.17.0 <2.0.0"