Browse Source

sprint3 merge

Oniel Mendez 4 years ago
parent
commit
c92790fd1e

+ 4
- 2
fast_med_app/lib/routes/home.dart View File

13
   @override
13
   @override
14
   Widget build(BuildContext context){
14
   Widget build(BuildContext context){
15
     return Scaffold(
15
     return Scaffold(
16
+      backgroundColor: Colors.blue[50],
16
       appBar: AppBar(
17
       appBar: AppBar(
18
+        backgroundColor: Colors.red[300],
17
         title: Text('Bienvenido'),
19
         title: Text('Bienvenido'),
18
         centerTitle: true,
20
         centerTitle: true,
19
       ),
21
       ),
23
           children: [
25
           children: [
24
             newButton(context,'/verOficinas','Ver Oficinas'),
26
             newButton(context,'/verOficinas','Ver Oficinas'),
25
             spaceBetween(),
27
             spaceBetween(),
26
-            newButton(context,'/especialidades','especialidades'),
28
+            newButton(context,'/especialidades','Buscar \nespecialidades'),
27
             spaceBetween(),
29
             spaceBetween(),
28
-            newButton(context,'/translation','translation'),
30
+            newButton(context,'/translation','Translation Demo'),
29
             spaceBetween(),
31
             spaceBetween(),
30
             ],
32
             ],
31
         ),
33
         ),

+ 1
- 1
fast_med_app/lib/routes/navigation.dart View File

72
           BottomNavigationBarItem(icon: Icon(Icons.person_rounded),
72
           BottomNavigationBarItem(icon: Icon(Icons.person_rounded),
73
               label: 'Profile'),
73
               label: 'Profile'),
74
           BottomNavigationBarItem(icon: Icon(Icons.event_note_rounded),
74
           BottomNavigationBarItem(icon: Icon(Icons.event_note_rounded),
75
-              label: 'Appointments')
75
+              label: 'Ver Mas')
76
         ],
76
         ],
77
 
77
 
78
       ),
78
       ),

+ 2
- 0
fast_med_app/lib/routes/ver_oficina.dart View File

156
     var especialistas = getEspecialistas(especialista);
156
     var especialistas = getEspecialistas(especialista);
157
 
157
 
158
     return Scaffold(
158
     return Scaffold(
159
+      backgroundColor: Colors.blue[50],
159
       appBar: AppBar(
160
       appBar: AppBar(
160
         title: Text(name),
161
         title: Text(name),
162
+        backgroundColor: Colors.red[300],
161
         centerTitle: true,
163
         centerTitle: true,
162
       ),
164
       ),
163
       body: Center(
165
       body: Center(

+ 4
- 2
fast_med_app/lib/routes/ver_oficinas.dart View File

52
     });
52
     });
53
     List<Oficina> lista =  _oficinas;
53
     List<Oficina> lista =  _oficinas;
54
     return Scaffold(
54
     return Scaffold(
55
+      backgroundColor: Colors.blue[50],
55
       key: _scaffoldKey,
56
       key: _scaffoldKey,
56
       appBar: AppBar(
57
       appBar: AppBar(
57
         title: Text('Oficinas'),
58
         title: Text('Oficinas'),
58
         centerTitle: true,
59
         centerTitle: true,
59
-        backgroundColor: Colors.purple,
60
+        backgroundColor: Colors.red[300],
60
 
61
 
61
       ),
62
       ),
62
       body: ListView.builder(
63
       body: ListView.builder(
63
         itemCount: lista.length,
64
         itemCount: lista.length,
64
         itemBuilder: (context, index){
65
         itemBuilder: (context, index){
65
           return Card(
66
           return Card(
66
-          child: ListTile(
67
+              color: Colors.red[300],
68
+              child: ListTile(
67
             onTap: () {
69
             onTap: () {
68
               Navigator.pushNamed(context, "/ver/oficina", arguments:{
70
               Navigator.pushNamed(context, "/ver/oficina", arguments:{
69
                 'id' : lista[index].id,
71
                 'id' : lista[index].id,

+ 3
- 3
fast_med_app/lib/widgets/functions.dart View File

10
     child: Text(text,
10
     child: Text(text,
11
       style: TextStyle(fontSize: 36),
11
       style: TextStyle(fontSize: 36),
12
     ),
12
     ),
13
-    color: Colors.purple,
13
+    color: Colors.red[300],
14
     //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
14
     //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
15
     padding: EdgeInsets.all(25),
15
     padding: EdgeInsets.all(25),
16
   );
16
   );
26
           print(name);
26
           print(name);
27
         },
27
         },
28
         padding: new EdgeInsets.all(0.0),
28
         padding: new EdgeInsets.all(0.0),
29
-        color: Colors.purple,
29
+        color: Colors.red[300],
30
 
30
 
31
       );
31
       );
32
 }
32
 }
44
           child: Text(text,
44
           child: Text(text,
45
             style: TextStyle(fontSize: 36),
45
             style: TextStyle(fontSize: 36),
46
           ),
46
           ),
47
-          color: Colors.purple,
47
+          color: Colors.red[300],
48
           //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
48
           //shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(50)),
49
           padding: EdgeInsets.all(25),
49
           padding: EdgeInsets.all(25),
50
         )
50
         )