From 999a45c711074d50fa3366a02e22d16448fd0c82 Mon Sep 17 00:00:00 2001 From: "Mirza.Shafique" Date: Mon, 27 Sep 2021 15:59:46 +0300 Subject: [PATCH] App Expendable Design Change --- lib/pages/BookAppointment/SearchResults.dart | 4 +- lib/pages/MyAppointments/MyAppointments.dart | 4 +- .../medical/ask_doctor/ask_doctor_page.dart | 4 +- .../medical/doctor/doctor_home_page.dart | 4 +- .../medical/eye/EyeMeasurementsPage.dart | 4 +- lib/pages/medical/labs/labs_home_page.dart | 4 +- .../prescriptions/prescriptions_page.dart | 4 +- .../radiology/radiology_home_page.dart | 4 +- .../data_display/medical/doctor_card.dart | 6 +- .../others/app_expandable_notifier.dart | 139 +++++++++--------- 10 files changed, 92 insertions(+), 85 deletions(-) diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index 97dfc187..f72951bc 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -36,9 +36,9 @@ class _SearchResultsState extends State { physics: BouncingScrollPhysics(), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart index dff915cc..fe1b381a 100644 --- a/lib/pages/MyAppointments/MyAppointments.dart +++ b/lib/pages/MyAppointments/MyAppointments.dart @@ -343,9 +343,9 @@ class _MyAppointmentsState extends State with SingleTickerProvid padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/ask_doctor/ask_doctor_page.dart b/lib/pages/medical/ask_doctor/ask_doctor_page.dart index 098f87ea..ccff9042 100644 --- a/lib/pages/medical/ask_doctor/ask_doctor_page.dart +++ b/lib/pages/medical/ask_doctor/ask_doctor_page.dart @@ -33,9 +33,9 @@ class AskDoctorPage extends StatelessWidget { padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/doctor/doctor_home_page.dart b/lib/pages/medical/doctor/doctor_home_page.dart index ffa3c820..fcb1fd67 100644 --- a/lib/pages/medical/doctor/doctor_home_page.dart +++ b/lib/pages/medical/doctor/doctor_home_page.dart @@ -55,9 +55,9 @@ class DoctorHomePage extends StatelessWidget { physics: BouncingScrollPhysics(), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/eye/EyeMeasurementsPage.dart b/lib/pages/medical/eye/EyeMeasurementsPage.dart index 8c1b656a..5a2b4d03 100644 --- a/lib/pages/medical/eye/EyeMeasurementsPage.dart +++ b/lib/pages/medical/eye/EyeMeasurementsPage.dart @@ -48,9 +48,9 @@ class EyeMeasurementsPage extends StatelessWidget { padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index 471c2d10..d802563b 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -55,9 +55,9 @@ class LabsHomePage extends StatelessWidget { padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/prescriptions/prescriptions_page.dart b/lib/pages/medical/prescriptions/prescriptions_page.dart index da6f6761..f8991b50 100644 --- a/lib/pages/medical/prescriptions/prescriptions_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_page.dart @@ -44,9 +44,9 @@ class PrescriptionsPage extends StatelessWidget { shrinkWrap: true, separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index ae2ded5b..097bcf1f 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -58,9 +58,9 @@ class RadiologyHomePage extends StatelessWidget { padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { return Container( - height: 1, + height: 12, margin: EdgeInsets.only(left: 21, right: 21), - color: Color(0xffD9D9D9), + // color: Color(0xffD9D9D9), ); }, itemBuilder: (context, index) { diff --git a/lib/widgets/data_display/medical/doctor_card.dart b/lib/widgets/data_display/medical/doctor_card.dart index f333ab3c..33e08399 100644 --- a/lib/widgets/data_display/medical/doctor_card.dart +++ b/lib/widgets/data_display/medical/doctor_card.dart @@ -54,9 +54,13 @@ class DoctorCard extends StatelessWidget { borderRadius: BorderRadius.all( Radius.circular(10.0), ), + border: Border.all( + width: 1, // + color: Color(0xffEFEFEF) // <--- border width here + ), boxShadow: [ BoxShadow( - color: Color(0xff000000).withOpacity(.05), + color: Color(0xff000000).withOpacity(.01), //spreadRadius: 5, blurRadius: 27, offset: Offset(0, -3), diff --git a/lib/widgets/others/app_expandable_notifier.dart b/lib/widgets/others/app_expandable_notifier.dart index 042cad0c..d6fd59be 100644 --- a/lib/widgets/others/app_expandable_notifier.dart +++ b/lib/widgets/others/app_expandable_notifier.dart @@ -50,79 +50,82 @@ class _AppExpandableNotifier extends State { _title = _title.toLowerCase().capitalizeFirstofEach; } return ExpandableNotifier( - child: Column( - children: [ - SizedBox( - child: widget.headerWidget, - ), - ScrollOnExpand( - scrollOnExpand: true, - scrollOnCollapse: false, - child: ExpandablePanel( - hasIcon: false, - theme: const ExpandableThemeData( - headerAlignment: ExpandablePanelHeaderAlignment.center, - tapBodyToCollapse: true, - ), - header: Padding( - padding: const EdgeInsets.only(top: 12, bottom: 12, left: 21, right: 21), - child: InkWell( - onTap: () { - setState(() { - widget.expandFlag = !widget.expandFlag; - widget.controller.expanded = widget.expandFlag; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (_mainTitle.isNotEmpty && widget.isTitleSingleLine) - Text( - _mainTitle, - style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 1), - ), - if (_title.isNotEmpty && !widget.isTitleSingleLine) - Text( - _title, - maxLines: 1, - style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24), - ), - if (_subTitle.isNotEmpty && !widget.isTitleSingleLine) - Text( - _subTitle, - maxLines: 1, - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12), - ), - ], + child: Container( + color: Colors.white, + child: Column( + children: [ + SizedBox( + child: widget.headerWidget, + ), + ScrollOnExpand( + scrollOnExpand: true, + scrollOnCollapse: false, + child: ExpandablePanel( + hasIcon: false, + theme: const ExpandableThemeData( + headerAlignment: ExpandablePanelHeaderAlignment.center, + tapBodyToCollapse: true, + ), + header: Padding( + padding: const EdgeInsets.only(top: 12, bottom: 12, left: 21, right: 21), + child: InkWell( + onTap: () { + setState(() { + widget.expandFlag = !widget.expandFlag; + widget.controller.expanded = widget.expandFlag; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (_mainTitle.isNotEmpty && widget.isTitleSingleLine) + Text( + _mainTitle, + style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 1), + ), + if (_title.isNotEmpty && !widget.isTitleSingleLine) + Text( + _title, + maxLines: 1, + style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24), + ), + if (_subTitle.isNotEmpty && !widget.isTitleSingleLine) + Text( + _subTitle, + maxLines: 1, + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12), + ), + ], + ), + ), + Icon( + widget.expandFlag ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down, + color: Color(0xff2E303A), + // size: 30.0, ), - ), - Icon( - widget.expandFlag ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down, - color: Color(0xff2E303A), - // size: 30.0, - ), - ], + ], + ), ), ), + collapsed: widget.collapsed ?? Container(), + expanded: widget.bodyWidget, + builder: (_, collapsed, expanded) { + return Expandable( + controller: widget.controller, + collapsed: collapsed, + expanded: expanded, + theme: const ExpandableThemeData(crossFadePoint: 0), + ); + }, ), - collapsed: widget.collapsed ?? Container(), - expanded: widget.bodyWidget, - builder: (_, collapsed, expanded) { - return Expandable( - controller: widget.controller, - collapsed: collapsed, - expanded: expanded, - theme: const ExpandableThemeData(crossFadePoint: 0), - ); - }, ), - ), - ], + ], + ), ), ); }