updates & fixes

merge-update-with-lab-changes
haroon amjad 5 years ago
parent a1f91d99b3
commit 468bb0356c

@ -62,7 +62,7 @@ class _ToDoState extends State<ToDo> {
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).todoList, appBarTitle: TranslationBase.of(context).todoList,
imagesInfo: imagesInfo, imagesInfo: imagesInfo,
isShowAppBar: true, isShowAppBar: false,
description: TranslationBase.of(context).infoTodo, description: TranslationBase.of(context).infoTodo,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
@ -212,17 +212,23 @@ class _ToDoState extends State<ToDo> {
), ),
Container( Container(
child: CountdownTimer( child: CountdownTimer(
endTime: DateTime.now().millisecondsSinceEpoch + endTime: DateTime.now()
.millisecondsSinceEpoch +
(widget.appoList[index] (widget.appoList[index]
.remaniningHoursTocanPay * .remaniningHoursTocanPay *
1000) * 1000) *
60, 60,
widgetBuilder: (_, CurrentRemainingTime time) { widgetBuilder:
(_, CurrentRemainingTime time) {
return Text( return Text(
'${time.days}:${time.hours}:${time.min}:${time.sec} ' + TranslationBase.of(context).upcomingTimeLeft, '${time.days}:${time.hours}:${time.min}:${time.sec} ' +
TranslationBase.of(
context)
.upcomingTimeLeft,
style: TextStyle( style: TextStyle(
fontSize: 12.0, fontSize: 12.0,
color: Color(0xff40ACC9))); color:
Color(0xff40ACC9)));
}, },
), ),
), ),
@ -529,7 +535,7 @@ class _ToDoState extends State<ToDo> {
}).catchError((err) { }).catchError((err) {
print(err); print(err);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
AppToast.showErrorToast(message: err); err != null ?? AppToast.showErrorToast(message: err);
}); });
} }

@ -81,7 +81,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
padding: EdgeInsets.symmetric(vertical: 5.0), padding: EdgeInsets.symmetric(vertical: 5.0),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
if(model.isLogin) if (model.isLogin)
Container( Container(
width: double.infinity, width: double.infinity,
height: 55, height: 55,
@ -112,26 +112,60 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
.myAppointmentsList, .myAppointmentsList,
hasBadge: true, hasBadge: true,
), ),
Positioned( projectViewModel.isArabic
? Positioned(
left: 0.0,
child: Badge(
toAnimate: false,
shape:
BadgeShape.circle,
badgeColor: Color(
0xFF40ACC9)
.withOpacity(1.0),
borderRadius:
BorderRadius
.circular(8),
badgeContent: Container(
padding:
EdgeInsets.all(
2.0),
child: Text(
appoCountProvider
.count
.toString(),
style: TextStyle(
color: Colors
.white,
fontSize:
16.0)),
),
),
)
: Positioned(
right: 0.0, right: 0.0,
child: Badge( child: Badge(
toAnimate: false, toAnimate: false,
position: shape:
BadgePosition.topEnd(), BadgeShape.circle,
shape: BadgeShape.circle, badgeColor: Color(
badgeColor: Color(0xFF40ACC9) 0xFF40ACC9)
.withOpacity(1.0), .withOpacity(1.0),
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius
.circular(8),
badgeContent: Container( badgeContent: Container(
padding: padding:
EdgeInsets.all(2.0), EdgeInsets.all(
2.0),
child: Text( child: Text(
appoCountProvider.count appoCountProvider
.count
.toString(), .toString(),
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors
fontSize: 16.0)), .white,
fontSize:
16.0)),
), ),
), ),
), ),
@ -156,7 +190,8 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).lab, title: TranslationBase.of(context).lab,
imagePath: 'lab_result_icon.png', imagePath: 'lab_result_icon.png',
subTitle: TranslationBase.of(context).labSubtitle, subTitle: TranslationBase.of(context)
.labSubtitle,
), ),
), ),
), ),

@ -27,17 +27,21 @@ class RadiologyDetailsPage extends StatelessWidget {
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Text('${finalRadiology.reportData}',textAlign: TextAlign.center,), Text('${finalRadiology.reportData}',textAlign: TextAlign.center,),
SizedBox(
height: 160.0,
)
], ],
), ),
), ),
bottomSheet: Container( bottomSheet: Container(
width: double.infinity, width: double.infinity,
height: MediaQuery.of(context).size.height * 0.2,
color: Colors.grey[100], color: Colors.grey[100],
child: Column( child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Divider(), Divider(),
Container( Container(

Loading…
Cancel
Save