Merge remote-tracking branch 'origin/update_flutter_3.16.0' into update_flutter_3.16.0

update_flutter_3.16.0_voipcall
Aamir Muhammad 2 years ago
commit 7e4792d8cd

@ -349,8 +349,9 @@ class BaseAppClient {
get({required String endPoint, required Function(dynamic response, int statusCode) onSuccess, required Function(String error, int statusCode) onFailure}) async { get({required String endPoint, required Function(dynamic response, int statusCode) onSuccess, required Function(String error, int statusCode) onFailure}) async {
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
String url = DOCTOR_ROTATION + endPoint + '&token=' + token; String url = DOCTOR_ROTATION + endPoint + '&token=' + token;
print(url);
final response = await http.get(Uri.parse(url)); final response = await http.get(Uri.parse(url));
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Utils.generateContactAdminMsg(), statusCode); onFailure(Utils.generateContactAdminMsg(), statusCode);

@ -15,6 +15,9 @@ import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_field_custom_serach.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_field_custom_serach.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../utils/translations_delegate_base_utils.dart';
import '../../widgets/shared/errors/error_message.dart';
class LiveCarePatientScreen extends StatefulWidget { class LiveCarePatientScreen extends StatefulWidget {
@override @override
_LiveCarePatientScreenState createState() => _LiveCarePatientScreenState(); _LiveCarePatientScreenState createState() => _LiveCarePatientScreenState();

@ -167,7 +167,7 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: item.isInPatient, isInPatient: item.isInPatient,
isDischargedPatient: item.isDischargedPatient, isDischargedPatient: item.isDischargedPatient,
isDisable: item.isDisable, isDisable: item.isDisable,
onTap: item.onTap, onTap:item.onTap,
isLoading: item.isLoading, isLoading: item.isLoading,
); );
}).toList(), }).toList(),

@ -115,7 +115,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
//Colors.red[900] Color(0xff404545) //Colors.red[900] Color(0xff404545)
color: model.radiologyList[index].isLiveCareAppodynamicment ?? false color: model.radiologyList[index].isLiveCareAppodynamicment ?? false
? Colors.red[900] ? Colors.red[900]
: !model.radiologyList[index].isInOutPatient! : model.radiologyList[index].isInOutPatient !=null && model.radiologyList[index].isInOutPatient==false
? Colors.black ? Colors.black
: Color(0xffa9a089), : Color(0xffa9a089),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@ -128,9 +128,9 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
quarterTurns: 3, quarterTurns: 3,
child: Center( child: Center(
child: Text( child: Text(
model.radiologyList[index].isLiveCareAppodynamicment! model.radiologyList[index].isLiveCareAppodynamicment !=null && model.radiologyList[index].isLiveCareAppodynamicment==true
? TranslationBase.of(context).liveCare.toUpperCase() ? TranslationBase.of(context).liveCare.toUpperCase()
: !model.radiologyList[index].isInOutPatient! : model.radiologyList[index].isInOutPatient!=null && model.radiologyList[index].isInOutPatient==false
? TranslationBase.of(context).inPatientLabel.toUpperCase() ? TranslationBase.of(context).inPatientLabel.toUpperCase()
: TranslationBase.of(context).outpatient.toUpperCase(), : TranslationBase.of(context).outpatient.toUpperCase(),
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),

@ -101,8 +101,7 @@ class OldPrescriptionsPage extends StatelessWidget {
), ),
), ),
) )
: Center( : FractionallySizedBox(
child: FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.9,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
@ -182,7 +181,7 @@ class OldPrescriptionsPage extends StatelessWidget {
], ],
), ),
), ),
),
))); )));
} }
} }

@ -25,7 +25,7 @@ class _MasterKeyDailogState extends State<MasterKeyDailog> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
widget.selectedValue = widget.selectedValue ?? widget.list[0]; widget.selectedValue = widget.selectedValue ?? widget.list.first;
} }
@override @override

Loading…
Cancel
Save