Merge branch 'mirza_home_page' into development_new_design_2.0

# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
merge-requests/437/merge
Mirza.Shafique 3 years ago
commit 792bb4df0b

@ -0,0 +1,8 @@
<svg id="user_21_" data-name="user (21)" xmlns="http://www.w3.org/2000/svg" width="110.999" height="110.999" viewBox="0 0 110.999 110.999">
<path id="Path_4696" data-name="Path 4696" d="M272.482,267.883a25.756,25.756,0,0,0,5.549-15.868,26.015,26.015,0,1,0-26.015,26.015,25.756,25.756,0,0,0,15.868-5.549l14.569,14.569a3.252,3.252,0,1,0,4.6-4.6ZM260.818,256.22a3.252,3.252,0,1,1-4.6,4.6l-4.2-4.2-4.2,4.2a3.252,3.252,0,0,1-4.6-4.6l4.2-4.2-4.2-4.2a3.252,3.252,0,0,1,4.6-4.6l4.2,4.2,4.2-4.2a3.252,3.252,0,1,1,4.6,4.6l-4.2,4.2Z" transform="translate(-177.004 -177.004)" fill="#ddd"/>
<circle id="Ellipse_165" data-name="Ellipse 165" cx="3.5" cy="3.5" r="3.5" transform="translate(35.5 19.499)" fill="#ddd"/>
<path id="Path_4697" data-name="Path 4697" d="M197.516,362h0Z" transform="translate(-154.695 -283.52)" fill="#ddd"/>
<path id="Path_4698" data-name="Path 4698" d="M197.516,332h0Z" transform="translate(-154.695 -260.021)" fill="#ddd"/>
<path id="Path_4699" data-name="Path 4699" d="M3.252,111H75.011a3.25,3.25,0,0,0,3.252-3.252v-.329a31.763,31.763,0,0,1-3.252.329,32.393,32.393,0,0,1-23.165-9.756H16.476a3.252,3.252,0,0,1,0-6.5H47.016v0a32.2,32.2,0,0,1-2.865-6.507H16.476a3.252,3.252,0,0,1,0-6.5H42.821c-.454-4.484-.454-2.022,0-6.5H16.476a3.252,3.252,0,1,1,0-6.5H44.152a32.468,32.468,0,0,1,7.694-13.009H26.232a3.25,3.25,0,0,1-3.252-3.252V45.96A13.021,13.021,0,0,1,35.988,32.953H39.24A9.756,9.756,0,1,1,49,23.2a9.767,9.767,0,0,1-9.756,9.756h3.252A13.021,13.021,0,0,1,55.5,45.96v3.252c0,.071-.036.13-.04.2a32.2,32.2,0,0,1,19.552-6.7,31.762,31.762,0,0,1,3.252.329V3.252A3.25,3.25,0,0,0,75.011,0H3.252A3.25,3.25,0,0,0,0,3.252v104.5A3.25,3.25,0,0,0,3.252,111Z" fill="#ddd"/>
<path id="Path_4700" data-name="Path 4700" d="M142.5,182a6.512,6.512,0,0,0-6.5,6.5h19.512a6.512,6.512,0,0,0-6.5-6.5Z" transform="translate(-106.516 -142.543)" fill="#ddd"/>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -118,11 +118,9 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
Container(
width: double.infinity,
padding: EdgeInsets.only(left: 12, right: 12, top: 12),
child: Card(
shape: cardRadius(12),
elevation: 2,
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
color: Color(0xffcd9e1b),
clipBehavior: Clip.antiAlias,
child: Container(
// decoration: containerColorRadiusLeft(Colors.white, 12),

@ -93,9 +93,8 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
SizedBox(
height: 12,
),
Card(
shape: cardRadius(12),
elevation: 4,
Container(
decoration: cardRadius(12),
child: Container(
padding: EdgeInsets.all(8),
child: Column(
@ -119,10 +118,9 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
height: 200,
decoration: containerColorRadiusBorder(Colors.white, 12, Colors.grey),
clipBehavior: Clip.antiAlias,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
clipBehavior: Clip.antiAlias,
elevation: 0,
margin: const EdgeInsets.all(0),
// child: GoogleMap(
// mapType: MapType.normal,

@ -161,10 +161,9 @@ class _NewCMCStepTowPageState extends State<NewCMCStepTowPage> {
body: Column(
children: [
if (widget.model.addressesList.isNotEmpty)
Card(
Container(
margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
shape: cardRadius(12),
elevation: 3,
decoration: cardRadius(12),
child: Container(
child: InkWell(
onTap: () => confirmSelectLocationDialog(widget.model.addressesList),

@ -171,10 +171,9 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
),
),
),
Card(
Container(
margin: EdgeInsets.zero,
shape: cardRadius(0),
elevation: 20,
decoration: cardRadius(0),
child: Container(
// color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(12),

@ -166,10 +166,9 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
),
),
),
Card(
Container(
margin: EdgeInsets.zero,
shape: cardRadius(0),
elevation: 20,
decoration: cardRadius(0),
child: Container(
width: double.infinity,
padding: EdgeInsets.all(12),

@ -29,9 +29,8 @@ class _ReferralDetailsState extends State<ReferralDetails> {
children: [
Container(
width: double.infinity,
child: Card(
elevation: 0.0,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin:
EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(

@ -204,9 +204,8 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
),
);
},
child: Card(
elevation: 0.0,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(

@ -141,10 +141,9 @@ class _NewHomeHealthCareStepTowPageState extends State<NewHomeHealthCareStepTowP
body: Column(
children: [
if (widget.model.addressesList.isNotEmpty)
Card(
Container(
margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
shape: cardRadius(12),
elevation: 3,
decoration: cardRadius(12),
child: Container(
child: InkWell(
onTap: () => confirmSelectLocationDialog(widget.model.addressesList),

@ -104,10 +104,9 @@ class _BookConfirmState extends State<BookConfirm> {
),
),
mHeight(20),
Card(
shape: cardRadius(12),
Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
elevation: 0,
child: Padding(
padding: const EdgeInsets.fromLTRB(16, 20, 16, 20),
child: Column(
@ -138,9 +137,8 @@ class _BookConfirmState extends State<BookConfirm> {
),
),
mHeight(12),
Card(
shape: cardRadius(12),
elevation: 0,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
child: Padding(
padding: const EdgeInsets.fromLTRB(16, 20, 16, 20),

@ -111,8 +111,8 @@ class _BookReminderPageState extends State<BookReminderPage> {
if (isSuccessShow)
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.all(10),
child: Padding(
padding: const EdgeInsets.all(16.0),

@ -163,8 +163,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
}
Widget _buildTableCalendarWithBuilders() {
return Card(
shape: cardRadius(12),
return Container(
decoration: cardRadius(12),
margin: EdgeInsets.all(16),
clipBehavior: Clip.antiAlias,
child: Padding(

@ -17,9 +17,8 @@ class DoctorInformation extends StatelessWidget {
children: <Widget>[
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
elevation: 0,
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: EdgeInsets.all(16),
child: Column(
@ -88,9 +87,8 @@ class DoctorInformation extends StatelessWidget {
mHeight(8),
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
elevation: 0,
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: EdgeInsets.all(16),
child: Column(

@ -146,8 +146,8 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots> with TickerProviderStat
),
),
mHeight(12),
Card(
shape: cardRadius(12),
Container(
decoration: cardRadius(12),
child: _buildTableCalendarWithBuilders(projectViewModel),
),
mHeight(12),
@ -201,10 +201,9 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots> with TickerProviderStat
),
),
),
Card(
elevation: 20,
Container(
margin: EdgeInsets.zero,
shape: cardRadius(0),
decoration: cardRadius(0),
child: Container(
width: double.infinity,
padding: EdgeInsets.all(12),

@ -62,8 +62,8 @@ class CovidDirveThruQuestionsState extends State<CovidDirveThruQuestions> {
children: [
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -177,9 +177,8 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
onTap: () {
getDirections();
},
child: Card(
shape: cardRadius(1000),
elevation: 4,
child: Container(
decoration: cardRadius(1000),
margin: EdgeInsets.all(12),
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 12, top: 6, bottom: 6),

@ -87,9 +87,9 @@ class _CovidPaymentAlertState extends State<CovidPaymentAlert> {
mHeight(20),
Container(
width: double.infinity,
child: Card(
child: Container(
margin: EdgeInsets.zero,
shape: cardRadius(12),
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(

@ -151,8 +151,8 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
),
),
Card(
shape: cardRadius(12),
Container(
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(

@ -173,8 +173,8 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
Widget showDetail(String title, String value) {
return Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -85,14 +85,18 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
projectViewModel = Provider.of(context);
toDoProvider = Provider.of<ToDoCountProviderModel>(context);
return AppScaffold(
appBarTitle: TranslationBase.of(context).myFamilyFiles,
appBarTitle: TranslationBase
.of(context)
.myFamilyFiles,
isShowAppBar: widget.isAppbarVisible,
imagesInfo: imagesInfo,
showNewAppBar: true,
showNewAppBarTitle: true,
onTap: widget.isAppbarVisible == false ? widget.onBackClick : null,
icon: "assets/images/new/bottom_nav/family_files.svg",
description: TranslationBase.of(context).familyInfo,
description: TranslationBase
.of(context)
.familyInfo,
body: Column(
children: [
TabBar(
@ -114,7 +118,12 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
tabs: [Text(TranslationBase.of(context).family), Text(TranslationBase.of(context).request)],
tabs: [Text(TranslationBase
.of(context)
.family), Text(TranslationBase
.of(context)
.request)
],
),
Expanded(
child: (user != null && projectViewModel.isLogin)
@ -128,11 +137,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
],
),
bottomSheet: Container(
color: Theme.of(context).scaffoldBackgroundColor,
color: Theme
.of(context)
.scaffoldBackgroundColor,
width: double.infinity,
padding: EdgeInsets.all(14),
child: DefaultButton(
TranslationBase.of(context).addFamilyMember,
TranslationBase
.of(context)
.addFamilyMember,
() async {
Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE);
},
@ -156,20 +169,25 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading...'));
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
.of(context)
.noDataAvailable));
else
return ListView.separated(
itemBuilder: (context, index) {
snapshot.data.getAllSharedRecordsByStatusList[index].gender = 2;
if (snapshot.data.getAllSharedRecordsByStatusList[index].status == 3)
return Card(
return Container(
margin: EdgeInsets.all(5),
shape: cardRadius(15),
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0xffFDA4B0) : Color(0xff6EA8FF),
elevation: 0.0,
decoration: cardRadius(15, elevation: 0, color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0xffFDA4B0) : Color(0xff6EA8FF),),
child: Container(
// height: 130,0xffFDA4B0
width: MediaQuery.of(context).size.width,
width: MediaQuery
.of(context)
.size
.width,
padding: EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -178,17 +196,23 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(
snapshot.data.getAllSharedRecordsByStatusList[index].patientName.toLowerCase().capitalizeFirstofEach,
snapshot.data.getAllSharedRecordsByStatusList[index].patientName
.toLowerCase()
.capitalizeFirstofEach,
fontSize: 22,
fontWeight: FontWeight.bold,
color: Colors.white,
),
Texts(TranslationBase.of(context).fileNumber + ': ' + snapshot.data.getAllSharedRecordsByStatusList[index].responseID.toString(),
Texts(TranslationBase
.of(context)
.fileNumber + ': ' + snapshot.data.getAllSharedRecordsByStatusList[index].responseID.toString(),
fontSize: 12, color: Colors.white),
Texts(
snapshot.data.getAllSharedRecordsByStatusList[index].age.toString() +
' ' +
TranslationBase.of(context).years +
TranslationBase
.of(context)
.years +
', ' +
snapshot.data.getAllSharedRecordsByStatusList[index].genderDescription,
fontSize: 12,
@ -222,7 +246,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
// if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
// },
// ),
Texts(TranslationBase.of(context).switchUser,
Texts(TranslationBase
.of(context)
.switchUser,
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0Xff5A282E) : Colors.white,
fontSize: 12,
fontWeight: FontWeight.w600)
@ -246,7 +272,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
SizedBox(
width: 5,
),
Texts(TranslationBase.of(context).delete,
Texts(TranslationBase
.of(context)
.delete,
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0Xff5A282E) : Colors.white,
fontSize: 12,
fontWeight: FontWeight.w600),
@ -274,7 +302,10 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
}
int checkActive(List<GetAllSharedRecordsByStatusList> list) {
return list.where((o) => o.status == 3).toList().length;
return list
.where((o) => o.status == 3)
.toList()
.length;
}
Widget myFamilyRequest(context) {
@ -283,14 +314,19 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
// child:
SingleChildScrollView(
child: Container(
height: MediaQuery.of(context).size.height,
height: MediaQuery
.of(context)
.size
.height,
margin: EdgeInsets.only(top: 10),
child: Column(
children: <Widget>[
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).userViewRequest,
title: TranslationBase
.of(context)
.userViewRequest,
bodyWidget: FutureBuilder(
future: getUserViewRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
@ -300,7 +336,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
.of(context)
.noDataAvailable));
else
return ListView.separated(
shrinkWrap: true,
@ -328,9 +366,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Padding(
padding: EdgeInsets.all(10),
child: Row(children: [
Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).allow, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).reject, fontWeight: FontWeight.w600)),
Expanded(flex: 3, child: AppText(TranslationBase
.of(context)
.name, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase
.of(context)
.allow, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase
.of(context)
.reject, fontWeight: FontWeight.w600)),
])),
Padding(
padding: const EdgeInsets.only(left: 10.0, right: 10.0),
@ -462,7 +506,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).sentRequest,
title: TranslationBase
.of(context)
.sentRequest,
bodyWidget: FutureBuilder(
future: getSentRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<GetAllSharedRecordsByStatusResponse> snapshot) {
@ -471,7 +517,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
return SizedBox();
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
.of(context)
.noDataAvailable));
else
return ListView.separated(
shrinkWrap: true,
@ -498,8 +546,12 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Padding(
padding: EdgeInsets.all(10),
child: Row(children: [
Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase.of(context).status, fontWeight: FontWeight.w600))
Expanded(flex: 3, child: AppText(TranslationBase
.of(context)
.name, fontWeight: FontWeight.w600)),
Expanded(flex: 1, child: AppText(TranslationBase
.of(context)
.status, fontWeight: FontWeight.w600))
])),
Padding(
padding: const EdgeInsets.only(left: 10.0, right: 10.0),
@ -520,9 +572,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
)),
Expanded(
flex: 1,
child: Card(
shape: cardRadius(10),
color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
child: Container(
decoration: cardRadius(10, color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127), elevation: 3,),
child: Padding(
padding: EdgeInsets.all(5),
child: AppText(
@ -549,7 +600,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
FractionallySizedBox(
widthFactor: 1.0,
child: AppExpandableNotifier(
title: TranslationBase.of(context).userView,
title: TranslationBase
.of(context)
.userView,
bodyWidget: FutureBuilder(
future: getUserViewRequest(), // async work
builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
@ -558,7 +611,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
return Padding(padding: EdgeInsets.only(top: 50), child: Text(''));
default:
if (snapshot.hasError)
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
.of(context)
.noDataAvailable));
else
return Container(
decoration: BoxDecoration(
@ -584,13 +639,17 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Expanded(
flex: 3,
child: AppText(
TranslationBase.of(context).name,
TranslationBase
.of(context)
.name,
fontWeight: FontWeight.w600,
)),
Expanded(
flex: 1,
child: AppText(
TranslationBase.of(context).delete,
TranslationBase
.of(context)
.delete,
fontWeight: FontWeight.w600,
textAlign: TextAlign.center,
)),
@ -640,7 +699,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
String isAvailable() {
if (isVaiable == false) {
this.isVaiable = true;
return TranslationBase.of(context).noDataAvailable;
return TranslationBase
.of(context)
.noDataAvailable;
} else {
return "";
}
@ -667,9 +728,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
deleteFamily(family, context) {
ConfirmDialog dialog = new ConfirmDialog(
context: context,
confirmMessage: TranslationBase.of(context).removeFamilyMember,
okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps,
confirmMessage: TranslationBase
.of(context)
.removeFamilyMember,
okText: TranslationBase
.of(context)
.confirm,
cancelText: TranslationBase
.of(context)
.cancel_nocaps,
okFunction: () => {ConfirmDialog.closeAlertDialog(context), removeFamily(family, context)},
cancelFunction: () => {});
dialog.showAlertDialog(context);
@ -730,12 +797,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
_vitalSignService.heightCm = "";
_vitalSignService.weightKg = "";
await authenticatedUserObject.getUser(getUser: true);
Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).user = authenticatedUserObject.user;
Provider
.of<ProjectViewModel>(AppGlobal.context, listen: false)
.user = authenticatedUserObject.user;
Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).setUser(authenticatedUserObject.user);
appointmentRateViewModel
.getIsLastAppointmentRatedList()
.then((value) => {
.then((value) =>
{
getToDoCount(),
GifLoaderDialogUtils.hideDialog(context),
if (appointmentRateViewModel.isHaveAppointmentNotRate)

@ -145,10 +145,10 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
baseViewModel: viewModel,
body: Column(
children: [
Card(
Container(
margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
shape: cardRadius(12),
elevation: 3,
decoration: cardRadius(12),
child: Container(
child: InkWell(
onTap: () => confirmSelectLocationDialog(myAddresses),

@ -200,8 +200,8 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
physics: isLogin ? null : NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => InkWell(
onTap: () {},
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.all(10),
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -69,9 +69,8 @@ class _InsuranceCardState extends State<InsuranceCard> {
top: index == 0 ? 10 : 0,
bottom: index == model.insurance.length - 1 ? 100 : 0,
),
child: Card(
shape: cardRadius(12),
elevation: 2,
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(

@ -51,10 +51,9 @@ class InsuranceCardUpdateDetails extends StatelessWidget {
width: double.maxFinite,
// height: projectViewModel.isArabic ? 320 : 240,
// decoration: containerRadius(CustomColors.accentColor, 12),
child: Card(
shape: cardRadius(12),
color: CustomColors.accentColor,
elevation: 4,
child: Container(
decoration: cardRadius(12,color: CustomColors.accentColor),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
@ -228,9 +227,9 @@ class InsuranceCardUpdateDetails extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
child: Card(
color: Colors.white,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
child: Container(
width: MediaQuery.of(context).size.width,
padding: EdgeInsets.all(10.0),

@ -26,8 +26,8 @@ class InsurancePage extends StatelessWidget {
children: [
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: InkWell(
@ -94,8 +94,8 @@ class InsurancePage extends StatelessWidget {
},
child: Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(

@ -270,7 +270,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
),
],
),
mHeight(140),
mHeight(60),
],
),
);

@ -19,16 +19,15 @@ class LoggedSliderView extends StatelessWidget {
@override
Widget build(BuildContext context) {
//'${DateUtil.getMonthDayYearDateFormatted(sliderData.dateofBirthDataTime)} ,${model.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${model.user.age.toString() + "y"}',
return Card(
shape: cardRadius(20),
elevation: 0,
return Container(
decoration: cardRadius(20),
margin: EdgeInsets.all(0),
child: Card(
shape: cardRadius(20),
child: Container(
decoration: cardRadius(20,color: sliderData.darkColor),
clipBehavior: Clip.antiAlias,
margin: EdgeInsets.zero,
color: sliderData.darkColor,
elevation: 0,
// padding: EdgeInsets.zero,
child: Stack(
children: [

@ -17,16 +17,14 @@ class SliderView extends StatelessWidget {
@override
Widget build(BuildContext context) {
projectViewModel = Provider.of(context);
return Card(
shape: cardRadius(20),
elevation: 0,
return Container(
decoration: cardRadius(20),
margin: EdgeInsets.all(0),
child: Card(
shape: cardRadius(20),
child: Container(
decoration: cardRadius(20,color: Color(0xFFF2B353E)),
clipBehavior: Clip.antiAlias,
margin: EdgeInsets.zero,
color: Color(0xFFF2B353E),
elevation: 0,
// padding: EdgeInsets.zero,
child: Container(
width: double.infinity,
@ -92,8 +90,9 @@ class SliderView extends StatelessWidget {
height: MediaQuery.of(context).size.width / 14,
width: MediaQuery.of(context).size.width / (projectViewModel.isArabic ? 4 : 6),
child: RaisedButton(
shape: cardRadius(8),
shape: cardRadiusNew(8),
color: Color(0xFFFBF2E31),
elevation: 0,
padding: EdgeInsets.zero,
onPressed: () {
onLoginClick();

@ -29,9 +29,9 @@ class ActiveMedicationsPage extends StatelessWidget {
itemCount: model.activePrescriptionReport.length,
itemBuilder: (context, index) => Container(
width: double.infinity,
child: Card(
child: Container(
margin: EdgeInsets.only(left: 16, right: 16, top: index == 0 ? 16 : 4, bottom: 4),
shape: cardRadius(12),
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.only(top: 12, bottom: 20, left: 20, right: 20),
child: Column(
@ -52,7 +52,7 @@ class ActiveMedicationsPage extends StatelessWidget {
Row(
children: [
Container(
child: Card(
child: Container(
child: Image.memory(
Utils.dataFromBase64String(model.activePrescriptionReport[index].imageString),
fit: BoxFit.cover,
@ -61,7 +61,7 @@ class ActiveMedicationsPage extends StatelessWidget {
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
shape: cardRadius(2000),
decoration: cardRadius(2000),
),
clipBehavior: Clip.antiAlias,
decoration: containerColorRadiusBorderWidth(Colors.white, 200, Colors.grey[200], 1),

@ -20,9 +20,8 @@ class ClassesPage extends StatelessWidget {
margin: EdgeInsets.only(top: 20, left: 20, right: 20, bottom: 20),
child: Column(
children: [
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
child: Container(
child: Column(
@ -51,9 +50,8 @@ class ClassesPage extends StatelessWidget {
SizedBox(
height: 12,
),
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
child: Container( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

@ -28,9 +28,8 @@ class ContactLensPage extends StatelessWidget {
margin: EdgeInsets.only(top: 20, left: 20, right: 20, bottom: 20),
child: Column(
children: [
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -61,9 +60,8 @@ class ContactLensPage extends StatelessWidget {
SizedBox(
height: 12,
),
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -48,8 +48,8 @@ class _PassportUpdatePageState extends State<PassportUpdatePage> {
children: [
Container(
width: double.infinity,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.zero,
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -75,9 +75,9 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
},
),
Container(
child: Card(
elevation: 3.0,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(12.0),
@ -100,9 +100,8 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
),
Container(
width: double.infinity,
child: Card(
elevation: 3.0,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(15.0),
@ -130,9 +129,8 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
),
Container(
width: double.infinity,
child: Card(
elevation: 3.0,
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(15.0),
@ -157,7 +155,7 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
],
),
),
mDivider(Colors.grey[600]),
mDivider( Color(0xffEFEFEF),),
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 10, bottom: 5),
@ -175,7 +173,7 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
],
),
),
mDivider(Colors.grey[600]),
mDivider( Color(0xffEFEFEF),),
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 10, bottom: 5),
@ -190,7 +188,7 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
],
),
),
mDivider(Colors.grey[600]),
mDivider( Color(0xffEFEFEF),),
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 10, bottom: 5),

@ -28,9 +28,8 @@ class WeightMonthlyPage extends StatelessWidget {
groupData();
return ListView(
children: [
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: MonthLineChartCurved(
horizontalInterval: 1.0,
@ -39,9 +38,8 @@ class WeightMonthlyPage extends StatelessWidget {
indexes: model.weighMonthTimeSeriesData.length ~/ 5.5,
),
),
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -26,9 +26,8 @@ class WeightWeeklyPage extends StatelessWidget {
if (projectViewModel == null) projectViewModel = Provider.of(context);
return ListView(
children: [
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: ShowChart(
title: TranslationBase.of(context).weight,
@ -37,9 +36,8 @@ class WeightWeeklyPage extends StatelessWidget {
horizontalInterval: 2,
),
),
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -30,9 +30,8 @@ class WeightYearPage extends StatelessWidget {
groupData();
return ListView(
children: [
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: ShowChart(
horizontalInterval: 2.0,
@ -41,9 +40,8 @@ class WeightYearPage extends StatelessWidget {
indexes: model.weightYearTimeSeriesData.length ~/ 5.5 ?? "",
)),
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,children: [ Padding(

@ -90,10 +90,9 @@ class _PrescriptionDeliveryAddressPageState extends State<PrescriptionDeliveryAd
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Card(
Container(
margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
shape: cardRadius(12),
elevation: 3,
decoration: cardRadius(12),
child: Container(
child: InkWell(
onTap: () => confirmSelectLocationDialog(model.addressesList),
@ -199,9 +198,8 @@ class _PrescriptionDeliveryAddressPageState extends State<PrescriptionDeliveryAd
),
),
if (_selectedAddress != null)
Card(
shape: cardRadius(12),
color: Colors.white,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.all(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
@ -219,10 +217,9 @@ class _PrescriptionDeliveryAddressPageState extends State<PrescriptionDeliveryAd
height: 175,
decoration: containerColorRadiusBorder(Colors.white, 12, Colors.grey),
clipBehavior: Clip.antiAlias,
child: Card(
shape: cardRadius(12),
child: Container(
decoration: cardRadius(12),
clipBehavior: Clip.antiAlias,
elevation: 0,
margin: const EdgeInsets.all(0),
// child: GoogleMap(
// mapType: MapType.normal,
@ -288,10 +285,9 @@ class _PrescriptionDeliveryAddressPageState extends State<PrescriptionDeliveryAd
),
),
),
Card(
shape: cardRadius(0),
Container(
decoration: cardRadius(0),
margin: EdgeInsets.zero,
elevation: 20,
child: Container(
width: double.infinity,
padding: EdgeInsets.only(left: 16, right: 16, top: 16),

@ -43,9 +43,9 @@ class PrescriptionOrderOverview extends StatelessWidget {
child: Column(
children: [
if (!prescriptions.isInOutPatient)
Card(
Container(
margin: EdgeInsets.all(12),
shape: cardRadius(12),
decoration: cardRadius(12),
clipBehavior: Clip.antiAlias,
child: Padding(
padding: const EdgeInsets.all(12.0),
@ -53,11 +53,9 @@ class PrescriptionOrderOverview extends StatelessWidget {
children: [
...List.generate(
prescriptionReportList.length,
(index) => Card(
(index) => Container(
margin: EdgeInsets.all(0.0),
color: Colors.white,
shape: cardRadius(0),
elevation: 0,
decoration: cardRadius(0),
child: Row(
children: <Widget>[
ClipRRect(
@ -90,9 +88,9 @@ class PrescriptionOrderOverview extends StatelessWidget {
),
)
else
Card(
Container(
margin: EdgeInsets.all(12),
shape: cardRadius(12),
decoration: cardRadius(12),
clipBehavior: Clip.antiAlias,
child: Padding(
padding: const EdgeInsets.all(12.0),
@ -101,11 +99,9 @@ class PrescriptionOrderOverview extends StatelessWidget {
children: [
...List.generate(
prescriptionReportEnhList.length,
(index) => Card(
(index) => Container(
margin: EdgeInsets.all(0.0),
color: Colors.white,
shape: cardRadius(0),
elevation: 0,
decoration: cardRadius(0),
child: Row(
children: <Widget>[
Container(
@ -156,10 +152,9 @@ class PrescriptionOrderOverview extends StatelessWidget {
],
),
),
Card(
shape: cardRadius(0),
Container(
decoration: cardRadius(0),
margin: EdgeInsets.zero,
elevation: 20,
child: Container(
width: double.infinity,
margin: EdgeInsets.all(12),

@ -84,9 +84,9 @@ class PrescriptionItemsPage extends StatelessWidget {
},
child: Container(
width: double.infinity,
child: Card(
child: Container(
margin: EdgeInsets.only(left: 16, right: 16, top: index == 0 ? 16 : 4, bottom: 4),
shape: cardRadius(12),
decoration: cardRadius(12),
child: Padding(
padding: EdgeInsets.only(top: 12, bottom: 20, left: projectViewModel.isArabic ? 12 : 20, right: projectViewModel.isArabic ? 20 : 12),
child: Row(
@ -109,7 +109,7 @@ class PrescriptionItemsPage extends StatelessWidget {
Row(
children: [
Container(
child: Card(
child: Container(
child: Image.network(
model.prescriptionReportListINP[index].imageSRCUrl,
fit: BoxFit.cover,
@ -118,7 +118,7 @@ class PrescriptionItemsPage extends StatelessWidget {
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
shape: cardRadius(2000),
decoration: cardRadius(2000),
),
clipBehavior: Clip.antiAlias,
decoration: containerColorRadiusBorderWidth(Colors.white, 200, Colors.grey[200], 1),
@ -269,7 +269,7 @@ class PrescriptionItemsPage extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
Container(
child: Image.network(
model.prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
@ -278,7 +278,7 @@ class PrescriptionItemsPage extends StatelessWidget {
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
shape: cardRadius(2000),
decoration: cardRadius(2000),
),
mWidth(12),
Expanded(

@ -59,10 +59,9 @@ class RadiologyDetailsPage extends StatelessWidget {
buttonTitle: TranslationBase.of(context).sendCopyRad,
isNeedToShowButton: projectViewModel.havePrivilege(8),
),
Card(
Container(
margin: EdgeInsets.all(24),
shape: cardRadius(12),
elevation: 0,
decoration: cardRadius(12),
child: Container(
width: double.infinity,
child: Padding(

@ -62,9 +62,9 @@ class VitalSignDetailsScreen extends StatelessWidget {
child: ListView(
children: [
Container(
child: Card(
child: Container(
margin: EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 6),
shape: cardRadius(12),
decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(

@ -52,9 +52,8 @@ class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
children: <Widget>[
Container(
height: 400,
child: Card(
shape: cardRadius(12),
elevation: 1,
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: ShowChart(
title: widget.name,
@ -65,8 +64,8 @@ class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
// child: SyncFuChart(),
),
),
Card(
shape: cardRadius(12),
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -40,9 +40,8 @@ class VitalSingChartBloodPressure extends StatelessWidget {
return SingleChildScrollView(
child: Column(
children: <Widget>[
Card(
shape: cardRadius(12),
elevation: 1,
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 8),
child: LineChartCurvedBloodPressure(
title: name,
@ -60,8 +59,8 @@ class VitalSingChartBloodPressure extends StatelessWidget {
// viewKey1: viewKey1,
// viewKey2: viewKey2,
// ),
Card(
shape: cardRadius(12),
Container(
decoration: cardRadius(12),
margin: EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),
child: Padding(
padding: const EdgeInsets.all(12.0),

@ -56,9 +56,8 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
SizedBox(
height: 25,
),
Card(
elevation: 0,
shape: cardRadius(10),
Container(
decoration: cardRadius(10),
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
child: Column(
@ -112,9 +111,8 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
),
Container(
width: double.infinity,
child: Card(
elevation: 0,
shape: cardRadius(10),
child: Container(
decoration: cardRadius(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(

@ -63,9 +63,8 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
),
Container(
width: double.infinity,
child: Card(
elevation: 0,
shape: cardRadius(10),
child: Container(
decoration: cardRadius(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
@ -125,9 +124,8 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
SizedBox(
height: 12,
),
Card(
elevation: 0,
shape: cardRadius(10),
Container(
decoration: cardRadius(10),
child: Padding(
padding: EdgeInsets.all(8.0),
child: TextField(

@ -51,10 +51,9 @@ class _ProfileSettings extends State<ProfileSettings> with TickerProviderStateMi
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Card(
shape: cardRadius(8),
Container(
decoration: cardRadius(8),
margin: EdgeInsets.zero,
elevation: 3,
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(

@ -35,7 +35,7 @@ class _MyVaccinesState extends State<MyVaccines> {
appBarTitle: TranslationBase.of(context).myVaccines,
description: TranslationBase.of(context).infoVaccines,
imagesInfo: [
ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vacceines/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vacceines/ar/0.png')
ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vacceines/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vacceines/ar/0.png'),
],
body: Container(
margin: EdgeInsets.only(top: 20.0),
@ -65,8 +65,10 @@ class _MyVaccinesState extends State<MyVaccines> {
date: DateUtil.convertStringToDate(model.vaccineList[index].vaccinationDate),
isSortByClinic: true,
);
}),
)),
},
),
),
),
// SpaceBetweenTexts(space: 165.0),
],
),
@ -74,7 +76,9 @@ class _MyVaccinesState extends State<MyVaccines> {
bottomSheet: Container(
color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: Row(mainAxisSize: MainAxisSize.min, children: [
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).availability,
@ -100,8 +104,11 @@ class _MyVaccinesState extends State<MyVaccines> {
),
);
},
))
])),
),
),
],
),
),
),
);
}

@ -51,7 +51,7 @@ Widget getNoDataWidget(BuildContext context) {
SvgPicture.asset('assets/images/new/not_found.svg', width: 110.0, height: 110.0),
Container(
margin: EdgeInsets.only(top: 15.0),
child: Text(TranslationBase.of(context).noResultFound, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w400, color: Color(0xFFBABABA)))),
child: Text(TranslationBase.of(context).noResultFound, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xFFBABABA)))),
],
),
),
@ -131,7 +131,7 @@ Widget circularAviator(
double elevation = 4,
}) {
return Card(
shape: cardRadius(2000),
shape: cardRadiusNew(2000),
color: Colors.transparent,
elevation: elevation,
child: Container(
@ -405,10 +405,28 @@ Decoration containerColorRadiusLeftBorder(Color background, double radius, doubl
);
}
ShapeBorder cardRadius(double radius) {
BoxDecoration cardRadius(double radius,{Color color,double elevation}) {
return BoxDecoration(
shape: BoxShape.rectangle,
color: color??Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(radius),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius:elevation?? 27,
offset: Offset(-2, 3),
),
],
);
}
ShapeBorder cardRadiusNew(double radius) {
return RoundedRectangleBorder(
side: BorderSide(color: Colors.transparent, width: 1),
borderRadius: BorderRadius.circular(radius),
side: BorderSide(color: Colors.transparent, width: 0),
borderRadius: BorderRadius.all(Radius.circular(radius)),
);
}

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/material.dart';
// OWNER : Ibrahim albitar
@ -70,18 +71,19 @@ class _RoundedContainerState extends State<RoundedContainer> {
),
])
: null,
child: Card(
child: Container(
margin: EdgeInsets.all(0),
shape: RoundedRectangleBorder(
borderRadius: widget.customCornerRaduis
? BorderRadius.only(
topLeft: Radius.circular(widget.topLeft),
topRight: Radius.circular(widget.topRight),
bottomRight: Radius.circular(widget.bottomRight),
bottomLeft: Radius.circular(widget.bottomLeft))
: BorderRadius.circular(widget.raduis),
),
color: widget.backgroundColor,
// shape: RoundedRectangleBorder(
// borderRadius: widget.customCornerRaduis
// ? BorderRadius.only(
// topLeft: Radius.circular(widget.topLeft),
// topRight: Radius.circular(widget.topRight),
// bottomRight: Radius.circular(widget.bottomRight),
// bottomLeft: Radius.circular(widget.bottomLeft))
// : BorderRadius.circular(widget.raduis),
// ),
decoration: cardRadius(widget.raduis,color: widget.backgroundColor,elevation: 3),
child: widget.child,
));
}

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/labs_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/charts/show_chart.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -71,9 +72,9 @@ class FlowChartPage extends StatelessWidget {
)
: Center(
child: Container(
padding: EdgeInsets.only(top: MediaQuery.of(context).size.height * 0.42),
padding: EdgeInsets.only(top: MediaQuery.of(context).size.height * 0.32),
child: Center(
child: Texts('No Data'),
child: getNoDataWidget(context),
),
),
),

@ -241,7 +241,8 @@ class _TimeLineViewState extends State<TimeLineView> {
height: MediaQuery.of(context).size.width / 14,
width: MediaQuery.of(context).size.width / (widget.isArabic ? 4 : 6),
child: RaisedButton(
shape: cardRadius(8),
shape: cardRadiusNew(8),
elevation: 0,
color: Color(0xFFFBF2E31),
padding: EdgeInsets.zero,
onPressed: () {

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart';
@ -13,12 +14,13 @@ class AppEmbeddedError extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Center(
child: Texts(
error,
color: Theme.of(context).errorColor,
textAlign: TextAlign.center,
),
);
// return Center(
// child: Texts(
// error,
// color: Theme.of(context).errorColor,
// textAlign: TextAlign.center,
// ),
// );
return Center(child: getNoDataWidget(context),);
}
}

@ -115,7 +115,7 @@ class AppScaffold extends StatelessWidget {
bool isUserNotLogin = (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && isShowDecPage);
return Scaffold(
backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
backgroundColor: backgroundColor ?? CustomColors.appBackgroudGrey2Color,
appBar: isUserNotLogin
? null
: (showNewAppBar

@ -18,11 +18,11 @@ class NetworkBaseView extends StatefulWidget {
}
class _NetworkBaseViewState extends State<NetworkBaseView> {
@override
void initState() {
super.initState();
}
@override
void dispose() {
super.dispose();
@ -31,13 +31,17 @@ class _NetworkBaseViewState extends State<NetworkBaseView>{
@override
Widget build(BuildContext context) {
return Container(
child: (widget.baseViewModel!=null ) ?buildBaseViewWidget():Center(
child:widget.isLoading? CircularProgressIndicator(
child: (widget.baseViewModel != null)
? buildBaseViewWidget()
: Center(
child: widget.isLoading
? CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[500],
),
):widget.child,
)
: widget.child,
),
);
}
@ -62,16 +66,15 @@ class _NetworkBaseViewState extends State<NetworkBaseView>{
),
),
);
else return Container(
else
return Container(
height: MediaQuery.of(context).size.height,
child: Stack(
children: [
Container(
color: Colors.grey.withOpacity(0.6),
),
Container(child: GifLoaderContainer(), margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.height * 0.09))
Container(child: GifLoaderContainer(), margin: EdgeInsets.only(bottom: MediaQuery.of(context).size.height * 0.09))
],
),
);
@ -85,8 +88,4 @@ class _NetworkBaseViewState extends State<NetworkBaseView>{
break;
}
}
}

Loading…
Cancel
Save