diff --git a/lib/routes.dart b/lib/routes.dart index fd39d6fe..512274c4 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,25 +1,38 @@ -import 'package:doctor_app_flutter/screens/patients/patients_list_screen.dart'; - -import './screens/patients/patient_search_screen.dart'; - -import './screens/my_schedule_screen.dart'; - +import './screens/QR_reader_screen.dart'; import './screens/auth/login_screen.dart'; +import './screens/blood_bank_screen.dart'; +import './screens/doctor_reply_screen.dart'; import './screens/home_screen.dart'; +import './screens/medicine/medicine_search_screen.dart'; +import './screens/my_schedule_screen.dart'; +import './screens/patients/patient_search_screen.dart'; +import './screens/patients/patients_list_screen.dart'; const String INIT_ROUTE = 'login'; const String HOME = '/'; const String LOGIN = 'login'; const String MY_SCHEDULE = 'my-schedule'; -const String QR_READER = 'my-schedule'; +const String QR_READER = 'qr_reader'; const String PATIENT_SEARCH = 'patients/patient-search'; const String PATIENTS = 'patients/patients'; +const String BLOOD_BANK = 'blood_bank'; +const String DOCTOR_REPLY = 'doctor_reply'; +const String MEDICINE_SEARCH='medicine_search'; + + + var routes = { HOME:(_)=>HomeScreen(), INIT_ROUTE:(_)=>Loginsreen(), MY_SCHEDULE:(_)=>MyScheduleScreen(), - PATIENT_SEARCH:(_)=>PatientSearch(), - PATIENTS:(_)=>PatientsList() + PATIENT_SEARCH:(_)=>PatientSearchScreen(), + PATIENTS:(_)=>PatientsListScreen(), + QR_READER:(_)=>QrReaderScreen(), + BLOOD_BANK:(_)=>BloodBankScreen(), + DOCTOR_REPLY:(_)=>DoctorReplyScreen(), + MEDICINE_SEARCH:(_)=>MedicineSearchScreen() + + }; diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index e69de29b..7fbe385d 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; +class QrReaderScreen extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: Text('QR Reader'),), + ); + } +} \ No newline at end of file diff --git a/lib/screens/blood_bank_screen.dart b/lib/screens/blood_bank_screen.dart new file mode 100644 index 00000000..767be58f --- /dev/null +++ b/lib/screens/blood_bank_screen.dart @@ -0,0 +1,11 @@ +import 'package:flutter/material.dart'; +class BloodBankScreen + + extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: Text("Blood Bank"),), + ); + } +} \ No newline at end of file diff --git a/lib/screens/doctor_reply_screen.dart b/lib/screens/doctor_reply_screen.dart new file mode 100644 index 00000000..2233526b --- /dev/null +++ b/lib/screens/doctor_reply_screen.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; +class DoctorReplyScreen extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar(title: Text('DoctorReply'),), + ); + } +} \ No newline at end of file diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index f9e471fd..e8a7ca0a 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -1,3 +1,5 @@ +import 'package:doctor_app_flutter/routes.dart'; + import '../widgets/home/home_item.dart'; import '../widgets/shared/app.drawer.dart'; import 'package:flutter/material.dart'; @@ -6,12 +8,13 @@ class Category { final String id; final String title; final String image; + final String link; - const Category({ - @required this.id, - @required this.title, - this.image, - }); + const Category( + {@required this.id, + @required this.title, + @required this.image, + @required this.link}); } class HomeScreen extends StatelessWidget { @@ -19,65 +22,65 @@ class HomeScreen extends StatelessWidget { Widget build(BuildContext context) { const DUMMY_CATEGORIES = const [ Category( - id: 'c1', - title: 'My Schedule', - image: 'assets/images/user_id_icon.png', - ), + id: 'c1', + title: 'My Schedule', + image: 'assets/images/user_id_icon.png', + link: MY_SCHEDULE), Category( - id: 'c2', - title: 'Patient Search', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c3', - title: 'outPatiant', - image: 'assets/images/user_id_icon.png', - ), + id: 'c2', + title: 'Patient Search', + image: 'assets/images/user_id_icon.png', + link: PATIENT_SEARCH), Category( - id: 'c2', - title: 'InPatiant', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c1', - title: 'Referral', - image: 'assets/images/user_id_icon.png', - ), + id: 'c3', + title: 'outPatiant', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), Category( - id: 'c2', - title: 'Referred', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c2', - title: 'Discharged Patient', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c3', - title: 'Referral Discharge', - image: 'assets/images/user_id_icon.png', - ), + id: 'c4', + title: 'InPatiant', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), Category( - id: 'c2', - title: 'Search For Medicine', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c1', - title: 'Doctor Reply', - image: 'assets/images/user_id_icon.png', - ), + id: 'c5', + title: 'Referral', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), Category( - id: 'c2', - title: 'Blood Bank', - image: 'assets/images/user_id_icon.png', - ), - Category( - id: 'c1', - title: 'QR Reader', - image: 'assets/images/user_id_icon.png', - ), + id: 'c6', + title: 'Referred', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), + Category( + id: 'c7', + title: 'Discharged Patient', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), + Category( + id: 'c8', + title: 'Referral Discharge', + image: 'assets/images/user_id_icon.png', + link: PATIENTS), + Category( + id: 'c9', + title: 'Search For Medicine', + image: 'assets/images/user_id_icon.png', + link: MEDICINE_SEARCH), + Category( + id: 'c10', + title: 'Doctor Reply', + image: 'assets/images/user_id_icon.png', + link: DOCTOR_REPLY), + Category( + id: 'c11', + title: 'Blood Bank', + image: 'assets/images/user_id_icon.png', + link: BLOOD_BANK), + Category( + id: 'c12', + title: 'QR Reader', + image: 'assets/images/user_id_icon.png', + link: QR_READER), ]; return Scaffold( appBar: AppBar( @@ -87,7 +90,8 @@ class HomeScreen extends StatelessWidget { body: GridView( padding: EdgeInsets.all(25), children: DUMMY_CATEGORIES - .map((data) => HomeItem(data.id, data.title, data.image)) + .map((data) => + HomeItem(data.id, data.title, data.image, data.link)) .toList(), gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( maxCrossAxisExtent: 200, diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart new file mode 100644 index 00000000..11e4d6ea --- /dev/null +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; +class MedicineSearchScreen extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container( + + ); + } +} \ No newline at end of file diff --git a/lib/screens/my_schedule_screen.dart b/lib/screens/my_schedule_screen.dart index 6ef83634..c7775c10 100644 --- a/lib/screens/my_schedule_screen.dart +++ b/lib/screens/my_schedule_screen.dart @@ -1,11 +1,9 @@ -import 'package:doctor_app_flutter/widgets/shared/app.drawer.dart'; import 'package:flutter/material.dart'; class MyScheduleScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( appBar: AppBar(title: Text("My Schedule"),), - drawer: AppDrawer(), ); } } \ No newline at end of file diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index ab393ac0..e921173e 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -7,12 +7,12 @@ import 'package:hexcolor/hexcolor.dart'; import '../../lookups/patient_lookup.dart'; import '../../models/patient_model.dart'; -class PatientSearch extends StatefulWidget { +class PatientSearchScreen extends StatefulWidget { @override - _PatientSearchState createState() => _PatientSearchState(); + _PatientSearchScreenState createState() => _PatientSearchScreenState(); } -class _PatientSearchState extends State { +class _PatientSearchScreenState extends State { String _selectedType = '1'; String _selectedLocation = '1'; diff --git a/lib/screens/patients/patients_list_screen.dart b/lib/screens/patients/patients_list_screen.dart index 0f1a9390..fb7e2a78 100644 --- a/lib/screens/patients/patients_list_screen.dart +++ b/lib/screens/patients/patients_list_screen.dart @@ -3,12 +3,12 @@ import '../../providers/patients_provider.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -class PatientsList extends StatefulWidget { +class PatientsListScreen extends StatefulWidget { @override - _PatientsListState createState() => _PatientsListState(); + _PatientsListScreenState createState() => _PatientsListScreenState(); } -class _PatientsListState extends State { +class _PatientsListScreenState extends State { var _isInit = true; var _isLoading = true; var _hasError; @@ -39,7 +39,7 @@ class _PatientsListState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text('PatientsList'), + title: Text('PatientsListScreen'), ), body: _isLoading ? Center( diff --git a/lib/widgets/home/home_item.dart b/lib/widgets/home/home_item.dart index a4aa5f5d..59e606d8 100644 --- a/lib/widgets/home/home_item.dart +++ b/lib/widgets/home/home_item.dart @@ -1,15 +1,16 @@ -import 'package:doctor_app_flutter/routes.dart'; import 'package:flutter/material.dart'; class HomeItem extends StatelessWidget { final String id; final String title; final String image; - HomeItem(this.id, this.title, this.image); + final String link; + + HomeItem(this.id, this.title, this.image,this.link); @override Widget build(BuildContext context) { return InkWell( - onTap: () => selectItem(context, id), + onTap: () => selectItem(context, link), splashColor: Colors.red, child: Container( padding: EdgeInsets.all(5), @@ -46,11 +47,8 @@ class HomeItem extends StatelessWidget { ); } - void selectItem(BuildContext ctx, id) { - String route; - if (id == 'c2') { - route = PATIENT_SEARCH; - } + void selectItem(BuildContext ctx, route) { + print(route); Navigator.of(ctx).pushNamed(route, arguments: { 'id': id, 'title': title, diff --git a/lib/widgets/shared/app.drawer.dart b/lib/widgets/shared/app.drawer.dart index 57fc8651..de56a6a0 100644 --- a/lib/widgets/shared/app.drawer.dart +++ b/lib/widgets/shared/app.drawer.dart @@ -10,6 +10,13 @@ class AppDrawer extends StatelessWidget { AppBar( title: Text('Hi form Elham!!'), ), + ListTile( + title: Text('Home'), + leading: Icon(Icons.tab), + onTap: () { + drawerNavigator(context, HOME); + }, + ), Divider(), ListTile( title: Text('My Schedule'),