diff --git a/lib/screens/auth/change_password_screen.dart b/lib/screens/auth/change_password_screen.dart index 6fa15bfd..d6451049 100644 --- a/lib/screens/auth/change_password_screen.dart +++ b/lib/screens/auth/change_password_screen.dart @@ -9,6 +9,7 @@ class ChangePasswordScreen extends StatelessWidget { Widget build(BuildContext context) { return AppScaffold( + isShowAppBar: false, body: SafeArea( child: ListView(children: [ Container( diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index 38c81cc3..5b495abb 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -12,8 +12,8 @@ import '../../widgets/auth/login_form.dart'; import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; - DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); + class Loginsreen extends StatefulWidget { @override _LoginsreenState createState() => _LoginsreenState(); @@ -56,10 +56,10 @@ class _LoginsreenState extends State { @override Widget build(BuildContext context) { - getSharedPref(); return AppScaffold( isLoading: _isLoading, + isShowAppBar: false, body: SafeArea( child: ListView(children: [ FutureBuilder( @@ -80,24 +80,24 @@ class _LoginsreenState extends State { children: [ (platformImei == null) ? Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AuthHeader(loginType.knownUser), - LoginForm( - changeLoadingStata: - changeLoadingStata, - ), - ], - ) + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AuthHeader(loginType.knownUser), + LoginForm( + changeLoadingStata: + changeLoadingStata, + ), + ], + ) : Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AuthHeader(loginType.unknownUser), - KnownUserLogin(), - ], - ), + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AuthHeader(loginType.unknownUser), + KnownUserLogin(), + ], + ), ])); } } diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index 830530c9..d5ab66ad 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -38,6 +38,7 @@ class _VerificationMethodsScreenState extends State { Widget build(BuildContext context) { return AppScaffold( isLoading: _isLoading, + isShowAppBar: false, body: ListView(children: [ Container( margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), diff --git a/lib/screens/auth/verify_account_screen.dart b/lib/screens/auth/verify_account_screen.dart index b7eee5df..e69d973e 100644 --- a/lib/screens/auth/verify_account_screen.dart +++ b/lib/screens/auth/verify_account_screen.dart @@ -30,6 +30,7 @@ class _VerifyAccountScreenState extends State { Widget build(BuildContext context) { return AppScaffold( isLoading: _isLoading, + isShowAppBar: false, body: SafeArea( child: ListView(children: [ Container( diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 0252b141..e1540f93 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart' import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; @@ -26,6 +27,7 @@ import '../widgets/shared/rounded_container_widget.dart'; import 'doctor/doctor_reply_screen.dart'; import 'doctor/my_referral_patient_screen.dart'; import 'doctor/my_referred_patient_screen.dart'; + DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); Helpers helpers = Helpers(); @@ -41,20 +43,21 @@ class DashboardScreen extends StatefulWidget { class _DashboardScreenState extends State { HospitalProvider hospitalProvider; AuthProvider authProvider; - + bool isLoading = false; @override Widget build(BuildContext context) { hospitalProvider = Provider.of(context); authProvider = Provider.of(context); print(authProvider.doctorsClinicList); FocusScopeNode currentFocus = FocusScope.of(context); - if (!currentFocus.hasPrimaryFocus) { currentFocus.unfocus(); } return SafeArea( bottom: true, - child: Scaffold( + child: AppScaffold( + isShowAppBar: false, + isLoading: isLoading, body: SingleChildScrollView( child: SizedBox( height: MediaQuery.of(context).size.height * 1.09, @@ -434,11 +437,8 @@ class _DashboardScreenState extends State { ), ), ); - } - - showCupertinoPicker( {context, List actionList, decKey, onSelectFun}) { showModalBottomSheet( @@ -487,11 +487,12 @@ class _DashboardScreenState extends State { children: actionList .map((e) => Container( child: InkWell( - onTap: ()=>changeClinic(e.clinicID,context), + onTap: () => + changeClinic(e.clinicID, context), child: Text( - e.clinicName, - style: TextStyle(fontSize: 15), - )), + e.clinicName, + style: TextStyle(fontSize: 15), + )), )) .toList(), )) @@ -501,10 +502,11 @@ class _DashboardScreenState extends State { }); } - changeClinic(clinicId , BuildContext context) async{ + changeClinic(clinicId, BuildContext context) async { + Navigator.pop(context); + changeIsLoading(true); Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - DoctorProfileModel doctorProfile = - new DoctorProfileModel.fromJson(profile); + DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile); ProfileReqModel docInfo = new ProfileReqModel( doctorID: doctorProfile.doctorID, clinicID: clinicId, @@ -513,16 +515,21 @@ class _DashboardScreenState extends State { tokenID: '', languageID: 2); - // authProvider.getDocProfiles(docInfo) - authProvider.getDocProfiles(docInfo.toJson()).then((res)async { - sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); - Navigator.pop(context); - - }).catchError((err) { + authProvider.getDocProfiles(docInfo.toJson()).then((res) async { + + changeIsLoading(false); + sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); - // changeLoadingStata(false); + }).catchError((err) { + changeIsLoading(false); helpers.showErrorToast(err); }); } + + changeIsLoading(bool val) { + setState(() { + this.isLoading = val; + }); + } } diff --git a/lib/screens/doctor/message_screen.dart b/lib/screens/doctor/message_screen.dart index 18c6bf93..17d57c47 100644 --- a/lib/screens/doctor/message_screen.dart +++ b/lib/screens/doctor/message_screen.dart @@ -1,11 +1,11 @@ -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; class MessagesScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( + return AppScaffold( + isShowAppBar: false, body: Center( child: Text('Messages heeer'), ), diff --git a/lib/screens/doctor/my_schedule_screen.dart b/lib/screens/doctor/my_schedule_screen.dart index 36b449a7..281357ca 100644 --- a/lib/screens/doctor/my_schedule_screen.dart +++ b/lib/screens/doctor/my_schedule_screen.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/providers/schedule_provider.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/doctor/my_schedule_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; @@ -13,7 +14,8 @@ class MyScheduleScreen extends StatelessWidget { @override Widget build(BuildContext context) { scheduleProvider = Provider.of(context); - return Scaffold( + return AppScaffold( + isShowAppBar: false, body: scheduleProvider.isLoading ? DrAppCircularProgressIndeicator() : scheduleProvider.isError diff --git a/lib/screens/doctor/services_screen.dart b/lib/screens/doctor/services_screen.dart index 1000e694..d470cc87 100644 --- a/lib/screens/doctor/services_screen.dart +++ b/lib/screens/doctor/services_screen.dart @@ -4,7 +4,8 @@ import 'package:flutter/material.dart'; class ServicesScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( + return AppScaffold( + isShowAppBar: false, body: Center( child: Text('Services heeer'), ), diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index f020ca2e..1a91c7f3 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -98,7 +98,8 @@ class _PatientSearchScreenState extends State { }); } } catch (err) { - handelCatchErrorCase(err); + error = err; + // handelCatchErrorCase(err); } } diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 96211046..8182b3f0 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -106,7 +106,7 @@ class _PatientsScreenState extends State { setState(() { _isError = true; _isLoading = false; - this.error = helpers.generateContactAdminMsg(error); + this.error = error; }); }); } diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index bea5a1fc..7da036d3 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -359,12 +359,9 @@ class _VerifyAccountState extends State { loginProcessCompleted( res['List_DoctorProfile'][0], changeLoadingStata); } else { - _asyncSimpleDialog(context, res['List_DoctorsClinic'], 'ClinicName', - 'Please Select Clinic') - .then((clinicInfo) { - ClinicModel clinic = ClinicModel.fromJson(clinicInfo); - getDocProfiles(clinic, changeLoadingStata); - }); + ClinicModel clinic = + ClinicModel.fromJson(res['List_DoctorsClinic'][0]); + getDocProfiles(clinic, changeLoadingStata); } } else { changeLoadingStata(false); @@ -372,9 +369,7 @@ class _VerifyAccountState extends State { } }).catchError((err) { changeLoadingStata(false); - - print('$err'); - helpers.showErrorToast(); + helpers.showErrorToast(err); }); } else { // changeLoadingStata(false); @@ -440,7 +435,6 @@ class _VerifyAccountState extends State { helpers.showErrorToast(res['ErrorEndUserMessage']); } }).catchError((err) { - changeLoadingStata(false); helpers.showErrorToast(err); }); diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart index 824ba11b..9cc6f53c 100644 --- a/lib/widgets/shared/app_scaffold_widget.dart +++ b/lib/widgets/shared/app_scaffold_widget.dart @@ -9,15 +9,16 @@ class AppScaffold extends StatelessWidget { String appBarTitle; Widget body; bool isLoading; + bool isShowAppBar; - AppScaffold({this.appBarTitle ='', this.body, this.isLoading = false}); + AppScaffold({this.appBarTitle ='', this.body, this.isLoading = false, this.isShowAppBar = true}); @override Widget build(BuildContext context) { AppGlobal.CONTEX = context; return Scaffold( backgroundColor: Hexcolor('#F5F5F5'), - appBar: appBarTitle != '' + appBar: isShowAppBar ? AppBar( elevation: 0, backgroundColor: Hexcolor('#515B5D'),