From a535543863c4c67eb0e3913222e7e64692f5a9e7 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 8 Sep 2020 15:05:46 +0300 Subject: [PATCH] more pages added on the voice search --- .../BookAppointment/widgets/BranchView.dart | 18 +++-- lib/pages/login/login-type.dart | 4 +- lib/pages/login/login.dart | 2 + lib/widgets/others/bottom_bar.dart | 66 +++++++++++++++++++ 4 files changed, 84 insertions(+), 6 deletions(-) diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 48613ebf..455a579b 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -47,7 +47,7 @@ class ExpandableListView extends StatefulWidget { final List resultDistance; final List doctorsList2; final val; - + static int doctorListheight = 0; const ExpandableListView( {Key key, this.result2, this.resultDistance, this.val, this.doctorsList2}) : super(key: key); @@ -59,8 +59,6 @@ class ExpandableListView extends StatefulWidget { class _ExpandableListViewState extends State { bool expandFlag = false; - var _radioValue1; - @override Widget build(BuildContext context) { return new Container( @@ -112,6 +110,10 @@ class _ExpandableListViewState extends State { onPressed: () { setState(() { expandFlag = !expandFlag; + if (expandFlag == true) { + setDoctorViewHeight( + widget.result2[widget.val].toString()); + } }); }), ], @@ -146,6 +148,11 @@ class _ExpandableListViewState extends State { ); } + setDoctorViewHeight(name) { + ExpandableListView.doctorListheight = + widget.doctorsList2.where((e) => e.projectName == name).toList().length; + } + String getProjectDistance(String distance) { if (distance != "0") return " - " + distance + " " + TranslationBase.of(context).km; @@ -178,9 +185,12 @@ class ExpandableContainer extends StatelessWidget { duration: new Duration(milliseconds: 500), curve: Curves.easeInOut, width: screenWidth, - height: expanded ? MediaQuery.of(context).size.height : collapsedHeight, + height: expanded + ? (ExpandableListView.doctorListheight * 160).toDouble() + : collapsedHeight, child: new Container( child: child, + padding: EdgeInsets.only(bottom: 30), decoration: new BoxDecoration( border: new Border.all(width: 1.0, color: Colors.white)), ), diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index 7a8a940d..24d28ba1 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -23,7 +23,7 @@ class LoginType extends StatelessWidget { Expanded( flex: 4, child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + // mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( @@ -135,7 +135,7 @@ class LoginType extends StatelessWidget { ]), ), Expanded( - flex: 2, + flex: 1, child: Column( mainAxisAlignment: MainAxisAlignment.end, children: [ diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 7510987c..b0942a88 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -180,6 +180,7 @@ class _Login extends State { // request.logInTokenID = await sharedPref.getString(LOGIN_TOKEN_ID); // request.activationCode = code ?? "0000"; // request.isSilentLogin = code != null ? false : true; + if (code == null) showLoader(true); request['PatientMobileNumber'] = int.parse(mobileNo); request['ZipCode'] = countryCode; request['SearchType'] = loginType; @@ -201,6 +202,7 @@ class _Login extends State { Navigator.of(context).pushNamed( HOME, ), + showLoader(false), appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index cd264111..2e936c1d 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -11,9 +11,15 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -289,6 +295,66 @@ class _SearchBot extends State { } } break; + case '4': + { + Navigator.push(context, FadePage(page: LabsHomePage())); + } + break; + case '6': + { + Navigator.push(context, FadePage(page: RadiologyHomePage())); + } + break; + case '7': + { + Navigator.push( + context, + FadePage( + page: MyAppointments(), + ), + ); + } + break; + case '7': + { + Navigator.push( + context, + FadePage( + page: MyAppointments(), + ), + ); + } + break; + case '8': + { + Navigator.push( + context, + FadePage( + page: HomePrescriptionsPage(), + ), + ); + } + break; + case '9': + { + Navigator.push( + context, + FadePage( + page: DoctorHomePage(), + ), + ); + } + break; + case '10': + { + Navigator.push( + context, + FadePage( + page: VitalSignDetailsScreen(), + ), + ); + } + break; default: Navigator.of(context).pushNamed(HOME); speak();