From 34778d91d75616d239613dadce58f2470d532445 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 25 Aug 2024 17:27:05 +0300 Subject: [PATCH 1/4] language fixes --- lib/config/config.dart | 12 ++++++------ lib/core/viewModels/project_view_model.dart | 2 +- lib/pages/Blood/confirm_payment_page.dart | 1 - lib/pages/Covid-DriveThru/covid-payment-summary.dart | 1 - lib/pages/medical/balance/confirm_payment_page.dart | 1 - lib/services/clinic_services/get_clinic_service.dart | 2 +- lib/uitl/app_shared_preferences.dart | 3 ++- lib/widgets/in_app_browser/InAppBrowser.dart | 4 ++-- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index d58bcff6..a9091a47 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -22,8 +22,8 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'http://10.50.100.198:4422/'; -var BASE_URL = 'https://uat.hmgwebservices.com/'; -// var BASE_URL = 'https://hmgwebservices.com/'; +// var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.20.200.111:1010/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; @@ -668,10 +668,10 @@ var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification' //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -// var payFortEnvironment = FortEnvironment.production; -// var applePayMerchantId = "merchant.com.hmgwebservices"; -var payFortEnvironment = FortEnvironment.test; -var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +var payFortEnvironment = FortEnvironment.production; +var applePayMerchantId = "merchant.com.hmgwebservices"; +// var payFortEnvironment = FortEnvironment.test; +// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart index 398b3afe..7216da7b 100644 --- a/lib/core/viewModels/project_view_model.dart +++ b/lib/core/viewModels/project_view_model.dart @@ -30,7 +30,7 @@ class ProjectViewModel extends BaseViewModel { AppSharedPreferences sharedPref = AppSharedPreferences(); Locale _appLocale = Locale('ar'); String currentLanguage = 'ar'; - bool _isArabic = false; + bool _isArabic = true; bool isInternetConnection = true; bool isLoading = false; bool isError = false; diff --git a/lib/pages/Blood/confirm_payment_page.dart b/lib/pages/Blood/confirm_payment_page.dart index 20cfd88f..edf3d0e5 100644 --- a/lib/pages/Blood/confirm_payment_page.dart +++ b/lib/pages/Blood/confirm_payment_page.dart @@ -290,7 +290,6 @@ class ConfirmPaymentPage extends StatelessWidget { GifLoaderDialogUtils.showMyDialog(AppGlobal.context); service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, AppGlobal.context).then((res) { GifLoaderDialogUtils.hideDialog(AppGlobal.context); - print(res); navigateToHome(AppGlobal.context); }).catchError((err) { GifLoaderDialogUtils.hideDialog(AppGlobal.context); diff --git a/lib/pages/Covid-DriveThru/covid-payment-summary.dart b/lib/pages/Covid-DriveThru/covid-payment-summary.dart index a9a2af78..384b2422 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-summary.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-summary.dart @@ -420,7 +420,6 @@ class _CovidPaymentSummaryState extends State { addAdvancedNumberRequest(String advanceNumber, String paymentReference, String appointmentID) { DoctorsListService service = new DoctorsListService(); service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, context).then((res) { - print(res); getAppoQR(context); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); diff --git a/lib/pages/medical/balance/confirm_payment_page.dart b/lib/pages/medical/balance/confirm_payment_page.dart index c5fb2c2e..da9570f2 100644 --- a/lib/pages/medical/balance/confirm_payment_page.dart +++ b/lib/pages/medical/balance/confirm_payment_page.dart @@ -529,7 +529,6 @@ class _ConfirmPaymentPageState extends State { addAdvancedNumberRequest(String advanceNumber, String paymentReference, dynamic appointmentID, AppoitmentAllHistoryResultList appo) { DoctorsListService service = new DoctorsListService(); service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, AppGlobal.context).then((res) { - print(res); GifLoaderDialogUtils.hideDialog(AppGlobal.context); navigateToHome(AppGlobal.context); }).catchError((err) { diff --git a/lib/services/clinic_services/get_clinic_service.dart b/lib/services/clinic_services/get_clinic_service.dart index 82e52ae7..dc494a61 100644 --- a/lib/services/clinic_services/get_clinic_service.dart +++ b/lib/services/clinic_services/get_clinic_service.dart @@ -52,7 +52,7 @@ class ClinicListService extends BaseService { Future getProjectsList(int languageID, context) async { Map request = {}; - request = {"LanguageID": languageID}; + // request = {"LanguageID": languageID}; dynamic localRes; diff --git a/lib/uitl/app_shared_preferences.dart b/lib/uitl/app_shared_preferences.dart index 2d5fa774..4ecd1b91 100644 --- a/lib/uitl/app_shared_preferences.dart +++ b/lib/uitl/app_shared_preferences.dart @@ -76,7 +76,8 @@ class AppSharedPreferences { final SharedPreferences prefs = await _prefs; await prefs.reload(); String value = prefs.getString(key).toString(); - return value == null ? defaultVal : value; + return (value == null) || (value == "null") ? defaultVal : value; + // return value == null ? defaultVal : value; } /// Get List of String [key] the key was saved diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 9ffec736..f353eec2 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS From 50ba0372db9bdac15ac0a01890584c71dc90e389 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 25 Aug 2024 17:51:15 +0300 Subject: [PATCH 2/4] language updates --- lib/config/localized_values.dart | 1 + .../components/SearchByClinic.dart | 18 +++++++++++--- .../dialog/clinic_list_dialog.dart | 19 +++++++++++++-- lib/uitl/translations_delegate_base.dart | 1 + lib/widgets/drawer/app_drawer_widget.dart | 24 +++++++++++++++---- lib/widgets/drawer/drawer_item_widget.dart | 22 +++++++++++++---- 6 files changed, 70 insertions(+), 15 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 311cb419..a2165f33 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1976,4 +1976,5 @@ const Map localizedValues = { "selectHospitalBloodDonation": {"en": "Please select the hospital you want to book an appointment with: ", "ar": "يرجى اختيار المستشفى الذي تريد حجز موعد معه:"}, "wecare": {"en": "We Care", "ar": "نحن نهتم"}, "myinstructions": {"en": "My Instructions", "ar": "تعليماتي"}, + "searchClinic": {"en": "Search Clinic", "ar": "بحث العيادة"}, }; diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 747dcb92..a929149d 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -1,6 +1,8 @@ import "dart:collection"; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; @@ -73,7 +75,7 @@ class _SearchByClinicState extends State { super.initState(); } - void checkPVM(){ + void checkPVM() { if (context.read().isLogin) { if (radioValue == null) { if (context.read().user.gender == 1) { @@ -89,7 +91,6 @@ class _SearchByClinicState extends State { ageController.text = context.read().isLogin ? context.read().user!.age.toString() : ""; ageController.selection = TextSelection.fromPosition(TextPosition(offset: ageController.text.length)); } - } @override @@ -209,7 +210,18 @@ class _SearchByClinicState extends State { }); }, ), - Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)), + AutoSizeText( + TranslationBase.of(context).nearestAppo.trim(), + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.4, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), + ), + // Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56)), ], ), ), diff --git a/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart b/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart index c68db13a..ecbe1003 100644 --- a/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart +++ b/lib/pages/BookAppointment/dialog/clinic_list_dialog.dart @@ -1,4 +1,7 @@ +import 'package:auto_size_text/auto_size_text.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/models/Clinics/ClinicListResponse.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -79,7 +82,7 @@ class _ClickListDialogState extends State { }, decoration: InputDecoration( hintStyle: TextStyle(fontSize: 17), - hintText: 'Search Clinic', + hintText: TranslationBase.of(context).searchClinic, suffixIcon: Icon(Icons.search), border: InputBorder.none, contentPadding: EdgeInsets.all(12), @@ -99,7 +102,19 @@ class _ClickListDialogState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Expanded(child: Text(tempClinicsList[index].clinicDescription!.trim())), + Expanded( + child: AutoSizeText( + tempClinicsList[index].clinicDescription!.trim(), + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.4, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), + ), + ), tempClinicsList[index].isLiveCareClinicAndOnline! ? SvgPicture.asset( 'assets/images/new-design/video_icon_green_right.svg', diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 46f4807c..9aa15082 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -2963,6 +2963,7 @@ class TranslationBase { String get selectHospitalBloodDonation => localizedValues["selectHospitalBloodDonation"][locale.languageCode]; String get wecare => localizedValues["wecare"][locale.languageCode]; String get myinstructions => localizedValues["myinstructions"][locale.languageCode]; + String get searchClinic => localizedValues["searchClinic"][locale.languageCode]; } diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 1b525e21..95e259d1 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,4 +1,5 @@ import 'dart:io' show Platform; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:diplomaticquarterapp/analytics/google-analytics.dart'; import 'package:diplomaticquarterapp/config/config.dart'; @@ -144,17 +145,30 @@ class _AppDrawerState extends State { (user != null && projectProvider!.isLogin) ? user!.firstName! + ' ' + user!.lastName! : TranslationBase.of(context).cantSeeProfile, style: TextStyle(color: Color(0xff2E303A), fontWeight: FontWeight.bold, fontSize: 20, letterSpacing: -1.2, height: 35 / 20), ), - Text( + AutoSizeText( (user != null && projectProvider!.isLogin) ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString() : TranslationBase.of(context).loginRegisterNow, + maxLines: 1, + minFontSize: 10, style: TextStyle( - color: Color(0xff2E303A), - fontSize: 16, - letterSpacing: -0.96, - height: 1, + fontSize: SizeConfig.textMultiplier! * 1.6, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, ), ), + // Text( + // (user != null && projectProvider!.isLogin) + // ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString() + // : TranslationBase.of(context).loginRegisterNow, + // style: TextStyle( + // color: Color(0xff2E303A), + // fontSize: 16, + // letterSpacing: -0.96, + // height: 1, + // ), + // ), mHeight(20.0), (user != null && projectProvider!.isLogin) ? Image.network("https://api.qrserver.com/v1/create-qr-code/?size=250x250&data=${user!.patientID.toString()}", fit: BoxFit.fill, height: 73.5, width: 73.5) diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart index af0d81e9..d5bac14f 100644 --- a/lib/widgets/drawer/drawer_item_widget.dart +++ b/lib/widgets/drawer/drawer_item_widget.dart @@ -1,5 +1,6 @@ import 'dart:ui'; +import 'package:auto_size_text/auto_size_text.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; @@ -60,13 +61,24 @@ class _DrawerItemState extends State { child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: [ Row( children: [ - AppText( + AutoSizeText( widget.title!, - fontWeight: FontWeight.w600, - fontSize: widget.fontSize, - height: widget.fontHeight, - letterSpacing: widget.letterSpacing, + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.6, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), ), + // AppText( + // widget.title!, + // fontWeight: FontWeight.w600, + // fontSize: widget.fontSize, + // height: widget.fontHeight, + // letterSpacing: widget.letterSpacing, + // ), widget.count ?? SizedBox(), ], ), From d3d8d1f1211a68c77929eea1b22c3b093fdd38ce Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 26 Aug 2024 15:23:17 +0300 Subject: [PATCH 3/4] Update to stores 16.0 --- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- lib/config/config.dart | 2 +- lib/core/service/client/base_app_client.dart | 6 +++--- .../components/SearchByClinic.dart | 15 +++++++++++++-- lib/pages/landing/landing_page.dart | 2 +- lib/uitl/push-notification-handler.dart | 2 +- pubspec.yaml | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 130bc8cc..e7357518 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -549,7 +549,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.93; + MARKETING_VERSION = 4.5.95; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -696,7 +696,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.93; + MARKETING_VERSION = 4.5.95; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -734,7 +734,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.5.93; + MARKETING_VERSION = 4.5.95; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/config/config.dart b/lib/config/config.dart index a9091a47..257a760b 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -344,7 +344,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 15.9; +var VERSION_ID = 16.0; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index d8f30f0c..f2a656aa 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -203,9 +203,9 @@ class BaseAppClient { body.removeWhere((key, value) => key == null || value == null); // if (AppGlobal.isNetworkDebugEnabled) { - print("URL : $url"); - final jsonBody = json.encode(body); - print(jsonBody); + // print("URL : $url"); + // final jsonBody = json.encode(body); + // print(jsonBody); // } if (await Utils.checkConnection( diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index a929149d..849a0afc 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -339,7 +339,18 @@ class _SearchByClinicState extends State { items: projectsList.map((HospitalsModel item) { return DropdownMenuItem( value: item, - child: Text('${item.name!}'), + child: AutoSizeText( + item.name!, + maxLines: 1, + minFontSize: 10, + style: TextStyle( + fontSize: SizeConfig.textMultiplier! * 1.6, + fontWeight: FontWeight.w600, + letterSpacing: -0.39, + height: 0.8, + ), + ), + // Text('${item.name!}'), ); }).toList(), onChanged: (HospitalsModel? newValue) async { @@ -662,7 +673,7 @@ class _SearchByClinicState extends State { }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); - AppToast.showErrorToast(message: err); + AppToast.showErrorToast(message: err, localContext: context); }); } diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index ebe6e67b..256662a3 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -322,7 +322,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { // HMGNetworkConnectivity(context).start(); _firebaseMessaging.getToken().then((String? token) { - print("Firebase Token: " + token!); + // print("Firebase Token: " + token!); sharedPref.setString(PUSH_TOKEN, token!); if (Platform.isIOS) { FirebaseMessaging.instance.getAPNSToken().then((value) { diff --git a/lib/uitl/push-notification-handler.dart b/lib/uitl/push-notification-handler.dart index 6372e326..8d730102 100644 --- a/lib/uitl/push-notification-handler.dart +++ b/lib/uitl/push-notification-handler.dart @@ -407,7 +407,7 @@ class PushNotificationHandler { } onToken(String token) async { - print("Push Notification Token: " + token); + // print("Push Notification Token: " + token); await AppSharedPreferences().setString(PUSH_TOKEN, token); DEVICE_TOKEN = token; } diff --git a/pubspec.yaml b/pubspec.yaml index 0e9b2bd6..6757122d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.5.061+4050061 +version: 4.5.063+4050063 environment: sdk: ">=3.0.0 <3.13.0" From f36fc4d88d906eaa7d1829270512b1a044213548 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 28 Aug 2024 10:05:14 +0300 Subject: [PATCH 4/4] ListView accordion fixes --- lib/pages/MyAppointments/MyAppointments.dart | 1 + lib/pages/medical/ask_doctor/ask_doctor_page.dart | 1 + lib/pages/medical/labs/laboratory_result_page.dart | 1 + lib/pages/medical/labs/labs_home_page.dart | 3 ++- lib/pages/medical/prescriptions/prescriptions_page.dart | 1 + lib/pages/medical/radiology/radiology_home_page.dart | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart index c279a9ab..d2bd25c3 100644 --- a/lib/pages/MyAppointments/MyAppointments.dart +++ b/lib/pages/MyAppointments/MyAppointments.dart @@ -405,6 +405,7 @@ class _MyAppointmentsState extends State with SingleTickerProvid Widget _appointmentExpandableList(List _patientAppointmentList) { return ListView.separated( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { diff --git a/lib/pages/medical/ask_doctor/ask_doctor_page.dart b/lib/pages/medical/ask_doctor/ask_doctor_page.dart index 1081ef52..ab032541 100644 --- a/lib/pages/medical/ask_doctor/ask_doctor_page.dart +++ b/lib/pages/medical/ask_doctor/ask_doctor_page.dart @@ -40,6 +40,7 @@ class AskDoctorPage extends StatelessWidget { Widget _appointmentExpandableList(List _patientDoctorAppointmentList, model) { return ListView.separated( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { diff --git a/lib/pages/medical/labs/laboratory_result_page.dart b/lib/pages/medical/labs/laboratory_result_page.dart index 698e34d5..69f4b10e 100644 --- a/lib/pages/medical/labs/laboratory_result_page.dart +++ b/lib/pages/medical/labs/laboratory_result_page.dart @@ -53,6 +53,7 @@ class _LaboratoryResultPageState extends State { child: Column( children: [ ListView.builder( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), shrinkWrap: true, padding: EdgeInsets.only(bottom: 12), diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index b78617f3..7998b558 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -17,7 +17,7 @@ import 'package:provider/provider.dart'; import 'laboratory_result_page.dart'; class LabsHomePage extends StatelessWidget { - List imagesInfo =[]; + List imagesInfo = []; @override Widget build(BuildContext context) { @@ -50,6 +50,7 @@ class LabsHomePage extends StatelessWidget { child: FractionallySizedBox( widthFactor: 1.0, child: ListView.separated( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { diff --git a/lib/pages/medical/prescriptions/prescriptions_page.dart b/lib/pages/medical/prescriptions/prescriptions_page.dart index 0c24c66f..e550e1b0 100644 --- a/lib/pages/medical/prescriptions/prescriptions_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_page.dart @@ -26,6 +26,7 @@ class PrescriptionsPage extends StatelessWidget { return AppScaffold( baseViewModel: prescriptionsViewModel, body: ListView.separated( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) { diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index 09e443e5..fb60d5da 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -54,6 +54,7 @@ class RadiologyHomePage extends StatelessWidget { child: FractionallySizedBox( widthFactor: 1.0, child: ListView.separated( + addAutomaticKeepAlives: true, physics: BouncingScrollPhysics(), padding: EdgeInsets.only(top: 12), separatorBuilder: (context, index) {