merge-update-with-lab-changes
haroon amjad 5 years ago
parent 30d525791d
commit deb0b40cfe

@ -137,7 +137,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(5.0), borderRadius: BorderRadius.circular(5.0),
side: BorderSide( side: BorderSide(
color: Colors.blue[400], //Color of the border color: Color(0xff76cfb7), //Color of the border
style: BorderStyle.solid, //Style of the border style: BorderStyle.solid, //Style of the border
width: 1.5, //width of the border width: 1.5, //width of the border
), ),
@ -209,8 +209,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
color: _calendarController.isSelected(date) color: _calendarController.isSelected(date)
? Colors.green[400] ? Colors.green[400]
: _calendarController.isToday(date) : _calendarController.isToday(date)
? Colors.brown[300] ? Colors.transparent
: Colors.blue[400], : Color(0xff76cfb7),
), ),
width: 40.0, width: 40.0,
height: 40.0, height: 40.0,
@ -321,7 +321,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
Widget getSelectedButton(int index) { Widget getSelectedButton(int index) {
return RaisedButton( return RaisedButton(
color: Colors.blue[400], color: Color(0xff76cfb7), //Color of the border
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
setState(() { setState(() {
@ -399,10 +399,10 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments>
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: _calendarController.isSelected(date) color: _calendarController.isSelected(date)
? Colors.green[400] ? Color(0xffB8382C)
: _calendarController.isToday(date) : _calendarController.isToday(date)
? Colors.brown[300] ? Colors.brown[300]
: Colors.blue[400], : Color(0xff76cfb7),
), ),
width: 40.0, width: 40.0,
height: 40.0, height: 40.0,

@ -239,6 +239,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails>
MaterialPageRoute( MaterialPageRoute(
builder: (context) => BookConfirm( builder: (context) => BookConfirm(
doctor: getDoctorObject(), doctor: getDoctorObject(),
isLiveCareAppointment: widget.appo.isLiveCareAppointment,
selectedDate: DocAvailableAppointments.selectedDate, selectedDate: DocAvailableAppointments.selectedDate,
selectedTime: DocAvailableAppointments.selectedTime))); selectedTime: DocAvailableAppointments.selectedTime)));
} }

@ -110,7 +110,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
child: Text(e.title, child: Text(e.title,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
color: new Color(0xFF40ACC9), color: new Color(0xffB8382C),
letterSpacing: 1.0, letterSpacing: 1.0,
fontSize: 18.0)), fontSize: 18.0)),
), ),

@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -245,11 +246,16 @@ class _HomePageState extends State<HomePage> {
Radius.circular(0)), Radius.circular(0)),
), ),
child: Center( child: Center(
child: Texts( child: InkWell(
TranslationBase.of(context).viewMore, onTap: () {
color: Colors.white, openBrowser();
fontWeight: FontWeight.w700, },
fontSize: 12, child: Texts(
TranslationBase.of(context).viewMore,
color: Colors.white,
fontWeight: FontWeight.w700,
fontSize: 12,
),
), ),
), ),
), ),
@ -757,6 +763,11 @@ class _HomePageState extends State<HomePage> {
); );
} }
openBrowser() {
InAppBrowser browser = new InAppBrowser();
browser.openUrl(url: "https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=ca9dd276-0a20-4924-a768-fafa9a855ef1&&CustomerId=1367368");
}
navigateToCovidDriveThru() { navigateToCovidDriveThru() {
Navigator.push(context, Navigator.push(context,
MaterialPageRoute(builder: (context) => CovidDrivethruLocation())); MaterialPageRoute(builder: (context) => CovidDrivethruLocation()));

Loading…
Cancel
Save