From 04157e79939e032b915f458fb5007c510700732a Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 20 Apr 2020 13:22:02 +0300 Subject: [PATCH] fix the app drawer links --- lib/screens/QR_reader_screen.dart | 6 +++-- lib/screens/settings/settings_screen.dart | 6 +++-- lib/widgets/shared/app_drawer_widget.dart | 32 ++++++++++++++--------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index 7fbe385d..7a7baacf 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -1,9 +1,11 @@ +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; class QrReaderScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar(title: Text('QR Reader'),), + return AppScaffold( + appBarTitle: "QR Reader", + body: Container(), ); } } \ No newline at end of file diff --git a/lib/screens/settings/settings_screen.dart b/lib/screens/settings/settings_screen.dart index d276b4ad..ccb9b588 100644 --- a/lib/screens/settings/settings_screen.dart +++ b/lib/screens/settings/settings_screen.dart @@ -1,9 +1,11 @@ +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; class SettingsScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - + return AppScaffold( + appBarTitle: "SETTINS", + body: Container(), ); } } \ No newline at end of file diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index ea6ac000..e6a0b5fd 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,8 +1,9 @@ -import 'package:doctor_app_flutter/config/size_config.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:doctor_app_flutter/routes.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'; // OWNER : Ibrahim albitar @@ -21,9 +22,7 @@ class _AppDrawerState extends State { child: Container( margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * 9), child: Drawer( - child: ListView( - padding: EdgeInsets.zero, - children: [ + child: ListView(padding: EdgeInsets.zero, children: [ Container( height: SizeConfig.heightMultiplier * 30, child: DrawerHeader( @@ -50,12 +49,21 @@ class _AppDrawerState extends State { ), ), ), - DrawerItem("My Schedule", Icons.table_chart), - DrawerItem("Settings", Icons.settings), - DrawerItem("QR Reader", Icons.search), - ] - ) - ), + InkWell( + child: DrawerItem("My Schedule", Icons.table_chart), + 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, margin: 0,