diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index 7caf1977..d18d4680 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -137,7 +137,7 @@ class _DocAvailableAppointmentsState extends State shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(5.0), side: BorderSide( - color: Colors.blue[400], //Color of the border + color: Color(0xff76cfb7), //Color of the border style: BorderStyle.solid, //Style of the border width: 1.5, //width of the border ), @@ -209,8 +209,8 @@ class _DocAvailableAppointmentsState extends State color: _calendarController.isSelected(date) ? Colors.green[400] : _calendarController.isToday(date) - ? Colors.brown[300] - : Colors.blue[400], + ? Colors.transparent + : Color(0xff76cfb7), ), width: 40.0, height: 40.0, @@ -321,7 +321,7 @@ class _DocAvailableAppointmentsState extends State Widget getSelectedButton(int index) { return RaisedButton( - color: Colors.blue[400], + color: Color(0xff76cfb7), //Color of the border textColor: Colors.white, onPressed: () { setState(() { @@ -399,10 +399,10 @@ class _DocAvailableAppointmentsState extends State decoration: BoxDecoration( shape: BoxShape.circle, color: _calendarController.isSelected(date) - ? Colors.green[400] + ? Color(0xffB8382C) : _calendarController.isToday(date) ? Colors.brown[300] - : Colors.blue[400], + : Color(0xff76cfb7), ), width: 40.0, height: 40.0, diff --git a/lib/pages/MyAppointments/AppointmentDetails.dart b/lib/pages/MyAppointments/AppointmentDetails.dart index 17b6d57b..b638b2ff 100644 --- a/lib/pages/MyAppointments/AppointmentDetails.dart +++ b/lib/pages/MyAppointments/AppointmentDetails.dart @@ -239,6 +239,7 @@ class _AppointmentDetailsState extends State MaterialPageRoute( builder: (context) => BookConfirm( doctor: getDoctorObject(), + isLiveCareAppointment: widget.appo.isLiveCareAppointment, selectedDate: DocAvailableAppointments.selectedDate, selectedTime: DocAvailableAppointments.selectedTime))); } diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index 60035ee1..0df4a3a5 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -110,7 +110,7 @@ class _AppointmentActionsState extends State { child: Text(e.title, overflow: TextOverflow.clip, style: TextStyle( - color: new Color(0xFF40ACC9), + color: new Color(0xffB8382C), letterSpacing: 1.0, fontSize: 18.0)), ), diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index f5a00f04..511630c4 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; @@ -245,11 +246,16 @@ class _HomePageState extends State { Radius.circular(0)), ), child: Center( - child: Texts( - TranslationBase.of(context).viewMore, - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: 12, + child: InkWell( + onTap: () { + openBrowser(); + }, + child: Texts( + TranslationBase.of(context).viewMore, + color: Colors.white, + fontWeight: FontWeight.w700, + fontSize: 12, + ), ), ), ), @@ -757,6 +763,11 @@ class _HomePageState extends State { ); } + openBrowser() { + InAppBrowser browser = new InAppBrowser(); + browser.openUrl(url: "https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=ca9dd276-0a20-4924-a768-fafa9a855ef1&&CustomerId=1367368"); + } + navigateToCovidDriveThru() { Navigator.push(context, MaterialPageRoute(builder: (context) => CovidDrivethruLocation()));