From b26e750abb1c88b10228ebe4ea2c05fad0e7fe6f Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 17 Jun 2020 17:06:15 +0300 Subject: [PATCH] drawer design updated --- assets/images/cs_logo_container.png | Bin 0 -> 8731 bytes assets/images/logo.png | Bin 0 -> 13263 bytes lib/landing_page.dart | 16 +- lib/widgets/shared/app_drawer_widget.dart | 168 +++++++++++++-------- lib/widgets/shared/drawer_item_widget.dart | 28 ++-- 5 files changed, 123 insertions(+), 89 deletions(-) create mode 100644 assets/images/cs_logo_container.png create mode 100644 assets/images/logo.png diff --git a/assets/images/cs_logo_container.png b/assets/images/cs_logo_container.png new file mode 100644 index 0000000000000000000000000000000000000000..5f93858077f032c39221fcf1d666f674a7a0ff0c GIT binary patch literal 8731 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 literal 0 HcmV?d00001 diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 174a38ab..261d2897 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -9,7 +9,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; - class LandingPage extends StatefulWidget { @override _LandingPageState createState() => _LandingPageState(); @@ -39,7 +38,8 @@ class _LandingPageState extends State { elevation: 0, backgroundColor: Hexcolor('#515B5D'), textTheme: TextTheme( - headline6: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), + headline6: + TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), title: Text(getText(currentTab).toUpperCase()), leading: Builder( builder: (BuildContext context) { @@ -51,14 +51,8 @@ class _LandingPageState extends State { }, ), centerTitle: true, - - ), - drawer: Theme( - data: Theme.of(context).copyWith( - canvasColor: Colors.transparent, - ), - child: SafeArea(child: AppDrawer()), ), + drawer: SafeArea(child: AppDrawer()), extendBody: true, body: PageView( physics: NeverScrollableScrollPhysics(), @@ -71,7 +65,6 @@ class _LandingPageState extends State { ], ), bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab), - ); } @@ -85,7 +78,6 @@ class _LandingPageState extends State { return "SCHEDULE"; case 3: return 'SERVICES'; - } } -} \ 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 b2cd3dd9..d269398c 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -31,7 +32,7 @@ class _AppDrawerState extends State { void didChangeDependencies() { super.didChangeDependencies(); // if (_isInit) { - getDocProfile();// TODO: Refactor this code to prevent errors in the cosole. + getDocProfile(); // TODO: Refactor this code to prevent errors in the cosole. // } _isInit = false; } @@ -40,7 +41,7 @@ class _AppDrawerState extends State { Map profile = await sharedPref.getObj(DOCTOR_PROFILE); // doctorProfile = DoctorProfileModel.fromJson(profile); setState(() { - doctorProfile = DoctorProfileModel.fromJson(profile); + doctorProfile = DoctorProfileModel.fromJson(profile); }); String token = await sharedPref.getString(TOKEN); @@ -51,75 +52,118 @@ class _AppDrawerState extends State { // var x = getDocProfile(); return RoundedContainer( child: Container( - margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * 9), + color: Colors.white, + // margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * 2), child: Drawer( + child: Column(children: [ + Expanded( + flex: 4, child: ListView(padding: EdgeInsets.zero, children: [ - Container( - height: SizeConfig.heightMultiplier * 30, - child: InkWell( - child: DrawerHeader( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - CircleAvatar( - radius: SizeConfig.imageSizeMultiplier * 12, - backgroundImage: - NetworkImage(doctorProfile.doctorImageURL), - backgroundColor: Colors.transparent, + Container( + height: SizeConfig.heightMultiplier * 50, + child: InkWell( + child: DrawerHeader( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + child: Image.asset('assets/images/logo.png'), + margin: EdgeInsets.only(top: 10, bottom: 15), + ), + SizedBox( + height: 1, + child: Container( + color: Colors.black26, + ), + ), + SizedBox(height: 15), + CircleAvatar( + radius: SizeConfig.imageSizeMultiplier * 12, + backgroundImage: + NetworkImage(doctorProfile.doctorImageURL), + backgroundColor: Colors.white, + ), + Padding( + padding: EdgeInsets.only(top: 10), + child: AppText( + doctorProfile.doctorName, + fontWeight: FontWeight.bold, + color: Colors.black, + fontSize: SizeConfig.textMultiplier * 2, + )), + AppText( + "Director of medical records", //TODO: Make The Dr Title Dynamic and check overflow issue. + fontWeight: FontWeight.normal, + color: Colors.black87), + RaisedButton( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(18.0), + side: BorderSide(color: Colors.red)), + child: AppText( + 'Logout', + color: Colors.white, + ), + onPressed: () async { + await Helpers.clearSharedPref(); + Navigator.pop(context); + Navigator.of(context).pushNamed(LOGIN); + }, + ), + ], ), - Padding( - padding: EdgeInsets.only(top: 10), - child: AppText( - doctorProfile.doctorName, - - fontWeight: FontWeight.bold, - color: Colors.white, - fontSize: SizeConfig.textMultiplier * 2, - )), - AppText("Director of medical records",//TODO: Make The Dr Title Dynamic and check overflow issue. - fontWeight: FontWeight.normal, color: Colors.white) - ], + ), + onTap: () { + //Navigator.of(context).pushNamed(PROFILE); + Navigator.of(context).pushNamed(PROFILE, arguments: { + 'title': doctorProfile.doctorName, + "doctorProfileall": doctorProfile + }); + }, ), ), - onTap: () { - //Navigator.of(context).pushNamed(PROFILE); - Navigator.of(context).pushNamed(PROFILE, arguments: {'title':doctorProfile.doctorName, - "doctorProfileall": doctorProfile - }); - - }, - ), - ), - InkWell( - child: DrawerItem("Settings", Icons.settings), - onTap: () { - Navigator.pop(context); - Navigator.of(context).pushNamed(SETTINGS); - }, - ), - InkWell( - child: DrawerItem("QR Reader", Icons.search), - onTap: () { - Navigator.pop(context); - Navigator.of(context).pushNamed(QR_READER); - }, - ), - InkWell( - child: DrawerItem("lOGOUT", Icons.exit_to_app), - onTap: () async { - await Helpers.clearSharedPref(); - Navigator.pop(context); - Navigator.of(context).pushNamed(LOGIN); - }, + InkWell( + child: DrawerItem("Settings", Icons.settings), + onTap: () { + Navigator.pop(context); + Navigator.of(context).pushNamed(SETTINGS); + }, + ), + InkWell( + child: DrawerItem("QR Reader", DoctorApp.qr_code), + onTap: () { + Navigator.pop(context); + Navigator.of(context).pushNamed(QR_READER); + }, + ), + ]), ), + Expanded( + flex: 1, + child: Column(children: [ + Container( + // This align moves the children to the bottom + child: Align( + alignment: FractionalOffset.bottomCenter, + child: Container( + child: Column( + children: [ + Text("Powered by"), + Image.asset( + 'assets/images/cs_logo_container.png', + width: SizeConfig.imageSizeMultiplier * 30, + ) + ], + )))) + ])) ])), ), - width: SizeConfig.realScreenWidth * 0.55, + width: SizeConfig.realScreenWidth * 0.60, margin: 0, - customCornerRaduis: true, - topRight: 30, - bottomRight: 30, - backgroundColor: Color(0xff58434F), + + customCornerRaduis: false, + // topRight: 30, + // bottomRight: 30, + backgroundColor: Colors.white, ); } diff --git a/lib/widgets/shared/drawer_item_widget.dart b/lib/widgets/shared/drawer_item_widget.dart index a52d8812..c4fe25c1 100644 --- a/lib/widgets/shared/drawer_item_widget.dart +++ b/lib/widgets/shared/drawer_item_widget.dart @@ -11,15 +11,13 @@ import '../shared/app_texts_widget.dart'; // DESCRIPTION : Custom Drawer item for app. class DrawerItem extends StatefulWidget { - final String title; final String subTitle; final IconData icon; final Color color; + DrawerItem(this.title, this.icon, {this.color, this.subTitle = ''}); - DrawerItem(this.title, this.icon,{this.color, this.subTitle = ''}); - @override _DrawerItemState createState() => _DrawerItemState(); } @@ -34,26 +32,26 @@ class _DrawerItemState extends State { children: [ Icon( widget.icon, - color: widget.color??Colors.white, - size: SizeConfig.imageSizeMultiplier * 7, + color: widget.color ?? Colors.black87, + size: SizeConfig.imageSizeMultiplier * 5, ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - widget.title, - color: widget.color??Colors.white, - fontWeight: FontWeight.bold, + widget.title, + color: widget.color ?? Colors.black, + // fontWeight: FontWeight.bold, margin: 5, + fontSize: SizeConfig.textMultiplier * 2.3, + ), + AppText( + widget.subTitle, + visibility: !widget.subTitle.isNullOrEmpty(), + color: widget.color ?? Colors.black, + marginLeft: 5, fontSize: SizeConfig.textMultiplier * 2.5, ), - AppText( - widget.subTitle, - visibility: !widget.subTitle.isNullOrEmpty(), - color: widget.color??Colors.white, - marginLeft: 5, - fontSize: SizeConfig.textMultiplier * 2.5, - ), ], ), ],