Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development_new_design_2.0' into haroon-new-design

Browse Source
merge-requests/400/head
haroon amjad 3 years ago
parent 98837b2298 999a45c711
commit a2e25f7a7a
10 changed files with 92 additions and 85 deletions
Show Stats Download Patch File Download Diff File

4
lib/pages/BookAppointment/SearchResults.dart
Unescape Escape View File

@ -35,9 +35,9 @@ class _SearchResultsState extends State<SearchResults> {
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/MyAppointments/MyAppointments.dart
Unescape Escape View File

@ -341,9 +341,9 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/ask_doctor/ask_doctor_page.dart
Unescape Escape View File

@ -33,9 +33,9 @@ class AskDoctorPage extends StatelessWidget {
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/doctor/doctor_home_page.dart
Unescape Escape View File

@ -50,9 +50,9 @@ class DoctorHomePage extends StatelessWidget {
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/eye/EyeMeasurementsPage.dart
Unescape Escape View File

@ -44,9 +44,9 @@ class EyeMeasurementsPage extends StatelessWidget {
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/labs/labs_home_page.dart
Unescape Escape View File

@ -54,9 +54,9 @@ class LabsHomePage extends StatelessWidget {
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/prescriptions/prescriptions_page.dart
Unescape Escape View File

@ -44,9 +44,9 @@ class PrescriptionsPage extends StatelessWidget {
shrinkWrap: true, shrinkWrap: true,
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

4
lib/pages/medical/radiology/radiology_home_page.dart
Unescape Escape View File

@ -57,9 +57,9 @@ class RadiologyHomePage extends StatelessWidget {
padding: EdgeInsets.only(top: 12), padding: EdgeInsets.only(top: 12),
separatorBuilder: (context, index) { separatorBuilder: (context, index) {
return Container( return Container(
height: 1, height: 12,
margin: EdgeInsets.only(left: 21, right: 21), margin: EdgeInsets.only(left: 21, right: 21),
color: Color(0xffD9D9D9), // color: Color(0xffD9D9D9),
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {

6
lib/widgets/data_display/medical/doctor_card.dart
Unescape Escape View File

@ -54,9 +54,13 @@ class DoctorCard extends StatelessWidget {
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(10.0), Radius.circular(10.0),
), ),
border: Border.all(
width: 1, //
color: Color(0xffEFEFEF) // <--- border width here
),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Color(0xff000000).withOpacity(.05), color: Color(0xff000000).withOpacity(.01),
//spreadRadius: 5, //spreadRadius: 5,
blurRadius: 27, blurRadius: 27,
offset: Offset(0, -3), offset: Offset(0, -3),

139
lib/widgets/others/app_expandable_notifier.dart
Unescape Escape View File

@ -48,79 +48,82 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
_title = _title.toLowerCase().capitalizeFirstofEach; _title = _title.toLowerCase().capitalizeFirstofEach;
} }
return ExpandableNotifier( return ExpandableNotifier(
child: Column( child: Container(
children: <Widget>[ color: Colors.white,
SizedBox( child: Column(
child: widget.headerWidget, children: <Widget>[
), SizedBox(
ScrollOnExpand( child: widget.headerWidget,
scrollOnExpand: true, ),
scrollOnCollapse: false, ScrollOnExpand(
child: ExpandablePanel( scrollOnExpand: true,
hasIcon: false, scrollOnCollapse: false,
theme: const ExpandableThemeData( child: ExpandablePanel(
headerAlignment: ExpandablePanelHeaderAlignment.center, hasIcon: false,
tapBodyToCollapse: true, theme: const ExpandableThemeData(
), headerAlignment: ExpandablePanelHeaderAlignment.center,
header: Padding( tapBodyToCollapse: true,
padding: const EdgeInsets.only(top: 12, bottom: 12, left: 21, right: 21), ),
child: InkWell( header: Padding(
onTap: () { padding: const EdgeInsets.only(top: 12, bottom: 12, left: 21, right: 21),
setState(() { child: InkWell(
widget.expandFlag = !widget.expandFlag; onTap: () {
widget.controller.expanded = widget.expandFlag; setState(() {
}); widget.expandFlag = !widget.expandFlag;
}, widget.controller.expanded = widget.expandFlag;
child: Row( });
mainAxisAlignment: MainAxisAlignment.spaceBetween, },
children: [ child: Row(
Expanded( mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Column( children: [
mainAxisSize: MainAxisSize.min, Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ mainAxisSize: MainAxisSize.min,
if (_mainTitle.isNotEmpty && widget.isTitleSingleLine) crossAxisAlignment: CrossAxisAlignment.start,
Text( children: [
_mainTitle, if (_mainTitle.isNotEmpty && widget.isTitleSingleLine)
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 1), Text(
), _mainTitle,
if (_title.isNotEmpty && !widget.isTitleSingleLine) style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 1),
Text( ),
_title, if (_title.isNotEmpty && !widget.isTitleSingleLine)
maxLines: 1, Text(
style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24), _title,
), maxLines: 1,
if (_subTitle.isNotEmpty && !widget.isTitleSingleLine) style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, color: Color(0xff2E303A), letterSpacing: -1.44, height: 25 / 24),
Text( ),
_subTitle, if (_subTitle.isNotEmpty && !widget.isTitleSingleLine)
maxLines: 1, Text(
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.72, height: 23 / 12), _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),
);
},
), ),
), ],
], ),
), ),
); );
} }

Write Preview
Loading…
Cancel
Save