First Commit

fast_med_flutter/README.md

@@ -1,4 +1,4 @@
-# fast_med_flutter
+# flutter_app
 
 A new Flutter application.
 

fast_med_flutter/android/app/build.gradle

@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.fast_med_flutter"
+        applicationId "carlosmedici.flutter_app"
         minSdkVersion 16
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

fast_med_flutter/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
+    package="carlosmedici.flutter_app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

fast_med_flutter/android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-    <!-- Required to fetch data from the internet. -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:name="io.flutter.app.FlutterApplication"
-        android:label="fast_med_flutter"
+    package="carlosmedici.flutter_app">
+   <application
+        android:label="flutter_app"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

fast_med_flutter/android/app/src/main/kotlin/com/example/fast_med_flutter/MainActivity.kt → fast_med_flutter/android/app/src/main/kotlin/carlosmedici/flutter_app/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.fast_med_flutter
+package carlosmedici.flutter_app
 
 import io.flutter.embedding.android.FlutterActivity
 

fast_med_flutter/android/app/src/main/res/drawable/launch_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="?android:colorBackground" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

fast_med_flutter/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

fast_med_flutter/android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -12,7 +12,7 @@
          running.
          
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">@android:color/white</item>
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

fast_med_flutter/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
+    package="carlosmedici.flutter_app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

fast_med_flutter/ios/Runner.xcodeproj/project.pbxproj

@@ -299,7 +299,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = carlosmedici.flutterApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -431,7 +431,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = carlosmedici.flutterApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -458,7 +458,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = carlosmedici.flutterApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

fast_med_flutter/ios/Runner/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>fast_med_flutter</string>
+	<string>flutter_app</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

fast_med_flutter/lib/main.dart

@@ -1,19 +1,109 @@
-import 'package:fast_med_flutter/routes/home.dart';
-import 'package:fast_med_flutter/routes/ver_oficinas.dart';
-import 'package:fast_med_flutter/routes/calendario.dart';
-import 'package:fast_med_flutter/routes/main.dart';
-import 'package:fast_med_flutter/routes/register.dart';
-import 'package:fast_med_flutter/routes/welcome.dart';
 import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'package:json_table/json_table.dart';
+
+class SimpleTable extends StatefulWidget {
+  @override
+  _SimpleTableState createState() => _SimpleTableState();
+}
+
+class _SimpleTableState extends State<SimpleTable> {
+  final String jsonSample =
+      '[{"id":"0","name":"Dr.Collazo","Oficina":"A","Phone":"787-522-0123","Espe":"Dentist"},{"id":"1","name":"Dr.Lelolelo","Oficina":"B","Phone":"787-533-4567","Espe":"Dentist"},{"id":"2","name":"Dr.Pepo","Oficina":"C","Phone":"787-544-8910","Espe":"otorrinolaringologo"}]';
+  bool toggle = true;
+
+  @override
+  Widget build(BuildContext context) {
+    var json = jsonDecode(jsonSample);
+    return Scaffold(
+      body: Container(
+        padding: EdgeInsets.all(16.0),
+        child: toggle
+            ? Column(
+          children: [
+            JsonTable(
+              json,
+              showColumnToggle: true,
+              tableHeaderBuilder: (String header) {
+                return Container(
+                  padding: EdgeInsets.symmetric(
+                      horizontal: 8.0, vertical: 4.0),
+                  decoration: BoxDecoration(
+                      border: Border.all(width: 0.5),
+                      color: Colors.grey[300]),
+                  child: Text(
+                    header,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.display1.copyWith(
+                        fontWeight: FontWeight.w700,
+                        fontSize: 14.0,
+                        color: Colors.black87),
+                  ),
+                );
+              },
+              tableCellBuilder: (value) {
+                return Container(
+                  padding: EdgeInsets.symmetric(
+                      horizontal: 4.0, vertical: 2.0),
+                  decoration: BoxDecoration(
+                      border: Border.all(
+                          width: 0.5,
+                          color: Colors.grey.withOpacity(0.5))),
+                  child: Text(
+                    value,
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.display1.copyWith(
+                        fontSize: 14.0, color: Colors.grey[900]),
+                  ),
+                );
+              },
+              allowRowHighlight: true,
+              rowHighlightColor: Colors.yellow[500].withOpacity(0.7),
+              paginationRowCount: 20,
+            ),
+            SizedBox(
+              height: 20.0,
+            ),
+            Text("Tabla Oficinas")
+          ],
+        )
+            : Center(
+          child: Text(getPrettyJSONString(jsonSample)),
+        ),
+      ),
+      floatingActionButton: FloatingActionButton(
+          child: Icon(Icons.grid_on),
+          onPressed: () {
+            setState(
+                  () {
+                toggle = !toggle;
+              },
+            );
+          }),
+    );
+  }
+
+  String getPrettyJSONString(jsonObject) {
+    JsonEncoder encoder = new JsonEncoder.withIndent('  ');
+    String jsonString = encoder.convert(json.decode(jsonObject));
+    return jsonString;
+  }
+}
+
+void main() => runApp(MyApp());
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Flutter Demo',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: SimpleTable(),
+    );
+  }
+}
+
+
 
-void main() => runApp(MaterialApp(
-    initialRoute: '/home',
-    routes: {
-      '/home': (context) => Home(),
-      '/verOficinas': (context) => VerOficinas(),
-      '/calendario': (context) => Calendario(),
-      '/welcome': (context) => WelcomePage(),
-      '/register': (context) => RegisterPage(),
-      '/MyApp': (context) => MyApp(),
-    }
-));

fast_med_flutter/lib/routes/calendario.dart

@@ -1,347 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/date_symbol_data_local.dart';
-import 'package:table_calendar/table_calendar.dart';
-
-// Dias sin Citas Disponibles
-final Map<DateTime, List> _holidays = {
-  DateTime(2020, 11, 6): ['No Hay Citas'],
-  DateTime(2020, 11, 3): ['Dia Elecciones'],
-
-};
-
-void main() {
-  initializeDateFormatting().then((_) => runApp(Calendario()));
-}
-
-
-
-class Calendario extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Citas Disponibles',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: MyHomePage(title: 'Citas Disponibles'),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _MyHomePageState createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
-  Map<DateTime, List> _events;
-  List _selectedEvents;
-  AnimationController _animationController;
-  CalendarController _calendarController;
-
-  @override
-  void initState() {
-    super.initState();
-    final _selectedDay = DateTime.now();
-
-    _events = {
-
-      _selectedDay.add(Duration(days: 3)): Set.from([ 'Cita Cardiologo', 'Cita Dentista']).toList(),
-      _selectedDay.add(Duration(days: 22)): ['Cita Cardiologo', 'Cita Dentista'],
-
-    };
-
-    _selectedEvents = _events[_selectedDay] ?? [];
-    _calendarController = CalendarController();
-
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 400),
-    );
-
-    _animationController.forward();
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    _calendarController.dispose();
-    super.dispose();
-  }
-
-  void _onDaySelected(DateTime day, List events, List holidays) {
-    print('CALLBACK: _onDaySelected');
-    setState(() {
-      _selectedEvents = events;
-    });
-  }
-
-  void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onVisibleDaysChanged');
-  }
-
-  void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onCalendarCreated');
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(widget.title),
-      ),
-      body: Column(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          // Switch out 2 lines below to play with TableCalendar's settings
-          //-----------------------
-          _buildTableCalendar(),
-          // _buildTableCalendarWithBuilders(),
-          const SizedBox(height: 8.0),
-          _buildButtons(),
-          const SizedBox(height: 8.0),
-          Expanded(child: _buildEventList()),
-        ],
-      ),
-    );
-  }
-  //Back button
-  Widget BackButton(BuildContext context){
-    return InkWell(
-      onTap: (){
-        Navigator.pop(context);
-      },
-      child: Row(
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.only(left: 0, top:10, bottom: 10),
-              child: Icon(Icons.arrow_back_ios, color: Colors.black),
-            ),
-            Text("Black",
-                style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-          ]
-      ),
-    );
-  }
-
-  // Simple TableCalendar configuration (using Styles)
-  Widget _buildTableCalendar() {
-    return TableCalendar(
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      startingDayOfWeek: StartingDayOfWeek.monday,
-      calendarStyle: CalendarStyle(
-        selectedColor: Colors.lightBlueAccent,
-        todayColor: Colors.blueAccent,
-        markersColor: Colors.brown,
-        outsideDaysVisible: false,
-      ),
-      headerStyle: HeaderStyle(
-        formatButtonTextStyle: TextStyle().copyWith(color: Colors.white, fontSize: 15.0),
-        formatButtonDecoration: BoxDecoration(
-          color: Colors.lightBlue,
-          borderRadius: BorderRadius.circular(16.0),
-        ),
-      ),
-      onDaySelected: _onDaySelected,
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
-    );
-  }
-
-  // More advanced TableCalendar configuration (using Builders & Styles)
-  Widget _buildTableCalendarWithBuilders() {
-    return TableCalendar(
-      locale: 'pl_PL',
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      initialCalendarFormat: CalendarFormat.month,
-      formatAnimation: FormatAnimation.slide,
-      startingDayOfWeek: StartingDayOfWeek.sunday,
-      availableGestures: AvailableGestures.all,
-      availableCalendarFormats: const {
-        CalendarFormat.month: '',
-        CalendarFormat.week: '',
-      },
-      calendarStyle: CalendarStyle(
-        outsideDaysVisible: false,
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
-        holidayStyle: TextStyle().copyWith(color: Colors.blue),
-      ),
-      daysOfWeekStyle: DaysOfWeekStyle(
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
-      ),
-      headerStyle: HeaderStyle(
-        centerHeaderTitle: true,
-        formatButtonVisible: false,
-      ),
-      builders: CalendarBuilders(
-        selectedDayBuilder: (context, date, _) {
-          return FadeTransition(
-            opacity: Tween(begin: 0.0, end: 1.0).animate(_animationController),
-            child: Container(
-              margin: const EdgeInsets.all(4.0),
-              padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-              color: Colors.green,
-              width: 100,
-              height: 100,
-              child: Text(
-                '${date.day}',
-                style: TextStyle().copyWith(fontSize: 16.0),
-              ),
-            ),
-          );
-        },
-        todayDayBuilder: (context, date, _) {
-          return Container(
-            margin: const EdgeInsets.all(4.0),
-            padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-            color: Colors.amber,
-            width: 100,
-            height: 100,
-            child: Text(
-              '${date.day}',
-              style: TextStyle().copyWith(fontSize: 16.0),
-            ),
-          );
-        },
-        markersBuilder: (context, date, events, holidays) {
-          final children = <Widget>[];
-
-          if (events.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: 1,
-                bottom: 1,
-                child: _buildEventsMarker(date, events),
-              ),
-            );
-          }
-
-          if (holidays.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: -2,
-                top: -2,
-                child: _buildHolidaysMarker(),
-              ),
-            );
-          }
-
-          return children;
-        },
-      ),
-      onDaySelected: (date, events, holidays) {
-        _onDaySelected(date, events, holidays);
-        _animationController.forward(from: 0.0);
-      },
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
-    );
-  }
-
-  Widget _buildEventsMarker(DateTime date, List events) {
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 300),
-      decoration: BoxDecoration(
-        shape: BoxShape.rectangle,
-        color: _calendarController.isSelected(date)
-            ? Colors.brown[500]
-            : _calendarController.isToday(date) ? Colors.brown : Colors.blue,
-      ),
-      width: 16.0,
-      height: 16.0,
-      child: Center(
-        child: Text(
-          '${events.length}',
-          style: TextStyle().copyWith(
-            color: Colors.green,
-            fontSize: 12.0,
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildHolidaysMarker() {
-    return Icon(
-      Icons.add_box,
-      size: 20.0,
-      color: Colors.blueGrey,
-    );
-  }
-
-  Widget _buildButtons() {
-    final dateTime = _events.keys.elementAt(_events.length - 2);
-
-    return Column(
-      children: <Widget>[
-        Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: <Widget>[
-            RaisedButton(
-              child: Text('Mes'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.month);
-                });
-              },
-            ),
-            RaisedButton(
-              child: Text('2 Semanas'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.twoWeeks);
-                });
-              },
-            ),
-            RaisedButton(
-              child: Text('Semana'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.week);
-                });
-              },
-            ),
-          ],
-        ),
-        const SizedBox(height: 8.0),
-        RaisedButton(
-          child: Text('Recuerde Cita ${dateTime.day}-${dateTime.month}-${dateTime.year}'),
-          onPressed: () {
-            _calendarController.setSelectedDay(
-              DateTime(dateTime.year, dateTime.month, dateTime.day),
-              runCallback: true,
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-
-  Widget _buildEventList() {
-    return ListView(
-      children: _selectedEvents
-          .map((event) => Container(
-        decoration: BoxDecoration(
-          border: Border.all(width: 0.8),
-          borderRadius: BorderRadius.circular(12.0),
-        ),
-        margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-        child: ListTile(
-          title: Text(event.toString()),
-          onTap: () => print('$event tapped!'),
-        ),
-      ))
-          .toList(),
-    );
-  }
-}

fast_med_flutter/lib/routes/home.dart

@@ -1,87 +0,0 @@
-import 'package:flutter/material.dart';
-
-class Home extends StatefulWidget{
-  @override
-  _HomeState createState() => _HomeState();
-}
-
-class _HomeState extends State<Home>{
-  @override
-  Widget build(BuildContext context){
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('Bienvenido'),
-        centerTitle: true,
-      ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/verOficinas');
-              },
-              child: Text('Ver Oficinas',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/calendario');
-              },
-              child: Text('Calendario',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/register');
-              },
-              child: Text('register',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/welcome');
-              },
-              child: Text('welcome',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            new FlatButton(
-              minWidth: 300.0,
-              height: 100.0,
-              onPressed: (){
-                Navigator.pushNamed(context, '/MyApp');
-              },
-              child: Text('MyApp',
-                style: TextStyle(fontSize: 36),
-              ),
-              color: Colors.purple,
-
-            ),
-            ],
-        ),
-
-      ),
-
-    );
-  }
-}

fast_med_flutter/lib/routes/main.dart

@@ -1,33 +0,0 @@
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'register.dart';
-import 'welcome.dart';
-
-// import 'dashboard_screen.dart';
-
-
-
-void main() =>  runApp(MyApp());
-
-
-
-class MyApp extends StatelessWidget{
-  
-  static const String title = "FastMed";
-
-  @override
-  Widget build(BuildContext context){
-    final textTheme = Theme.of(context).textTheme;
-    return MaterialApp(
-      title: title,
-      theme: ThemeData(
-        textTheme: GoogleFonts.cabinTextTheme(textTheme),
-        ),
-      home: WelcomePage(),
-    );
-  }
-
-}

fast_med_flutter/lib/routes/register.dart

@@ -1,161 +0,0 @@
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-
-//
-//Still to add: 
-//  Email verification, that the input has "@" and "."
-//  Send email and password to database
-//
-//
-//
-
-class RegisterPage extends StatefulWidget{
-  
-  RegisterPage({Key key, this.title}) : super(key: key);
-  final String title;
-
-  @override
-  _RegisterPageState createState() => _RegisterPageState();
-}
-
-class _RegisterPageState extends State<RegisterPage> {
-
-  TextEditingController email;
-  TextEditingController password;
-  TextEditingController confirmpass;
-
-  // Future<List> send_data() async {
-  //   final data = await
-  // }
-
-  String _SamePass(){
-    if(password == confirmpass){
-      return "Same password";
-    }
-    else{
-      return "Different passwords";
-    }
-  }
-
-  Widget _BackButton(BuildContext context){
-    return InkWell(
-      onTap: (){
-        Navigator.pop(context);
-      },
-      child: Row(
-        children: <Widget>[
-          Container(
-            padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-            child: Icon(Icons.arrow_back_ios, color: Colors.black),
-          ),
-          Text("Back",
-          style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-        ]
-      ),
-    );
-  }
-
-  Widget _SubmitButton(BuildContext context){
-    return InkWell(
-       onTap: (){
-
-       },
-      child: Container(
-        padding: EdgeInsets.symmetric(vertical: 10),
-        width: 250,
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          color: Colors.red,
-          borderRadius: BorderRadius.circular(30),
-        ),
-        child: Text(
-          "Submit",
-          style: TextStyle(fontSize: 22, color: Colors.white),
-        ),
-      ),
-    );
-  }
-
-  Widget _EntryField(String title, TextEditingController controller, {bool pass = false}){
-    return Container(
-      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-      
-        children: <Widget> [
-          Text(
-            title,
-            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-          ),
-          SizedBox(
-            height: 30
-          ),
-          TextField(
-            controller: controller,
-            obscureText: pass,
-            decoration: InputDecoration(
-              border: (
-                  UnderlineInputBorder()
-              ),
-            ),
-          )
-        ]
-      ),
-      
-    );
-  }
-
-  Widget _Fills(){
-    return Column(
-      children: <Widget> [
-      _EntryField("Email", email),
-      _EntryField("Password", password, pass: true),
-      _EntryField("Confirm Password", confirmpass, pass: true)
-    
-    ]
-    );
-  }
-
-//add column or stack
-  @override
-  Widget build(BuildContext context) {
-    final height = MediaQuery.of(context).size.height;
-    return Scaffold(
-      body: Container(
-        height: height,
-        child: Stack(
-          
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.symmetric(horizontal: 20),
-              child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                     SizedBox(
-                      height: 200,
-                    ),
-                    _Fills(),
-                    //Add code to verify if password and confirm password match
-                    SizedBox(
-                      height: 20,
-                    ),
-                    _SubmitButton(context),
-                  ],
-                ),
-              )
-            ),
-            Positioned(
-            top: 12, left: 20, child: _BackButton(context),
-          ),
-          ],
-          
-        ),
-      )
-    );
-  }
-    
-}
-

fast_med_flutter/lib/routes/ver_oficinas.dart

@@ -1,91 +0,0 @@
-import 'package:flutter/material.dart';
-import '../widgets/DataTableMySqlDemo/Oficina.dart';
-import '../widgets/DataTableMySqlDemo/Services.dart';
-import 'dart:async';
-
-class VerOficinas extends StatefulWidget{
-  VerOficinas() : super();
-  final String title = 'Oficinas';
-  @override
-  State<StatefulWidget> viewOficinas() {
-    //no se que hago, quizas no lo necesite
-    return null;
-  }
-  _VerOficinasState createState() => _VerOficinasState();
-}
-
-class _VerOficinasState extends State<VerOficinas>{
-  List<Oficina> _oficinas;
-  List<Oficina> _filterOficinas;
-  GlobalKey<ScaffoldState> _scaffoldKey;
-  TextEditingController _nameController;//
-  Oficina _selectOficina;
-  bool _isUpdateing;
-
-  @override
-  void initState() {
-    super.initState();
-    _oficinas = [];
-    // _filterOficinas = [];
-    _isUpdateing = false;
-    _scaffoldKey = GlobalKey();
-    _nameController = TextEditingController();
-    _getOficinas();
-  }
-
-  _getOficinas() {
-
-    return _oficinas;
-  }
-
-
-  @override
-  Widget build(BuildContext context){
-    Services.getOficinas().then((Oficinas) {
-      setState(() {
-        _oficinas = Oficinas;
-        //print(_oficinas);
-        //print("Length ${Oficinas.length}");
-      });
-
-    });
-    List<Oficina> lista =  _oficinas;
-    return Scaffold(
-      key: _scaffoldKey,
-      appBar: AppBar(
-        title: Text('Oficinas'),
-        centerTitle: true,
-        backgroundColor: Colors.purple,
-
-      ),
-      body: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            children: lista.map((Oficina data) {
-              return FlatButton(
-                minWidth: 300.0,
-                height: 100.0,
-                child: Text(data.name,
-                style: TextStyle(fontSize: 36),
-                ),
-                onPressed: () {
-                  print(data.name);
-                },
-                padding: new EdgeInsets.all(0.0),
-                color: Colors.purple,
-
-              );
-            }).toList(),
-          ),
-          // child: FlatButton(
-          //   onPressed: (){
-          //     _getOficinas();
-          //   },
-          //   child: Text('Ver Oficinas'),
-          //   color: Colors.purple,
-          // )
-      ),
-
-    );
-  }
-}

fast_med_flutter/lib/routes/welcome.dart

@@ -1,201 +0,0 @@
-
-
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'register.dart';
-
-
-
-
-
-class WelcomePage extends StatefulWidget {
-  WelcomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _WelcomePageState createState() => _WelcomePageState();
-}
-
-class _WelcomePageState extends State<WelcomePage> {
-
-  TextEditingController email;
-  TextEditingController password;
-
-  Widget _message(BuildContext context){
-    return RichText(
-      textAlign: TextAlign.center,
-      text: TextSpan(
-          text: "Don't have an account?",
-          style: GoogleFonts.cabin(
-              fontSize: 18,
-              color: Colors.black
-          )
-      ),
-    );
-  }
-
-  Widget _title(BuildContext context){
-    return RichText(
-      textAlign: TextAlign.center,
-      text: TextSpan(
-          text: "Welcome to FastMed",
-          style: GoogleFonts.cabin(
-              fontSize: 30,
-              color: Colors.red
-          )
-      ),
-    );
-
-  }
-
-  Widget _LoginField(String title, TextEditingController controller, {bool pass = false}){
-    return Container(
-      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-      child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-
-          children: <Widget> [
-            Text(
-              title,
-              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            ),
-            SizedBox(
-                height: 30
-            ),
-            TextField(
-              controller: controller,
-              obscureText: pass,
-              decoration: InputDecoration(
-                border: (
-                    UnderlineInputBorder(
-
-                    )
-                ),
-              ),
-            ),
-          ]
-      ),
-
-    );
-  }
-
-  Widget _Fills(){
-    return Column(
-        children: <Widget> [
-          _LoginField("Email", email),
-          _LoginField("Password", password, pass: true),
-
-        ]
-    );
-  }
-
-
-
-  // Widget _LogInButton(BuildContext context){
-  //   return InkWell(
-  //     // onTap: () {
-  //     //   Navigator.push(context, MaterialPageRoute(builder: (context)) => __LoginPage())
-  //     // },
-  //     child: Container(
-  //       // width: MediaQuery.of(context).size.width,
-  //       width: 200,
-  //       // height: ,
-  //       padding: EdgeInsets.symmetric(vertical:8),
-  //       alignment: Alignment.center,
-  //       decoration: BoxDecoration(
-  //         color: Colors.red,
-  //         // shape:
-  //
-  //         borderRadius: BorderRadius.circular(30),
-  //       ),
-  //       child: Text(
-  //         "Login",
-  //         style: TextStyle(fontSize: 25, color: Colors.white),
-  //       ),
-  //
-  //     )
-  //   );
-  // }
-
-  Widget _RegisterButton(BuildContext context){
-    return InkWell(
-        onTap: () {
-          Navigator.push(
-              context, MaterialPageRoute(builder: (context) => RegisterPage()));
-        },
-        child: Container(
-          // width: MediaQuery.of(context).size.width,
-          width: 180,
-          padding: EdgeInsets.symmetric(vertical:8),
-          alignment: Alignment.center,
-          decoration: BoxDecoration(
-            color: Colors.red,
-            // shape:
-
-            borderRadius: BorderRadius.circular(30),
-          ),
-          child: Text(
-            "Register",
-            style: TextStyle(fontSize: 22, color: Colors.white),
-          ),
-
-        )
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final height = MediaQuery.of(context).size.height;
-    return Scaffold(
-        body: Container(
-          height: height,
-          child:Container(
-            width: MediaQuery.of(context).size.width,
-            padding: EdgeInsets.symmetric(horizontal: 20),
-            // height: MediaQuery.of(context).size.height,
-            decoration: BoxDecoration(
-                borderRadius: BorderRadius.all(Radius.circular(4)),
-                boxShadow: [
-                  BoxShadow(
-                      color: Colors.white,
-                      offset: Offset(0,3),
-                      blurRadius: 5,
-                      spreadRadius: 2)
-                ]
-
-            ),
-            child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget> [
-                    SizedBox(
-                      height: 80,
-                    ),
-                    _title(context),
-                    SizedBox(
-                      height: 150,
-                    ),
-                    // _LogInButton(context),
-                    _Fills(),
-                    SizedBox(
-                      height: 60,
-                    ),
-                    _message(context),
-                    SizedBox(
-                      height: 10,
-                    ),
-                    _RegisterButton(context),
-                    SizedBox(
-                      height: 10,
-                    )
-                  ],
-                )
-            ),
-          ),
-        )
-    );
-  }
-}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Oficina.dart

@@ -1,13 +0,0 @@
-class Oficina {
-  String id;
-  String name;
-
-  Oficina({this.id, this.name});
-
-  factory Oficina.fromJson(Map<String, dynamic> json) {
-    return Oficina (
-      id :json['id'] as String,
-      name: json['name'] as String,
-    );
-  }
-}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Services.dart

@@ -1,46 +0,0 @@
-import 'dart:convert';
-import 'package:http/http.dart'
-  as http;
-import 'Oficina.dart';
-
-class Services {
-  static const URL = 'https://ada.uprrp.edu/~oniel.mendez2/json/oficinas.php';
-  static const URL_GET_ALL = 'ada.uprrp.edu/~oniel.mendez2/json/getOficinas.php';
-  static const URL_LOCAL = 'http://localhost/test/getOficinas.json';
-  static const _GET_ALL = "GET_ALL";
-
-  //get all oficinas
-  static Future<List<Oficina>> getOficinas() async {
-    try {
-      var map = Map<String, dynamic>();
-      map['action'] = _GET_ALL;
-      //print('antes');
-      final response = await http.get(URL_GET_ALL);
-      // print('despues');
-      // print('getOficinas Response: ${response.body}');
-      if (200 == response.statusCode) {
-        List<Oficina> list = parseResponse(response.body);
-
-        return list;
-      } else {
-        final response = '[{"id":"1","name":"no"},{"id":"2","name":"respondio"},{"id":"3","name":"code: 200"}]';
-        List<Oficina> list = parseResponse(response);
-        return list; // return an empty list on exception/error
-      }
-    } catch (e) {
-      final response = '[{"id":"1","name":"este"},{"id":"2","name":"es el"},{"id":"3","name":"catch(e)"}]';
-      List<Oficina> list = parseResponse(response);
-      return list; // return an empty list on exception/error
-    }
-  }
-
-  static List<Oficina> parseResponse(String responseBody) {
-    final parsed = json.decode(responseBody).cast<Map<String, dynamic>>();
-    return parsed.map<Oficina>((json) => Oficina.fromJson(json)).toList();
-  }
-
-  Future<http.Response> fetchAlbum() {
-    return http.get('https://jsonplaceholder.typicode.com/albums/1');
-  }
-
-}

fast_med_flutter/lib/widgets/MySQL_DataTable/dud.dart

@@ -1 +0,0 @@
-import 'dart:convert';

fast_med_flutter/lib/widgets/dud.dart

@@ -1 +0,0 @@
-import 'dart:convert';

fast_med_flutter/pubspec.lock

@@ -43,20 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0-nullsafety.3"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -71,79 +57,30 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0-nullsafety.1"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.2.1"
-  flushbar:
-    dependency: transitive
-    description:
-      name: flushbar
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.10.4"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_login:
-    dependency: "direct main"
-    description:
-      name: flutter_login
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.14"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
-  font_awesome_flutter:
-    dependency: transitive
-    description:
-      name: font_awesome_flutter
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "8.10.0"
-  google_fonts:
+  json_table:
     dependency: "direct main"
     description:
-      name: google_fonts
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
-  http:
-    dependency: "direct main"
-    description:
-      name: http
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.12.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
+      name: json_table
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
-  intl:
+    version: "1.4.0"
+  json_utilities:
     dependency: transitive
     description:
-      name: intl
+      name: json_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.1.3"
   matcher:
     dependency: transitive
     description:
@@ -157,14 +94,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.4"
+    version: "1.3.0-nullsafety.4"
   path:
     dependency: transitive
     description:
@@ -172,90 +102,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0-nullsafety.1"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.24"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.1+2"
-  path_provider_macos:
-    dependency: transitive
-    description:
-      name: path_provider_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.4+6"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.4+3"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.9.2"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.1"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.3"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.13"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.3.2+2"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
-  simple_gesture_detector:
-    dependency: transitive
-    description:
-      name: simple_gesture_detector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -274,7 +120,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
@@ -289,13 +135,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0-nullsafety.1"
-  table_calendar:
-    dependency: "direct main"
-    description:
-      name: table_calendar
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -310,13 +149,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.19-nullsafety.2"
-  transformer_page_view:
-    dependency: transitive
-    description:
-      name: transformer_page_view
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.6"
   typed_data:
     dependency: transitive
     description:
@@ -331,20 +163,5 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0-nullsafety.3"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.7.3"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.17.0 <2.0.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"

fast_med_flutter/pubspec.yaml

@@ -1,4 +1,4 @@
-name: fast_med_flutter
+name: flutter_app
 description: A new Flutter application.
 
 # The following line prevents the package from being accidentally published to
@@ -23,17 +23,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  json_table: 1.4.0
 
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.0
-  table_calendar: ^2,0,1
-  flutter_login: ^1.0.14
-  google_fonts: ^1.1.1
-
-  #
-  http: ^0.12.2
 
 dev_dependencies:
   flutter_test:

fast_med_flutter/test/widget_test.dart

@@ -8,12 +8,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:fast_med_flutter/main.dart';
+import 'package:flutter_app/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MaterialApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);