Merge branch 'elham' into 'master'

first step form add patient profile

See merge request Cloud_Solution/doctor_app_flutter!16
merge-requests/17/merge
Elham 6 years ago
commit 9ada2488e9

@ -1,4 +1,6 @@
import 'package:doctor_app_flutter/screens/patients/patient_profile_screen.dart';
import './screens/QR_reader_screen.dart'; import './screens/QR_reader_screen.dart';
import './screens/auth/change_password_screen.dart'; import './screens/auth/change_password_screen.dart';
import './screens/auth/login_screen.dart'; import './screens/auth/login_screen.dart';
@ -13,7 +15,7 @@ import './screens/patients/patient_search_screen.dart';
import './screens/patients/patients_screen.dart'; import './screens/patients/patients_screen.dart';
import './screens/settings/settings_screen.dart'; import './screens/settings/settings_screen.dart';
const String INIT_ROUTE = LOGIN; const String INIT_ROUTE = PATIENTS;
const String HOME = '/'; const String HOME = '/';
const String LOGIN = 'login'; const String LOGIN = 'login';
const String CHANGE_PASSWORD = 'change-password'; const String CHANGE_PASSWORD = 'change-password';
@ -23,15 +25,15 @@ const String MY_SCHEDULE = 'my-schedule';
const String QR_READER = 'qr-reader'; const String QR_READER = 'qr-reader';
const String PATIENT_SEARCH = 'patients/patient-search'; const String PATIENT_SEARCH = 'patients/patient-search';
const String PATIENTS = 'patients/patients'; const String PATIENTS = 'patients/patients';
const String PATIENTS_PROFILE = 'patients/patients-profile';
const String BLOOD_BANK = 'blood-bank'; const String BLOOD_BANK = 'blood-bank';
const String DOCTOR_REPLY = 'doctor-reply'; const String DOCTOR_REPLY = 'doctor-reply';
const String MEDICINE_SEARCH = 'medicine-search'; const String MEDICINE_SEARCH = 'medicine-search';
const String SETTINGS = 'settings'; const String SETTINGS = 'settings';
const LOADER ='loader';
var routes = { var routes = {
HOME: (_) => DashboardScreen(), HOME: (_) => DashboardScreen(),
INIT_ROUTE: (_) => Loginsreen(), LOGIN: (_) => Loginsreen(),
MY_SCHEDULE: (_) => MyScheduleScreen(), MY_SCHEDULE: (_) => MyScheduleScreen(),
PATIENT_SEARCH: (_) => PatientSearchScreen(), PATIENT_SEARCH: (_) => PatientSearchScreen(),
PATIENTS: (_) => PatientsScreen(), PATIENTS: (_) => PatientsScreen(),
@ -43,4 +45,5 @@ var routes = {
CHANGE_PASSWORD: (_) => ChangePasswordScreen(), CHANGE_PASSWORD: (_) => ChangePasswordScreen(),
VERIFY_ACCOUNT: (_) => VerifyAccountScreen(), VERIFY_ACCOUNT: (_) => VerifyAccountScreen(),
VERIFICATION_METHODS:(_)=> VerificationMethodsScreen(), VERIFICATION_METHODS:(_)=> VerificationMethodsScreen(),
PATIENTS_PROFILE:(_)=> PatientProfile()
}; };

@ -1,9 +1,11 @@
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class QrReaderScreen extends StatelessWidget { class QrReaderScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return AppScaffold(
appBar: AppBar(title: Text('QR Reader'),), appBarTitle: "QR Reader",
body: Container(),
); );
} }
} }

@ -0,0 +1,16 @@
import 'package:doctor_app_flutter/widgets/patients/patinet_profile_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
class PatientProfile extends StatelessWidget {
const PatientProfile({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return AppScaffold(
// child: child,
appBarTitle: 'Patient Profile',
body: PatientProfileWidget(),
);
}
}

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/routes.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/app_scaffold_widget.dart';
@ -16,13 +17,16 @@ class PatientsScreen extends StatelessWidget {
body: Container( body: Container(
child: Column( child: Column(
children: litems.map((item) { children: litems.map((item) {
return CardWithBgWidget( return InkWell(
line1Text: 'Fahad AlSlehm - 324599', child: CardWithBgWidget(
line2Text: '12/04/2020 - 02:00 PM', line1Text: 'Fahad AlSlehm - 324599',
// line3Text: '', line2Text: '12/04/2020 - 02:00 PM',
heightPercentage: 0.15,
heightPercentage: 0.15, widthPercentage: 0.80),
widthPercentage: 0.80); onTap: (){
Navigator.of(context).pushNamed(PATIENTS_PROFILE);
},
);
}).toList(), }).toList(),
), ),
), ),

@ -1,9 +1,11 @@
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class SettingsScreen extends StatelessWidget { class SettingsScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return AppScaffold(
appBarTitle: "SETTINS",
body: Container(),
); );
} }
} }

@ -0,0 +1,9 @@
import 'package:flutter/material.dart';
class PatientProfileWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
child: Center(child: Text('Heeeer Must be Patient Profile'),),
);
}
}

@ -1,8 +1,9 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/shared/drawer_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../config/size_config.dart';
import '../../widgets/shared/drawer_item_widget.dart';
import '../../widgets/shared/rounded_container_widget.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
// OWNER : Ibrahim albitar // OWNER : Ibrahim albitar
@ -21,9 +22,7 @@ class _AppDrawerState extends State<AppDrawer> {
child: Container( child: Container(
margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * 9), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * 9),
child: Drawer( child: Drawer(
child: ListView( child: ListView(padding: EdgeInsets.zero, children: <Widget>[
padding: EdgeInsets.zero,
children: <Widget>[
Container( Container(
height: SizeConfig.heightMultiplier * 30, height: SizeConfig.heightMultiplier * 30,
child: DrawerHeader( child: DrawerHeader(
@ -50,12 +49,21 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
), ),
DrawerItem("My Schedule", Icons.table_chart), InkWell(
DrawerItem("Settings", Icons.settings), child: DrawerItem("My Schedule", Icons.table_chart),
DrawerItem("QR Reader", Icons.search), onTap: () {
] Navigator.of(context).pushNamed(MY_SCHEDULE);
) },
), ),
InkWell(child: DrawerItem("Settings", Icons.settings), onTap: (){
Navigator.of(context).pushNamed(SETTINGS);
},),
InkWell(child: DrawerItem("QR Reader", Icons.search),onTap:(){
Navigator.of(context).pushNamed(QR_READER);
} ,),
])),
), ),
width: SizeConfig.realScreenWidth * 0.55, width: SizeConfig.realScreenWidth * 0.55,
margin: 0, margin: 0,

Loading…
Cancel
Save