Merge branch 'update_flutter_3.16.0' into update_3.16.0_CR5439_Pharmacy_Intervention

# Conflicts:
#	lib/config/config.dart
update_3.16.0_CR5439_Pharmacy_Intervention
Sultan Khan 12 months ago
commit c246248d3b

@ -7,6 +7,7 @@ const ONLY_DATE = "[0-9/]";
// const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/';
const BASE_URL_LIVE_CARE = 'https://uat.hmgwebservices.com/'; const BASE_URL_LIVE_CARE = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'http://10.20.200.111:1010/'; // const BASE_URL = 'http://10.20.200.111:1010/';

@ -438,7 +438,7 @@ class _HomeScreenState extends State<HomeScreen> {
)); ));
changeColorIndex(); changeColorIndex();
if (!Utils.isVidaPlusInPatientProject(projectsProvider, model.doctorProfile!.projectID!)) { if (model.doctorProfile !=null && !Utils.isVidaPlusInPatientProject(projectsProvider, model.doctorProfile!.projectID!)) {
patientCards.add(HomePatientCard( patientCards.add(HomePatientCard(
gradient: backgroundColors[colorIndex], gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex],
@ -597,6 +597,8 @@ class _HomeScreenState extends State<HomeScreen> {
} }
void _showErrorBottomSheet(BuildContext context, String errorMessage) { void _showErrorBottomSheet(BuildContext context, String errorMessage) {
showModalBottomSheet( showModalBottomSheet(
isDismissible:false,
enableDrag:false,
context: context, context: context,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)), borderRadius: BorderRadius.vertical(top: Radius.circular(20)),

@ -42,7 +42,7 @@ class Utils {
), ),
actions: [ actions: [
AppButton( AppButton(
onPressed:() => okFunction(), onPressed: () => okFunction(),
title: TranslationBase.of(context).noteConfirm, title: TranslationBase.of(context).noteConfirm,
fontColor: Colors.white, fontColor: Colors.white,
color: AppGlobal.appGreenColor, color: AppGlobal.appGreenColor,

Loading…
Cancel
Save