diff --git a/assets/images/new/not_found.svg b/assets/images/new/not_found.svg
new file mode 100644
index 00000000..80aed53a
--- /dev/null
+++ b/assets/images/new/not_found.svg
@@ -0,0 +1,8 @@
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index c27fe938..453454f4 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
index dbaa86f7..bd698361 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
@@ -118,11 +118,9 @@ class _NewCMCPageState extends State 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),
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
index 5869b7f4..cc83abdb 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
@@ -93,9 +93,8 @@ class _NewCMCStepThreePageState extends State {
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 {
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,
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
index 5a1fe867..0d859690 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
@@ -161,10 +161,9 @@ class _NewCMCStepTowPageState extends State {
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),
diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
index 0ae7c202..16f599d7 100644
--- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
@@ -171,10 +171,9 @@ class _NewEReferralStepOnePageState extends State {
),
),
),
- Card(
+ Container(
margin: EdgeInsets.zero,
- shape: cardRadius(0),
- elevation: 20,
+ decoration: cardRadius(0),
child: Container(
// color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.all(12),
diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
index 5bf031fe..9135eda9 100644
--- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
@@ -166,10 +166,9 @@ class _NewEReferralStepTowPageState extends State {
),
),
),
- Card(
+ Container(
margin: EdgeInsets.zero,
- shape: cardRadius(0),
- elevation: 20,
+ decoration: cardRadius(0),
child: Container(
width: double.infinity,
padding: EdgeInsets.all(12),
diff --git a/lib/pages/AlHabibMedicalService/E-Referral/referral_details.dart b/lib/pages/AlHabibMedicalService/E-Referral/referral_details.dart
index a519e720..fe920748 100644
--- a/lib/pages/AlHabibMedicalService/E-Referral/referral_details.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/referral_details.dart
@@ -29,9 +29,8 @@ class _ReferralDetailsState extends State {
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(
diff --git a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
index c7a4ccb6..b3fffa4b 100644
--- a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
@@ -204,9 +204,8 @@ class _SearchForReferralsPageState extends State {
),
);
},
- child: Card(
- elevation: 0.0,
- shape: cardRadius(12),
+ child: Container(
+ decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
index 696af81b..31518f61 100644
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
@@ -141,10 +141,9 @@ class _NewHomeHealthCareStepTowPageState extends State confirmSelectLocationDialog(widget.model.addressesList),
diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart
index e069eca6..9576d7b0 100644
--- a/lib/pages/BookAppointment/BookConfirm.dart
+++ b/lib/pages/BookAppointment/BookConfirm.dart
@@ -104,10 +104,9 @@ class _BookConfirmState extends State {
),
),
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 {
),
),
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),
diff --git a/lib/pages/BookAppointment/book_reminder_page.dart b/lib/pages/BookAppointment/book_reminder_page.dart
index 8066e369..637f732e 100644
--- a/lib/pages/BookAppointment/book_reminder_page.dart
+++ b/lib/pages/BookAppointment/book_reminder_page.dart
@@ -111,8 +111,8 @@ class _BookReminderPageState extends State {
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),
diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
index 25f8cb9c..959816af 100644
--- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
+++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
@@ -163,8 +163,8 @@ class _DocAvailableAppointmentsState extends State wit
}
Widget _buildTableCalendarWithBuilders() {
- return Card(
- shape: cardRadius(12),
+ return Container(
+ decoration: cardRadius(12),
margin: EdgeInsets.all(16),
clipBehavior: Clip.antiAlias,
child: Padding(
diff --git a/lib/pages/BookAppointment/components/DocInfo.dart b/lib/pages/BookAppointment/components/DocInfo.dart
index 6e10df41..041a021f 100644
--- a/lib/pages/BookAppointment/components/DocInfo.dart
+++ b/lib/pages/BookAppointment/components/DocInfo.dart
@@ -17,9 +17,8 @@ class DoctorInformation extends StatelessWidget {
children: [
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(
diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
index 834d7a0a..8d0ea4e3 100644
--- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
+++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
@@ -146,8 +146,8 @@ class _CovidTimeSlotsState extends State 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 with TickerProviderStat
),
),
),
- Card(
- elevation: 20,
+ Container(
margin: EdgeInsets.zero,
- shape: cardRadius(0),
+ decoration: cardRadius(0),
child: Container(
width: double.infinity,
padding: EdgeInsets.all(12),
diff --git a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
index aa1e3ea5..9e0da18a 100644
--- a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
+++ b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
@@ -62,8 +62,8 @@ class CovidDirveThruQuestionsState extends State {
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),
diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart
index b033e1f4..9a75ca49 100644
--- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart
+++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart
@@ -177,9 +177,8 @@ class _CovidDrivethruLocationState extends State {
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),
diff --git a/lib/pages/Covid-DriveThru/covid-payment-alert.dart b/lib/pages/Covid-DriveThru/covid-payment-alert.dart
index 2d7d5363..c42f2559 100644
--- a/lib/pages/Covid-DriveThru/covid-payment-alert.dart
+++ b/lib/pages/Covid-DriveThru/covid-payment-alert.dart
@@ -87,9 +87,9 @@ class _CovidPaymentAlertState extends State {
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(
diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart
index f31aa53e..2ec7c4c5 100644
--- a/lib/pages/Covid-DriveThru/covid-payment-details.dart
+++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart
@@ -151,8 +151,8 @@ class _CovidPaymentDetailsState extends State {
),
),
- Card(
- shape: cardRadius(12),
+ Container(
+ decoration: cardRadius(12),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
diff --git a/lib/pages/Covid-DriveThru/covid-payment-summary.dart b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
index c5bcb23b..84126109 100644
--- a/lib/pages/Covid-DriveThru/covid-payment-summary.dart
+++ b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
@@ -173,8 +173,8 @@ class _CovidPaymentSummaryState extends State {
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),
diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart
index 857c680c..dd3b0267 100644
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@@ -85,14 +85,18 @@ class _MyFamily extends State with TickerProviderStateMixin {
projectViewModel = Provider.of(context);
toDoProvider = Provider.of(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,26 +118,35 @@ class _MyFamily extends State 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)
? TabBarView(
- physics: BouncingScrollPhysics(),
- controller: _tabController,
- children: [myFamilyDetails(context), myFamilyRequest(context)],
- )
+ physics: BouncingScrollPhysics(),
+ controller: _tabController,
+ children: [myFamilyDetails(context), myFamilyRequest(context)],
+ )
: Container(child: AppText('')),
),
],
),
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,
- () async {
+ TranslationBase
+ .of(context)
+ .addFamilyMember,
+ () async {
Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE);
},
),
@@ -156,20 +169,25 @@ class _MyFamily extends State 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,
+ // height: 130,0xffFDA4B0
+ width: MediaQuery
+ .of(context)
+ .size
+ .width,
padding: EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -178,17 +196,23 @@ class _MyFamily extends State with TickerProviderStateMixin {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
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 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 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,373 +302,406 @@ class _MyFamily extends State with TickerProviderStateMixin {
}
int checkActive(List list) {
- return list.where((o) => o.status == 3).toList().length;
+ return list
+ .where((o) => o.status == 3)
+ .toList()
+ .length;
}
Widget myFamilyRequest(context) {
return //Padding(
- // padding: const EdgeInsets.symmetric(horizontal: 10.0),
- // child:
- SingleChildScrollView(
- child: Container(
- height: MediaQuery.of(context).size.height,
- margin: EdgeInsets.only(top: 10),
- child: Column(
- children: [
- FractionallySizedBox(
- widthFactor: 1.0,
- child: AppExpandableNotifier(
- title: TranslationBase.of(context).userViewRequest,
- bodyWidget: FutureBuilder(
- future: getUserViewRequest(), // async work
- builder: (BuildContext context, AsyncSnapshot snapshot) {
- switch (snapshot.connectionState) {
- case ConnectionState.waiting:
- return SizedBox();
-
- default:
- if (snapshot.hasError)
- return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
- else
- return ListView.separated(
- shrinkWrap: true,
- physics: NeverScrollableScrollPhysics(),
- padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
- itemBuilder: (context, _index) {
- return Container(
- decoration: BoxDecoration(
- borderRadius: BorderRadius.all(
- Radius.circular(10.0),
- ),
- border: Border.all(width: 1, color: Color(0xffEFEFEF)),
- boxShadow: [
- BoxShadow(
- color: Color(0xff000000).withOpacity(.05),
- //spreadRadius: 5,
- blurRadius: 27,
- offset: Offset(0, -3),
+ // padding: const EdgeInsets.symmetric(horizontal: 10.0),
+ // child:
+ SingleChildScrollView(
+ child: Container(
+ height: MediaQuery
+ .of(context)
+ .size
+ .height,
+ margin: EdgeInsets.only(top: 10),
+ child: Column(
+ children: [
+ FractionallySizedBox(
+ widthFactor: 1.0,
+ child: AppExpandableNotifier(
+ title: TranslationBase
+ .of(context)
+ .userViewRequest,
+ bodyWidget: FutureBuilder(
+ future: getUserViewRequest(), // async work
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return SizedBox();
+
+ default:
+ if (snapshot.hasError)
+ return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
+ .of(context)
+ .noDataAvailable));
+ else
+ return ListView.separated(
+ shrinkWrap: true,
+ physics: NeverScrollableScrollPhysics(),
+ padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
+ itemBuilder: (context, _index) {
+ return Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(
+ Radius.circular(10.0),
),
+ border: Border.all(width: 1, color: Color(0xffEFEFEF)),
+ boxShadow: [
+ BoxShadow(
+ color: Color(0xff000000).withOpacity(.05),
+ //spreadRadius: 5,
+ blurRadius: 27,
+ offset: Offset(0, -3),
+ ),
+ ],
+ color: Colors.white),
+ child: Column(
+ children: [
+ Column(children: [
+ 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)),
+ ])),
+ Padding(
+ padding: const EdgeInsets.only(left: 10.0, right: 10.0),
+ child: Divider(color: Colors.black, height: 1.5, thickness: 1.5),
+ ),
+ Column(
+ children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
+ return Container(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child: Texts(
+ result.patientName,
+ fontWeight: FontWeight.w600,
+ fontSize: 12,
+ )),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: SvgPicture.asset("assets/images/new-design/allow.svg", height: 22),
+ onPressed: () {
+ acceptRemoveRequest(result.iD, 3, context);
+ },
+ )),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: SvgPicture.asset("assets/images/new-design/reject.svg", height: 22),
+ color: Colors.white,
+ onPressed: () {
+ acceptRemoveRequest(result.iD, 4, context);
+ },
+ ))
+ ],
+ ));
+ }).toList())
+ ])
],
- color: Colors.white),
- child: Column(
- children: [
- Column(children: [
+ ));
+ },
+ separatorBuilder: (context, index) => SizedBox(height: 14),
+ itemCount: 1);
+ }
+ },
+ ))),
+
+ // RoundedContainer(
+ // child: ExpansionTile(
+ // title: Text(
+ // TranslationBase.of(context).userViewRequest,
+ // style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
+ // ),
+ // children: [
+ // FutureBuilder(
+ // future: getUserViewRequest(), // async work
+ // builder: (BuildContext context, AsyncSnapshot snapshot) {
+ // switch (snapshot.connectionState) {
+ // case ConnectionState.waiting:
+ // 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));
+ // else
+ // return Container(
+ // padding: EdgeInsets.all(15),
+ // child: Card(
+ // elevation: 3,
+ // shape: cardRadius(8),
+ // child: Column(
+ // children: [
+ // Column(children: [
+ // 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)),
+ // ])),
+ // Divider(color: Colors.black, height: 1.5, thickness: 1.5),
+ // Column(
+ // children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
+ // return Container(
+ // padding: EdgeInsets.all(10),
+ // child: Row(
+ // children: [
+ // Expanded(
+ // flex: 3,
+ // child: Texts(
+ // result.patientName,
+ // fontWeight: FontWeight.w600,
+ // fontSize: 12,
+ // )),
+ // Expanded(
+ // flex: 1,
+ // child: IconButton(
+ // icon: Icon(
+ // Icons.check_circle,
+ // color: Color(0xff349745),
+ // ),
+ // onPressed: () {
+ // acceptRemoveRequest(result.iD, 3, context);
+ // },
+ // )),
+ // Expanded(
+ // flex: 1,
+ // child: IconButton(
+ // icon: Icon(
+ // Icons.close,
+ // color: Colors.red[900],
+ // ),
+ // onPressed: () {
+ // acceptRemoveRequest(result.iD, 4, context);
+ // },
+ // ))
+ // ],
+ // ));
+ // }).toList())
+ // ])
+ // ],
+ // )));
+ // }
+ // })
+ // ],
+ // ),
+ // ),
+ SizedBox(height: 15),
+ FractionallySizedBox(
+ widthFactor: 1.0,
+ child: AppExpandableNotifier(
+ title: TranslationBase
+ .of(context)
+ .sentRequest,
+ bodyWidget: FutureBuilder(
+ future: getSentRequest(), // async work
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return SizedBox();
+ default:
+ if (snapshot.hasError)
+ return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase
+ .of(context)
+ .noDataAvailable));
+ else
+ return ListView.separated(
+ shrinkWrap: true,
+ physics: NeverScrollableScrollPhysics(),
+ padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
+ itemBuilder: (context, _index) {
+ return Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(
+ Radius.circular(10.0),
+ ),
+ border: Border.all(width: 1, color: Color(0xffEFEFEF)),
+ boxShadow: [
+ BoxShadow(
+ color: Color(0xff000000).withOpacity(.05),
+ //spreadRadius: 5,
+ blurRadius: 27,
+ offset: Offset(0, -3),
+ ),
+ ],
+ color: Colors.white),
+ child: Column(
+ children: [
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)
+ .status, fontWeight: FontWeight.w600))
])),
Padding(
padding: const EdgeInsets.only(left: 10.0, right: 10.0),
child: Divider(color: Colors.black, height: 1.5, thickness: 1.5),
),
Column(
- children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
- return Container(
- padding: EdgeInsets.all(10),
- child: Row(
- children: [
- Expanded(
- flex: 3,
- child: Texts(
- result.patientName,
- fontWeight: FontWeight.w600,
- fontSize: 12,
- )),
- Expanded(
- flex: 1,
- child: IconButton(
- icon: SvgPicture.asset("assets/images/new-design/allow.svg", height: 22),
- onPressed: () {
- acceptRemoveRequest(result.iD, 3, context);
- },
- )),
- Expanded(
- flex: 1,
- child: IconButton(
- icon: SvgPicture.asset("assets/images/new-design/reject.svg", height: 22),
- color: Colors.white,
- onPressed: () {
- acceptRemoveRequest(result.iD, 4, context);
- },
- ))
- ],
- ));
- }).toList())
- ])
- ],
- ));
- },
- separatorBuilder: (context, index) => SizedBox(height: 14),
- itemCount: 1);
- }
- },
- ))),
-
- // RoundedContainer(
- // child: ExpansionTile(
- // title: Text(
- // TranslationBase.of(context).userViewRequest,
- // style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black),
- // ),
- // children: [
- // FutureBuilder(
- // future: getUserViewRequest(), // async work
- // builder: (BuildContext context, AsyncSnapshot snapshot) {
- // switch (snapshot.connectionState) {
- // case ConnectionState.waiting:
- // 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));
- // else
- // return Container(
- // padding: EdgeInsets.all(15),
- // child: Card(
- // elevation: 3,
- // shape: cardRadius(8),
- // child: Column(
- // children: [
- // Column(children: [
- // 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)),
- // ])),
- // Divider(color: Colors.black, height: 1.5, thickness: 1.5),
- // Column(
- // children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
- // return Container(
- // padding: EdgeInsets.all(10),
- // child: Row(
- // children: [
- // Expanded(
- // flex: 3,
- // child: Texts(
- // result.patientName,
- // fontWeight: FontWeight.w600,
- // fontSize: 12,
- // )),
- // Expanded(
- // flex: 1,
- // child: IconButton(
- // icon: Icon(
- // Icons.check_circle,
- // color: Color(0xff349745),
- // ),
- // onPressed: () {
- // acceptRemoveRequest(result.iD, 3, context);
- // },
- // )),
- // Expanded(
- // flex: 1,
- // child: IconButton(
- // icon: Icon(
- // Icons.close,
- // color: Colors.red[900],
- // ),
- // onPressed: () {
- // acceptRemoveRequest(result.iD, 4, context);
- // },
- // ))
- // ],
- // ));
- // }).toList())
- // ])
- // ],
- // )));
- // }
- // })
- // ],
- // ),
- // ),
- SizedBox(height: 15),
- FractionallySizedBox(
- widthFactor: 1.0,
- child: AppExpandableNotifier(
- title: TranslationBase.of(context).sentRequest,
- bodyWidget: FutureBuilder(
- future: getSentRequest(), // async work
- builder: (BuildContext context, AsyncSnapshot snapshot) {
- switch (snapshot.connectionState) {
- case ConnectionState.waiting:
- return SizedBox();
- default:
- if (snapshot.hasError)
- return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable));
- else
- return ListView.separated(
- shrinkWrap: true,
- physics: NeverScrollableScrollPhysics(),
- padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
- itemBuilder: (context, _index) {
- return Container(
- decoration: BoxDecoration(
- borderRadius: BorderRadius.all(
- Radius.circular(10.0),
- ),
- border: Border.all(width: 1, color: Color(0xffEFEFEF)),
- boxShadow: [
- BoxShadow(
- color: Color(0xff000000).withOpacity(.05),
- //spreadRadius: 5,
- blurRadius: 27,
- offset: Offset(0, -3),
- ),
+ children: snapshot.data.getAllSharedRecordsByStatusList.map((result) {
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child: Texts(
+ result.patientName,
+ fontWeight: FontWeight.w600,
+ fontSize: 12,
+ )),
+ Expanded(
+ flex: 1,
+ child: Container(
+ decoration: cardRadius(10, color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127), elevation: 3,),
+ child: Padding(
+ padding: EdgeInsets.all(5),
+ child: AppText(
+ result.statusDescription,
+ color: Colors.white,
+ textAlign: TextAlign.center,
+ fontSize: 12,
+ )))),
+ ],
+ ));
+ }).toList(),
+ )
],
- color: Colors.white),
- child: Column(
- children: [
+ ));
+ },
+ separatorBuilder: (context, index) => SizedBox(height: 14),
+ itemCount: 1,
+ );
+ }
+ }))),
+ SizedBox(
+ height: 15,
+ ),
+ FractionallySizedBox(
+ widthFactor: 1.0,
+ child: AppExpandableNotifier(
+ title: TranslationBase
+ .of(context)
+ .userView,
+ bodyWidget: FutureBuilder(
+ future: getUserViewRequest(), // async work
+ builder: (BuildContext context, AsyncSnapshot snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ 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));
+ else
+ return Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.all(
+ Radius.circular(10.0),
+ ),
+ border: Border.all(width: 1, color: Color(0xffEFEFEF)),
+ boxShadow: [
+ BoxShadow(
+ color: Color(0xff000000).withOpacity(.05),
+ //spreadRadius: 5,
+ blurRadius: 27,
+ offset: Offset(0, -3),
+ ),
+ ],
+ color: Colors.white),
+ child: Column(
+ children: [
+ Column(children: [
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)
+ .delete,
+ fontWeight: FontWeight.w600,
+ textAlign: TextAlign.center,
+ )),
])),
Padding(
padding: const EdgeInsets.only(left: 10.0, right: 10.0),
child: Divider(color: Colors.black, height: 1.5, thickness: 1.5),
),
Column(
- children: snapshot.data.getAllSharedRecordsByStatusList.map((result) {
- return Padding(
- padding: EdgeInsets.all(10),
- child: Row(
- children: [
- Expanded(
- flex: 3,
- child: Texts(
- result.patientName,
- fontWeight: FontWeight.w600,
- fontSize: 12,
- )),
- Expanded(
- flex: 1,
- child: Card(
- shape: cardRadius(10),
- color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
- child: Padding(
- padding: EdgeInsets.all(5),
- child: AppText(
- result.statusDescription,
- color: Colors.white,
- textAlign: TextAlign.center,
- fontSize: 12,
- )))),
- ],
- ));
- }).toList(),
- )
- ],
- ));
- },
- separatorBuilder: (context, index) => SizedBox(height: 14),
- itemCount: 1,
- );
- }
- }))),
- SizedBox(
- height: 15,
- ),
- FractionallySizedBox(
- widthFactor: 1.0,
- child: AppExpandableNotifier(
- title: TranslationBase.of(context).userView,
- bodyWidget: FutureBuilder(
- future: getUserViewRequest(), // async work
- builder: (BuildContext context, AsyncSnapshot snapshot) {
- switch (snapshot.connectionState) {
- case ConnectionState.waiting:
- 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));
- else
- return Container(
- decoration: BoxDecoration(
- borderRadius: BorderRadius.all(
- Radius.circular(10.0),
- ),
- border: Border.all(width: 1, color: Color(0xffEFEFEF)),
- boxShadow: [
- BoxShadow(
- color: Color(0xff000000).withOpacity(.05),
- //spreadRadius: 5,
- blurRadius: 27,
- offset: Offset(0, -3),
- ),
+ children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child: Texts(
+ result.patientName,
+ fontWeight: FontWeight.w600,
+ fontSize: 12,
+ )),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: Icon(
+ Icons.delete,
+ color: Colors.red,
+ ),
+ onPressed: () {
+ deactivateRequest(result.iD, 5, context);
+ },
+ )),
+ ],
+ ));
+ }).toList())
+ ])
],
- color: Colors.white),
- child: Column(
- children: [
- Column(children: [
- 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).delete,
- fontWeight: FontWeight.w600,
- textAlign: TextAlign.center,
- )),
- ])),
- Padding(
- padding: const EdgeInsets.only(left: 10.0, right: 10.0),
- child: Divider(color: Colors.black, height: 1.5, thickness: 1.5),
- ),
- Column(
- children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) {
- return Padding(
- padding: EdgeInsets.all(10),
- child: Row(
- children: [
- Expanded(
- flex: 3,
- child: Texts(
- result.patientName,
- fontWeight: FontWeight.w600,
- fontSize: 12,
- )),
- Expanded(
- flex: 1,
- child: IconButton(
- icon: Icon(
- Icons.delete,
- color: Colors.red,
- ),
- onPressed: () {
- deactivateRequest(result.iD, 5, context);
- },
- )),
- ],
- ));
- }).toList())
- ])
- ],
- ));
- }
- })))
- ],
+ ));
+ }
+ })))
+ ],
+ ),
),
- ),
- );
+ );
}
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 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,26 +797,29 @@ class _MyFamily extends State with TickerProviderStateMixin {
_vitalSignService.heightCm = "";
_vitalSignService.weightKg = "";
await authenticatedUserObject.getUser(getUser: true);
- Provider.of(AppGlobal.context, listen: false).user = authenticatedUserObject.user;
+ Provider
+ .of(AppGlobal.context, listen: false)
+ .user = authenticatedUserObject.user;
Provider.of(AppGlobal.context, listen: false).setUser(authenticatedUserObject.user);
appointmentRateViewModel
.getIsLastAppointmentRatedList()
- .then((value) => {
- getToDoCount(),
- GifLoaderDialogUtils.hideDialog(context),
- if (appointmentRateViewModel.isHaveAppointmentNotRate)
- {
- Navigator.pushAndRemoveUntil(
- context,
- FadePage(
- page: RateAppointmentDoctor(),
- ),
- (r) => false)
- }
- else
- {Navigator.pushAndRemoveUntil(AppGlobal.context, MaterialPageRoute(builder: (context) => LandingPage()), (Route r) => false)}
- })
+ .then((value) =>
+ {
+ getToDoCount(),
+ GifLoaderDialogUtils.hideDialog(context),
+ if (appointmentRateViewModel.isHaveAppointmentNotRate)
+ {
+ Navigator.pushAndRemoveUntil(
+ context,
+ FadePage(
+ page: RateAppointmentDoctor(),
+ ),
+ (r) => false)
+ }
+ else
+ {Navigator.pushAndRemoveUntil(AppGlobal.context, MaterialPageRoute(builder: (context) => LandingPage()), (Route r) => false)}
+ })
.catchError((err) {
print(err);
// Utils.hideProgressDialog();
diff --git a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
index e738a438..0a25ca7a 100644
--- a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
+++ b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
@@ -145,10 +145,10 @@ class RRTRequestPickupAddressPageState extends State confirmSelectLocationDialog(myAddresses),
diff --git a/lib/pages/feedback/status_feedback_page.dart b/lib/pages/feedback/status_feedback_page.dart
index 6a4eb87e..afc00df4 100644
--- a/lib/pages/feedback/status_feedback_page.dart
+++ b/lib/pages/feedback/status_feedback_page.dart
@@ -200,8 +200,8 @@ class _StatusFeedbackPageState extends State {
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),
diff --git a/lib/pages/insurance/insurance_card_screen.dart b/lib/pages/insurance/insurance_card_screen.dart
index 16995546..9e95e0fe 100644
--- a/lib/pages/insurance/insurance_card_screen.dart
+++ b/lib/pages/insurance/insurance_card_screen.dart
@@ -69,9 +69,8 @@ class _InsuranceCardState extends State {
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(
diff --git a/lib/pages/insurance/insurance_card_update_details.dart b/lib/pages/insurance/insurance_card_update_details.dart
index 26425335..c6eccae1 100644
--- a/lib/pages/insurance/insurance_card_update_details.dart
+++ b/lib/pages/insurance/insurance_card_update_details.dart
@@ -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),
diff --git a/lib/pages/insurance/insurance_page.dart b/lib/pages/insurance/insurance_page.dart
index 58a9e64a..fb3271fd 100644
--- a/lib/pages/insurance/insurance_page.dart
+++ b/lib/pages/insurance/insurance_page.dart
@@ -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(
diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart
index 0d9019b7..fd4494e9 100644
--- a/lib/pages/landing/fragments/home_page_fragment2.dart
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@@ -270,7 +270,7 @@ class _HomePageFragment2State extends State {
),
],
),
- mHeight(140),
+ mHeight(60),
],
),
);
diff --git a/lib/pages/landing/widgets/logged_slider_view.dart b/lib/pages/landing/widgets/logged_slider_view.dart
index a0665e85..54417ee4 100644
--- a/lib/pages/landing/widgets/logged_slider_view.dart
+++ b/lib/pages/landing/widgets/logged_slider_view.dart
@@ -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: [
diff --git a/lib/pages/landing/widgets/slider_view.dart b/lib/pages/landing/widgets/slider_view.dart
index 09a8f50d..5030d004 100644
--- a/lib/pages/landing/widgets/slider_view.dart
+++ b/lib/pages/landing/widgets/slider_view.dart
@@ -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();
diff --git a/lib/pages/medical/active_medications/ActiveMedicationsPage.dart b/lib/pages/medical/active_medications/ActiveMedicationsPage.dart
index 87f5b0c4..6af41514 100644
--- a/lib/pages/medical/active_medications/ActiveMedicationsPage.dart
+++ b/lib/pages/medical/active_medications/ActiveMedicationsPage.dart
@@ -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),
diff --git a/lib/pages/medical/eye/ClassesPage.dart b/lib/pages/medical/eye/ClassesPage.dart
index 563a7ce3..bb38d095 100644
--- a/lib/pages/medical/eye/ClassesPage.dart
+++ b/lib/pages/medical/eye/ClassesPage.dart
@@ -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: [
diff --git a/lib/pages/medical/eye/ContactLensPage.dart b/lib/pages/medical/eye/ContactLensPage.dart
index a681b2f0..007a5527 100644
--- a/lib/pages/medical/eye/ContactLensPage.dart
+++ b/lib/pages/medical/eye/ContactLensPage.dart
@@ -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,
diff --git a/lib/pages/medical/labs/passport_update_page.dart b/lib/pages/medical/labs/passport_update_page.dart
index f9a665d1..cca80905 100644
--- a/lib/pages/medical/labs/passport_update_page.dart
+++ b/lib/pages/medical/labs/passport_update_page.dart
@@ -48,8 +48,8 @@ class _PassportUpdatePageState extends State {
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),
diff --git a/lib/pages/medical/my_invoices/invoice_detail_page.dart b/lib/pages/medical/my_invoices/invoice_detail_page.dart
index f51d02e6..55a91b9a 100644
--- a/lib/pages/medical/my_invoices/invoice_detail_page.dart
+++ b/lib/pages/medical/my_invoices/invoice_detail_page.dart
@@ -75,9 +75,9 @@ class _InvoiceDetailState extends State {
},
),
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 {
),
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 {
),
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 {
],
),
),
- 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 {
],
),
),
- 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 {
],
),
),
- mDivider(Colors.grey[600]),
+ mDivider( Color(0xffEFEFEF),),
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 10, bottom: 5),
diff --git a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
index 3cc02dba..bab7587c 100644
--- a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
+++ b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
@@ -29,9 +29,8 @@ class WeightMonthlyPage extends StatelessWidget {
backgroundColor: CustomColors.appBackgroudGrey2Color,
body: 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,
@@ -40,9 +39,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,
diff --git a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
index 6725874f..94b5b3f8 100644
--- a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
+++ b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
@@ -26,9 +26,8 @@ class WeightWeeklyPage extends StatelessWidget {
backgroundColor: CustomColors.appBackgroudGrey2Color,
body: 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,
diff --git a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
index c0c2142b..38c3873d 100644
--- a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
+++ b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
@@ -31,9 +31,9 @@ class WeightYearPage extends StatelessWidget {
backgroundColor: CustomColors.appBackgroudGrey2Color,
body: 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,
@@ -42,9 +42,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(
diff --git a/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart b/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart
index f4d3aaed..6574780d 100644
--- a/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart
+++ b/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart
@@ -90,10 +90,9 @@ class _PrescriptionDeliveryAddressPageState extends State confirmSelectLocationDialog(model.addressesList),
@@ -199,9 +198,8 @@ class _PrescriptionDeliveryAddressPageState extends State Card(
+ (index) => Container(
margin: EdgeInsets.all(0.0),
- color: Colors.white,
- shape: cardRadius(0),
- elevation: 0,
+ decoration: cardRadius(0),
child: Row(
children: [
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: [
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),
diff --git a/lib/pages/medical/prescriptions/prescription_items_page.dart b/lib/pages/medical/prescriptions/prescription_items_page.dart
index 8765ebe4..6e30a3f7 100644
--- a/lib/pages/medical/prescriptions/prescription_items_page.dart
+++ b/lib/pages/medical/prescriptions/prescription_items_page.dart
@@ -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(
diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart
index e84a5063..f2a9490e 100644
--- a/lib/pages/medical/radiology/radiology_details_page.dart
+++ b/lib/pages/medical/radiology/radiology_details_page.dart
@@ -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(
diff --git a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
index 89f5545f..b7da4fa2 100644
--- a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
+++ b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
@@ -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(
diff --git a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
index e98bcb72..3211755c 100644
--- a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
+++ b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
@@ -52,9 +52,8 @@ class _VitalSingChartAndDetialsState extends State {
children: [
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 {
// 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),
diff --git a/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart b/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
index 1255a43d..424b0c90 100644
--- a/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
+++ b/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
@@ -40,9 +40,8 @@ class VitalSingChartBloodPressure extends StatelessWidget {
return SingleChildScrollView(
child: Column(
children: [
- 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),
diff --git a/lib/pages/rateAppointment/rate_appointment_clinic.dart b/lib/pages/rateAppointment/rate_appointment_clinic.dart
index ae8fe43a..94ee801a 100644
--- a/lib/pages/rateAppointment/rate_appointment_clinic.dart
+++ b/lib/pages/rateAppointment/rate_appointment_clinic.dart
@@ -56,9 +56,8 @@ class _RateAppointmentClinicState extends State {
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 {
),
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(
diff --git a/lib/pages/rateAppointment/rate_appointment_doctor.dart b/lib/pages/rateAppointment/rate_appointment_doctor.dart
index db581123..55e3fc31 100644
--- a/lib/pages/rateAppointment/rate_appointment_doctor.dart
+++ b/lib/pages/rateAppointment/rate_appointment_doctor.dart
@@ -63,9 +63,8 @@ class _RateAppointmentDoctorState extends State {
),
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 {
SizedBox(
height: 12,
),
- Card(
- elevation: 0,
- shape: cardRadius(10),
+ Container(
+ decoration: cardRadius(10),
child: Padding(
padding: EdgeInsets.all(8.0),
child: TextField(
diff --git a/lib/pages/settings/profile_setting.dart b/lib/pages/settings/profile_setting.dart
index f55227d8..b53e73d7 100644
--- a/lib/pages/settings/profile_setting.dart
+++ b/lib/pages/settings/profile_setting.dart
@@ -51,10 +51,9 @@ class _ProfileSettings extends State with TickerProviderStateMi
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Card(
- shape: cardRadius(8),
+ Container(
+ decoration: cardRadius(8),
margin: EdgeInsets.zero,
- elevation: 3,
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
diff --git a/lib/pages/vaccine/my_vaccines_screen.dart b/lib/pages/vaccine/my_vaccines_screen.dart
index f15ee9fb..1030c709 100644
--- a/lib/pages/vaccine/my_vaccines_screen.dart
+++ b/lib/pages/vaccine/my_vaccines_screen.dart
@@ -35,46 +35,50 @@ class _MyVaccinesState extends State {
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),
child: Column(
children: [
AppExpandableNotifier(
- isExpand: true,
- title: model.state == ViewState.Idle ? DateUtil.convertStringToDate(model.vaccineList[0].vaccinationDate).year.toString() : "",
- bodyWidget: Container(
- child: ListView.separated(
- scrollDirection: Axis.vertical,
- shrinkWrap: true,
- itemCount: model.vaccineList == null ? 0 : model.vaccineList.length,
- padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
- separatorBuilder: (context, index) => SizedBox(height: 14),
- itemBuilder: (BuildContext context, int index) {
- return DoctorCard(
- onTap: null,
- isInOutPatient: true,
- isShowInOutPatient: false,
- name: TranslationBase.of(context).dr.toString() + " " + model.vaccineList[index].doctorName,
- billNo: "",
- vaccineName: model.vaccineList[index].vaccineName,
- profileUrl: model.vaccineList[index].doctorImageURL,
- subName: model.vaccineList[index].projectName,
- isLiveCareAppointment: false,
- date: DateUtil.convertStringToDate(model.vaccineList[index].vaccinationDate),
- isSortByClinic: true,
- );
- }),
- )),
+ isExpand: true,
+ title: model.state == ViewState.Idle ? DateUtil.convertStringToDate(model.vaccineList[0].vaccinationDate).year.toString() : "",
+ bodyWidget: Container(
+ child: ListView.separated(
+ scrollDirection: Axis.vertical,
+ shrinkWrap: true,
+ itemCount: model.vaccineList == null ? 0 : model.vaccineList.length,
+ padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
+ separatorBuilder: (context, index) => SizedBox(height: 14),
+ itemBuilder: (BuildContext context, int index) {
+ return DoctorCard(
+ onTap: null,
+ isInOutPatient: true,
+ isShowInOutPatient: false,
+ name: TranslationBase.of(context).dr.toString() + " " + model.vaccineList[index].doctorName,
+ billNo: "",
+ vaccineName: model.vaccineList[index].vaccineName,
+ profileUrl: model.vaccineList[index].doctorImageURL,
+ subName: model.vaccineList[index].projectName,
+ isLiveCareAppointment: false,
+ date: DateUtil.convertStringToDate(model.vaccineList[index].vaccinationDate),
+ isSortByClinic: true,
+ );
+ },
+ ),
+ ),
+ ),
// SpaceBetweenTexts(space: 165.0),
],
),
),
bottomSheet: Container(
- color: Colors.white,
- padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
- child: Row(mainAxisSize: MainAxisSize.min, children: [
+ color: Colors.white,
+ padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).availability,
@@ -87,21 +91,24 @@ class _MyVaccinesState extends State {
),
SizedBox(width: 8),
Expanded(
- child: DefaultButton(
- TranslationBase.of(context).sendEmail,
- () {
- showDialog(
- context: context,
- child: ConfirmSendEmailDialog(
- email: projectViewModel.user.emailAddress,
- onTapSendEmail: () {
- model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully);
- },
- ),
- );
- },
- ))
- ])),
+ child: DefaultButton(
+ TranslationBase.of(context).sendEmail,
+ () {
+ showDialog(
+ context: context,
+ child: ConfirmSendEmailDialog(
+ email: projectViewModel.user.emailAddress,
+ onTapSendEmail: () {
+ model.sendEmail(message: TranslationBase.of(context).emailSentSuccessfully);
+ },
+ ),
+ );
+ },
+ ),
+ ),
+ ],
+ ),
+ ),
),
);
}
diff --git a/lib/uitl/utils_new.dart b/lib/uitl/utils_new.dart
index a02cc0bc..70bd7df0 100644
--- a/lib/uitl/utils_new.dart
+++ b/lib/uitl/utils_new.dart
@@ -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)),
);
}
diff --git a/lib/widgets/card/rounded_container.dart b/lib/widgets/card/rounded_container.dart
index a6cb36e2..b0d0fb8d 100644
--- a/lib/widgets/card/rounded_container.dart
+++ b/lib/widgets/card/rounded_container.dart
@@ -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 {
),
])
: 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,
));
}
diff --git a/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart b/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
index b1991f9f..8f5a0df9 100644
--- a/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
+++ b/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
@@ -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),
),
),
),
diff --git a/lib/widgets/data_display/medical/time_line_new_widget.dart b/lib/widgets/data_display/medical/time_line_new_widget.dart
index c32fa65c..a7d180c5 100644
--- a/lib/widgets/data_display/medical/time_line_new_widget.dart
+++ b/lib/widgets/data_display/medical/time_line_new_widget.dart
@@ -241,7 +241,8 @@ class _TimeLineViewState extends State {
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: () {
diff --git a/lib/widgets/errors/app_embedded_error.dart b/lib/widgets/errors/app_embedded_error.dart
index a4c956ca..b8bcc0cc 100644
--- a/lib/widgets/errors/app_embedded_error.dart
+++ b/lib/widgets/errors/app_embedded_error.dart
@@ -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),);
}
}
diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart
index cb6bc837..ef317092 100644
--- a/lib/widgets/others/app_scaffold_widget.dart
+++ b/lib/widgets/others/app_scaffold_widget.dart
@@ -115,7 +115,7 @@ class AppScaffold extends StatelessWidget {
bool isUserNotLogin = (!Provider.of(context, listen: false).isLogin && isShowDecPage);
return Scaffold(
- backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
+ backgroundColor: backgroundColor ?? CustomColors.appBackgroudGrey2Color,
appBar: isUserNotLogin
? null
: (showNewAppBar
diff --git a/lib/widgets/others/network_base_view.dart b/lib/widgets/others/network_base_view.dart
index 402a550b..7eacbd35 100644
--- a/lib/widgets/others/network_base_view.dart
+++ b/lib/widgets/others/network_base_view.dart
@@ -17,12 +17,12 @@ class NetworkBaseView extends StatefulWidget {
_NetworkBaseViewState createState() => _NetworkBaseViewState();
}
-class _NetworkBaseViewState extends State{
-
+class _NetworkBaseViewState extends State {
@override
void initState() {
super.initState();
}
+
@override
void dispose() {
super.dispose();
@@ -31,14 +31,18 @@ class _NetworkBaseViewState extends State{
@override
Widget build(BuildContext context) {
return Container(
- child: (widget.baseViewModel!=null ) ?buildBaseViewWidget():Center(
- child:widget.isLoading? CircularProgressIndicator(
- backgroundColor: Colors.white,
- valueColor: AlwaysStoppedAnimation(
- Colors.grey[500],
- ),
- ):widget.child,
- ) ,
+ child: (widget.baseViewModel != null)
+ ? buildBaseViewWidget()
+ : Center(
+ child: widget.isLoading
+ ? CircularProgressIndicator(
+ backgroundColor: Colors.white,
+ valueColor: AlwaysStoppedAnimation(
+ Colors.grey[500],
+ ),
+ )
+ : widget.child,
+ ),
);
}
@@ -50,11 +54,11 @@ class _NetworkBaseViewState extends State{
return widget.child;
break;
case ViewState.Busy:
- if(widget.isLocalLoader)
- return Container(
+ if (widget.isLocalLoader)
+ return Container(
height: 100,
child: Center(
- child:CircularProgressIndicator(
+ child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation(
Colors.grey[500],
@@ -62,19 +66,18 @@ class _NetworkBaseViewState extends State{
),
),
);
- 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))
- ],
- ),
- );
+ 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))
+ ],
+ ),
+ );
break;
case ViewState.Error:
return Center(
@@ -85,8 +88,4 @@ class _NetworkBaseViewState extends State{
break;
}
}
-
}
-
-
-