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

# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
merge-requests/447/head
haroon amjad 4 years ago
commit a710406317

@ -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

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -10,6 +11,7 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/ConfirmWithMessageDialog.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/ConfirmWithMessageDialog.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
@ -130,22 +132,13 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
child: widget.model.pendingOrder != null child: widget.model.pendingOrder != null
? Column( ? Column(
children: [ children: [
Padding( Container(
padding: const EdgeInsets.all(21.0), width: double.infinity,
padding: EdgeInsets.only(left: 12, right: 12, top: 12),
child: Container( child: Container(
decoration: BoxDecoration( decoration: cardRadius(12),
color: _color, margin: EdgeInsets.zero,
borderRadius: BorderRadius.all( clipBehavior: Clip.antiAlias,
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
blurRadius: 27,
offset: Offset(0, -3),
),
],
),
child: Container( child: Container(
// decoration: containerColorRadiusLeft(Colors.white, 12), // decoration: containerColorRadiusLeft(Colors.white, 12),
margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0), margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -162,11 +162,13 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
itemBuilder: (context, index) { itemBuilder: (context, index) {
// snapshot.data.getAllSharedRecordsByStatusList[index].gender = 2; // snapshot.data.getAllSharedRecordsByStatusList[index].gender = 2;
if (snapshot.data.getAllSharedRecordsByStatusList[index].status == 3) if (snapshot.data.getAllSharedRecordsByStatusList[index].status == 3)
return Card( return Container(
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
shape: cardRadius(15), decoration: cardRadius(
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 2 ? Color(0xffFDA4B0) : Color(0xff6EA8FF), 15,
elevation: 0.0, elevation: 0,
color: snapshot.data.getAllSharedRecordsByStatusList[index].gender == 1 ? Color(0xffFDA4B0) : Color(0xff6EA8FF),
),
child: Container( child: Container(
// height: 130,0xffFDA4B0 // height: 130,0xffFDA4B0
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
@ -521,7 +523,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Expanded( Expanded(
flex: 1, flex: 1,
child: Card( child: Card(
shape: cardRadius(10), // shape: cardRadius(10),
color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127), color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
child: Padding( child: Padding(
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -35,46 +35,50 @@ class _MyVaccinesState extends State<MyVaccines> {
appBarTitle: TranslationBase.of(context).myVaccines, appBarTitle: TranslationBase.of(context).myVaccines,
description: TranslationBase.of(context).infoVaccines, description: TranslationBase.of(context).infoVaccines,
imagesInfo: [ 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( body: Container(
margin: EdgeInsets.only(top: 20.0), margin: EdgeInsets.only(top: 20.0),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
AppExpandableNotifier( AppExpandableNotifier(
isExpand: true, isExpand: true,
title: model.state == ViewState.Idle ? DateUtil.convertStringToDate(model.vaccineList[0].vaccinationDate).year.toString() : "", title: model.state == ViewState.Idle ? DateUtil.convertStringToDate(model.vaccineList[0].vaccinationDate).year.toString() : "",
bodyWidget: Container( bodyWidget: Container(
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model.vaccineList == null ? 0 : model.vaccineList.length, itemCount: model.vaccineList == null ? 0 : model.vaccineList.length,
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21), padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
separatorBuilder: (context, index) => SizedBox(height: 14), separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return DoctorCard( return DoctorCard(
onTap: null, onTap: null,
isInOutPatient: true, isInOutPatient: true,
isShowInOutPatient: false, isShowInOutPatient: false,
name: TranslationBase.of(context).dr.toString() + " " + model.vaccineList[index].doctorName, name: TranslationBase.of(context).dr.toString() + " " + model.vaccineList[index].doctorName,
billNo: "", billNo: "",
vaccineName: model.vaccineList[index].vaccineName, vaccineName: model.vaccineList[index].vaccineName,
profileUrl: model.vaccineList[index].doctorImageURL, profileUrl: model.vaccineList[index].doctorImageURL,
subName: model.vaccineList[index].projectName, subName: model.vaccineList[index].projectName,
isLiveCareAppointment: false, isLiveCareAppointment: false,
date: DateUtil.convertStringToDate(model.vaccineList[index].vaccinationDate), date: DateUtil.convertStringToDate(model.vaccineList[index].vaccinationDate),
isSortByClinic: true, isSortByClinic: true,
); );
}), },
)), ),
),
),
// SpaceBetweenTexts(space: 165.0), // SpaceBetweenTexts(space: 165.0),
], ],
), ),
), ),
bottomSheet: Container( bottomSheet: Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: Row(mainAxisSize: MainAxisSize.min, children: [ child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).availability, TranslationBase.of(context).availability,
@ -87,21 +91,24 @@ class _MyVaccinesState extends State<MyVaccines> {
), ),
SizedBox(width: 8), SizedBox(width: 8),
Expanded( Expanded(
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).sendEmail, TranslationBase.of(context).sendEmail,
() { () {
showDialog( showDialog(
context: context, context: context,
child: ConfirmSendEmailDialog( child: ConfirmSendEmailDialog(
email: projectViewModel.user.emailAddress, email: projectViewModel.user.emailAddress,
onTapSendEmail: () { onTapSendEmail: () {
model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully); model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully);
}, },
), ),
); );
}, },
)) ),
])), ),
],
),
),
), ),
); );
} }

@ -51,7 +51,7 @@ Widget getNoDataWidget(BuildContext context) {
SvgPicture.asset('assets/images/new/not_found.svg', width: 110.0, height: 110.0), SvgPicture.asset('assets/images/new/not_found.svg', width: 110.0, height: 110.0),
Container( Container(
margin: EdgeInsets.only(top: 15.0), 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, double elevation = 4,
}) { }) {
return Card( return Card(
shape: cardRadius(2000), shape: cardRadiusNew(2000),
color: Colors.transparent, color: Colors.transparent,
elevation: elevation, elevation: elevation,
child: Container( 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( return RoundedRectangleBorder(
side: BorderSide(color: Colors.transparent, width: 1), side: BorderSide(color: Colors.transparent, width: 0),
borderRadius: BorderRadius.circular(radius), borderRadius: BorderRadius.all(Radius.circular(radius)),
); );
} }

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// OWNER : Ibrahim albitar // OWNER : Ibrahim albitar
@ -70,18 +71,19 @@ class _RoundedContainerState extends State<RoundedContainer> {
), ),
]) ])
: null, : null,
child: Card( child: Container(
margin: EdgeInsets.all(0), margin: EdgeInsets.all(0),
shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
borderRadius: widget.customCornerRaduis // borderRadius: widget.customCornerRaduis
? BorderRadius.only( // ? BorderRadius.only(
topLeft: Radius.circular(widget.topLeft), // topLeft: Radius.circular(widget.topLeft),
topRight: Radius.circular(widget.topRight), // topRight: Radius.circular(widget.topRight),
bottomRight: Radius.circular(widget.bottomRight), // bottomRight: Radius.circular(widget.bottomRight),
bottomLeft: Radius.circular(widget.bottomLeft)) // bottomLeft: Radius.circular(widget.bottomLeft))
: BorderRadius.circular(widget.raduis), // : BorderRadius.circular(widget.raduis),
), // ),
color: widget.backgroundColor, decoration: cardRadius(widget.raduis,color: widget.backgroundColor,elevation: 3),
child: widget.child, 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/core/viewModels/medical/labs_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/theme/colors.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/charts/show_chart.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -71,9 +72,9 @@ class FlowChartPage extends StatelessWidget {
) )
: Center( : Center(
child: Container( 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: Center(
child: Texts('No Data'), child: getNoDataWidget(context),
), ),
), ),
), ),

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

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -13,12 +14,13 @@ class AppEmbeddedError extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Center( // return Center(
child: Texts( // child: Texts(
error, // error,
color: Theme.of(context).errorColor, // color: Theme.of(context).errorColor,
textAlign: TextAlign.center, // 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); bool isUserNotLogin = (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && isShowDecPage);
return Scaffold( return Scaffold(
backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor, backgroundColor: backgroundColor ?? CustomColors.appBackgroudGrey2Color,
appBar: isUserNotLogin appBar: isUserNotLogin
? null ? null
: (showNewAppBar : (showNewAppBar

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

Loading…
Cancel
Save