design fixes 1.1

merge-requests/437/merge
Mirza.Shafique 5 years ago
parent 4dca22bec1
commit a273bacc17

@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_ORDERS = '/api/orders';
const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -192,6 +192,7 @@ class _BookConfirmState extends State<BookConfirm> {
child: RaisedButton( child: RaisedButton(
color: CustomColors.green, color: CustomColors.green,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {

@ -143,6 +143,7 @@ class _BookSuccessState extends State<BookSuccess> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -177,6 +178,7 @@ class _BookSuccessState extends State<BookSuccess> {
child: RaisedButton( child: RaisedButton(
color: CustomColors.green, color: CustomColors.green,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -197,6 +199,7 @@ class _BookSuccessState extends State<BookSuccess> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xffc5272d), color: new Color(0xffc5272d),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -232,6 +235,7 @@ class _BookSuccessState extends State<BookSuccess> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xffc5272d), color: new Color(0xffc5272d),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -252,6 +256,7 @@ class _BookSuccessState extends State<BookSuccess> {
child: RaisedButton( child: RaisedButton(
color: CustomColors.green, color: CustomColors.green,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {

@ -70,7 +70,7 @@ class _DentalComplaintsState extends State<DentalComplaints> {
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 14, right: 14), padding: const EdgeInsets.only(left: 14, right: 14),
child: mDivider(Colors.grey), child: mDivider(CustomColors.devider),
); );
}, },
) )

@ -85,6 +85,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
child: RaisedButton( child: RaisedButton(
color: CustomColors.accentColor, color: CustomColors.accentColor,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: goToBookConfirm, onPressed: goToBookConfirm,

@ -14,7 +14,7 @@ class Search extends StatefulWidget {
final List clnicIds; final List clnicIds;
Function onBackClick; Function onBackClick;
Search({this.type = 0, this.clnicIds,this.onBackClick}); Search({this.type = 0, this.clnicIds, this.onBackClick});
@override @override
_SearchState createState() => _SearchState(); _SearchState createState() => _SearchState();
@ -68,7 +68,10 @@ class _SearchState extends State<Search> with TickerProviderStateMixin {
Expanded( Expanded(
child: TabBarView( child: TabBarView(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
children: [SearchByClinic(clnicIds: widget.clnicIds), SearchByDoctor()], children: [
SearchByClinic(clnicIds: widget.clnicIds),
SearchByDoctor(),
],
controller: _tabController, controller: _tabController,
), ),
) )

@ -47,7 +47,7 @@ class _SearchResultsState extends State<SearchResults> {
bodyWidget: ListView.separated( bodyWidget: ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21), padding: EdgeInsets.only(bottom: 10, top: 10, left: 21, right: 21),
itemBuilder: (context, _index) { itemBuilder: (context, _index) {
//widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index].speciality = null; //widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index].speciality = null;
return DoctorView( return DoctorView(

@ -62,7 +62,7 @@ class _BookReminderPageState extends State<BookReminderPage> {
isShowAppBar: true, isShowAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
showNewAppBar: true, showNewAppBar: true,
backgroundColor: CustomColors.appBackgroudGreyColor, backgroundColor: CustomColors.appBackgroudGrey2Color,
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
@ -153,7 +153,7 @@ class _BookReminderPageState extends State<BookReminderPage> {
bottomSheet: Container( bottomSheet: Container(
color: CustomColors.appBackgroudGreyColor, color: CustomColors.appBackgroudGreyColor,
child: Container( child: Container(
color: CustomColors.appBackgroudGreyColor, color: CustomColors.white,
margin: EdgeInsets.all(14), margin: EdgeInsets.all(14),
height: 45.0, height: 45.0,
child: Row( child: Row(
@ -167,8 +167,9 @@ class _BookReminderPageState extends State<BookReminderPage> {
), ),
height: 45.0, height: 45.0,
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: CustomColors.accentColor,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFEAEAEA), disabledColor: new Color(0xFFEAEAEA),
onPressed: () { onPressed: () {
@ -187,8 +188,9 @@ class _BookReminderPageState extends State<BookReminderPage> {
), ),
height: 45.0, height: 45.0,
child: RaisedButton( child: RaisedButton(
color: new Color(0xffc5272d), color: CustomColors.green,
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: CustomColors.green, disabledColor: CustomColors.green,
onPressed: () async { onPressed: () async {

@ -176,48 +176,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
), ),
], ],
), ),
Container(
width: double.infinity, Container(child: inputWidget("Age", "", ageController),margin: EdgeInsets.only(left: 20, right: 20),),
decoration: containerRadius(Colors.white, 12),
margin: EdgeInsets.only(left: 20, right: 20),
padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 2),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Age",
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
color: Colors.black,
fontWeight: FontWeight.w600,
),
),
TextField(
controller: ageController,
style: TextStyle(
fontSize: 15,
letterSpacing: -0.59,
color: Colors.black,
),
decoration: InputDecoration(
contentPadding: EdgeInsets.zero,
border: OutlineInputBorder(
borderSide: BorderSide.none,
),
),
),
// Text(
// projectViewModel.isLogin ? projectViewModel.user.age.toString() : "",
// style: TextStyle(
// fontSize: 15,
// letterSpacing: -0.59,
// color: Colors.black,
// ),
// ),
],
),
),
], ],
), ),
Padding( Padding(
@ -403,6 +364,89 @@ class _SearchByClinicState extends State<SearchByClinic> {
); );
} }
Widget inputWidget(String _labelText, String _hintText, TextEditingController _controller, {String prefix, bool isEnable = true, bool hasSelection = false}) {
return Container(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: InkWell(
onTap: hasSelection ? () {} : null,
child: Row(
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_labelText,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
TextField(
enabled: isEnable,
scrollPadding: EdgeInsets.zero,
keyboardType: TextInputType.number,
controller: _controller,
onChanged: (value) => {},
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
decoration: InputDecoration(
isDense: true,
hintText: _hintText,
hintStyle: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff575757),
letterSpacing: -0.56,
),
prefixIconConstraints: BoxConstraints(minWidth: 50),
prefixIcon: prefix == null
? null
: Text(
"+" + prefix,
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w500,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
contentPadding: EdgeInsets.zero,
border: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
),
),
],
),
),
if (hasSelection) Icon(Icons.keyboard_arrow_down_outlined),
],
),
),
);
}
void openDropdown(GlobalKey key) { void openDropdown(GlobalKey key) {
GestureDetector detector; GestureDetector detector;
void searchForGestureDetector(BuildContext element) { void searchForGestureDetector(BuildContext element) {

@ -26,54 +26,70 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Column(
margin: EdgeInsets.all(20.0), children: [
child: Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
mainAxisSize: MainAxisSize.max, margin: EdgeInsets.all(20.0),
children: <Widget>[ child: Column(
Container( crossAxisAlignment: CrossAxisAlignment.start,
margin: EdgeInsets.only(top: 10.0, bottom: 15.0), mainAxisSize: MainAxisSize.max,
child: Text(TranslationBase.of(context).searchByDocText, style: TextStyle(fontSize: 16.0, letterSpacing: 0.9)), children: <Widget>[
), Container(
Container( margin: EdgeInsets.only(top: 10.0, bottom: 15.0),
decoration: BoxDecoration(color: Colors.white), child: Text(
child: TextField( TranslationBase.of(context).searchByDocText,
controller: doctorNameController, style: TextStyle(
onChanged: (content) { fontSize: 14.0,
_onDocTextChanged(content); letterSpacing: -0.9,
}, fontWeight: FontWeight.w600,
decoration: InputDecoration(labelText: TranslationBase.of(context).enterDocName, fillColor: Colors.white, prefixIcon: Icon(Icons.search), border: OutlineInputBorder())), ),
), ),
Expanded( ),
child: Align( // Container(
alignment: FractionalOffset.bottomCenter, // decoration: BoxDecoration(color: Colors.white),
child: _buildCounterButton(), // child: TextField(
// controller: doctorNameController,
// onChanged: (content) {
// _onDocTextChanged(content);
// },
// decoration: InputDecoration(labelText: TranslationBase.of(context).enterDocName, fillColor: Colors.white, prefixIcon: Icon(Icons.search), border: OutlineInputBorder())),
// ),
inputWidget(TranslationBase.of(context).enterDocName, '', doctorNameController),
],
), ),
), ),
], ),
), _buildCounterButton(),
],
); );
} }
Widget _buildCounterButton() { Widget _buildCounterButton() {
return new ButtonTheme( return Container(
shape: RoundedRectangleBorder( width: double.infinity,
borderRadius: BorderRadius.circular(10.0), padding: EdgeInsets.all(16),
), color: Colors.white,
minWidth: MediaQuery.of(context).size.width, child: new ButtonTheme(
height: 45.0, shape: RoundedRectangleBorder(
child: RaisedButton( borderRadius: BorderRadius.circular(10.0),
color: CustomColors.accentColor, ),
textColor: Colors.white, minWidth: MediaQuery.of(context).size.width,
disabledTextColor: Colors.white, height: 45.0,
disabledColor: new Color(0xFFbcc2c4), child: RaisedButton(
onPressed: () { color: CustomColors.accentColor,
if (_isButtonDisabled == false) { textColor: Colors.white,
_searchDoctor(context); disabledTextColor: Colors.white,
} elevation: 0,
}, disabledColor: new Color(0xFFbcc2c4),
child: Text(TranslationBase.of(context).search, style: TextStyle(fontSize: 18.0)), onPressed: () {
if (_isButtonDisabled == false) {
_searchDoctor(context);
}
},
child: Text(TranslationBase.of(context).search, style: TextStyle(fontSize: 18.0)),
),
), ),
); );
} }
@ -143,4 +159,86 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) { navigateToSearchResults(context, List<DoctorList> docList, List<PatientDoctorAppointmentList> patientDoctorAppointmentListHospital) {
Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital))); Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital)));
} }
Widget inputWidget(String _labelText, String _hintText, TextEditingController _controller, {String prefix, bool isEnable = true, bool hasSelection = false}) {
return Container(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: InkWell(
onTap: hasSelection ? () {} : null,
child: Row(
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_labelText,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
TextField(
enabled: isEnable,
scrollPadding: EdgeInsets.zero,
keyboardType: TextInputType.number,
controller: _controller,
onChanged: (value) => {_onDocTextChanged(value)},
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
decoration: InputDecoration(
isDense: true,
hintText: _hintText,
hintStyle: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff575757),
letterSpacing: -0.56,
),
prefixIconConstraints: BoxConstraints(minWidth: 50),
prefixIcon: prefix == null
? null
: Text(
"+" + prefix,
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w500,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
contentPadding: EdgeInsets.zero,
border: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
),
),
],
),
),
if (hasSelection) Icon(Icons.keyboard_arrow_down_outlined),
],
),
),
);
}
} }

@ -34,7 +34,15 @@ class _DentalComplaintCardState extends State<DentalComplaintCard> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
Container( Container(
child: Text(widget.listDentalChiefComplain.name, style: TextStyle(fontSize: 16.0, color: Colors.black)), child: Text(
widget.listDentalChiefComplain.name,
style: TextStyle(
fontSize: 16.0,
color: Colors.black,
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
),
),
), ),
], ],
), ),

@ -133,57 +133,83 @@ class _ReminderDialogState extends State<ReminderDialog> {
letterSpacing: -0.48, letterSpacing: -0.48,
), ),
), ),
ListTile( Row(
contentPadding: EdgeInsets.zero, children: [
title: Text(TranslationBase.of(context).appoReminder30), Radio<int>(
leading: Radio<int>( value: 0,
value: 0, groupValue: i,
groupValue: i, onChanged: (int value) {
onChanged: (int value) { setState(() {
setState(() { i = value;
i = value; });
}); },
}, ),
), Text(TranslationBase.of(context).appoReminder30,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),),
],
), ),
ListTile( Row(
contentPadding: EdgeInsets.zero, children: [
title: Text(TranslationBase.of(context).appoReminder60), Radio<int>(
leading: Radio<int>( value: 1,
value: 1, groupValue: i,
groupValue: i, onChanged: (int value) {
onChanged: (int value) { setState(() {
setState(() { i = value;
i = value; });
}); },
}, ),
), Text(TranslationBase.of(context).appoReminder60,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),),
],
), ),
ListTile( Row(
contentPadding: EdgeInsets.zero, children: [
title: Text(TranslationBase.of(context).appoReminder90), Radio<int>(
leading: Radio<int>( value: 2,
value: 2, groupValue: i,
groupValue: i, onChanged: (int value) {
onChanged: (int value) { setState(() {
setState(() { i = value;
i = value; });
}); },
}, ),
), Text(TranslationBase.of(context).appoReminder90,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),),
],
), ),
ListTile( Row(
contentPadding: EdgeInsets.zero, children: [
title: Text(TranslationBase.of(context).appoReminder120), Radio<int>(
leading: Radio<int>( value: 3,
value: 3, groupValue: i,
groupValue: i, onChanged: (int value) {
onChanged: (int value) { setState(() {
setState(() { i = value;
i = value; });
}); },
}, ),
), Text(
TranslationBase.of(context).appoReminder120,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
),
),
],
), ),
mHeight(12), mHeight(12),
DefaultButton( DefaultButton(

@ -361,6 +361,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots> with TickerProviderStat
Widget getSelectedButton(int index) { Widget getSelectedButton(int index) {
return RaisedButton( return RaisedButton(
color: CustomColors.green, //Color of the border color: CustomColors.green, //Color of the border
elevation: 0,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
setState(() { setState(() {

@ -222,7 +222,7 @@ class CovidDirveThruQuestionsState extends State<CovidDirveThruQuestions> {
), ),
Card( Card(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
elevation: 20, elevation: 0,
child: Container( child: Container(
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
child: FractionallySizedBox( child: FractionallySizedBox(

@ -221,7 +221,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
), ),
), ),
Card( Card(
elevation: 20, elevation: 0,
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
child: Container( child: Container(
width: double.infinity, width: double.infinity,

@ -169,7 +169,7 @@ class _CovidPaymentAlertState extends State<CovidPaymentAlert> {
), ),
Card( Card(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
elevation: 20, elevation: 0,
child: Container( child: Container(
margin: EdgeInsets.all(12), margin: EdgeInsets.all(12),
width: double.infinity, width: double.infinity,

@ -120,28 +120,54 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID); getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
}); });
}, },
child: ListTile( child: Row(
title: Text( children: [
projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName, Radio(
style: TextStyle( value: widget.proceduresList[index],
fontSize: 12.0, groupValue: widget.selectedProcedure,
letterSpacing: -0.48, activeColor: Colors.red[800],
fontWeight: FontWeight.w600, toggleable: true,
onChanged: (value) {
setState(() {
widget.selectedProcedure = value;
print(widget.selectedProcedure.procedureName);
getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
});
},
),
Text(
projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
), ),
), // ListTile(
leading: Radio( // title: Text(
value: widget.proceduresList[index], // projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName,
groupValue: widget.selectedProcedure, // style: TextStyle(
activeColor: Colors.red[800], // fontSize: 12.0,
toggleable: true, // letterSpacing: -0.48,
onChanged: (value) { // fontWeight: FontWeight.w600,
setState(() { // ),
widget.selectedProcedure = value; // ),
print(widget.selectedProcedure.procedureName); // leading: Radio(
getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID); // value: widget.proceduresList[index],
}); // groupValue: widget.selectedProcedure,
}, // activeColor: Colors.red[800],
), // toggleable: true,
// onChanged: (value) {
// setState(() {
// widget.selectedProcedure = value;
// print(widget.selectedProcedure.procedureName);
// getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
// });
// },
// ),
// ),
],
), ),
), ),
) )
@ -270,7 +296,7 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
Container( Container(
width: double.infinity, width: double.infinity,
child: Card( child: Card(
elevation: 20, elevation: 0,
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 12, bottom: 12, left: 12, right: 12), padding: const EdgeInsets.only(top: 12, bottom: 12, left: 12, right: 12),
@ -286,7 +312,7 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
minWidth: MediaQuery.of(context).size.width * 0.7, minWidth: MediaQuery.of(context).size.width * 0.7,
height: 45.0, height: 45.0,
child: RaisedButton( child: RaisedButton(
color: CustomColors.darkGreyColor, color: CustomColors.accentColor,
textColor: Colors.white, textColor: Colors.white,
elevation: 0, elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
@ -299,7 +325,7 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
style: TextStyle( style: TextStyle(
fontSize: 16.0, fontSize: 16.0,
letterSpacing: -0.48, letterSpacing: -0.48,
color: Colors.black, color: Colors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
@ -318,7 +344,7 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
minWidth: MediaQuery.of(context).size.width * 0.7, minWidth: MediaQuery.of(context).size.width * 0.7,
height: 45.0, height: 45.0,
child: RaisedButton( child: RaisedButton(
color: CustomColors.accentColor, color: CustomColors.green,
textColor: Colors.white, textColor: Colors.white,
elevation: 0, elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,

@ -52,6 +52,7 @@ class _AskDocDialogState extends State<AskDocDialog> {
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
side: BorderSide(color: Colors.blue)), side: BorderSide(color: Colors.blue)),
color: Colors.blue, color: Colors.blue,
elevation: 0,
onPressed: () { onPressed: () {
if(AskDocDialog.selectedParameterCode != 0) if(AskDocDialog.selectedParameterCode != 0)
Navigator.pop(context, AskDocDialog.selectedParameterCode); Navigator.pop(context, AskDocDialog.selectedParameterCode);

@ -57,6 +57,7 @@ class _ReminderDialogState extends State<ReminderDialog> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)), borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)),
color: Colors.blue, color: Colors.blue,
elevation: 0,
onPressed: () { onPressed: () {
print(ReminderDialog.selectedDuration); print(ReminderDialog.selectedDuration);
createCalendarEvent(); createCalendarEvent();

@ -61,7 +61,7 @@ class _ReminderDialogState extends State<PrescriptionReminderDialog> {
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)), borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)),
color: Colors.blue, color: Colors.blue,elevation: 0,
onPressed: () { onPressed: () {
createOrUpdateEvents(); createOrUpdateEvents();
}, },

@ -70,15 +70,15 @@ class _PaymentMethodState extends State<PaymentMethod> {
padding: EdgeInsets.all(7.0), padding: EdgeInsets.all(7.0),
child: Image.asset("assets/images/new/payment/Mada.png"), child: Image.asset("assets/images/new/payment/Mada.png"),
), ),
mWidth(12), // mWidth(12),
Text( // Text(
"Mada", // "Mada",
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), // ),
), // ),
mFlex(1), mFlex(1),
if (selectedPaymentMethod == "MADA") if (selectedPaymentMethod == "MADA")
Container( Container(
@ -128,15 +128,17 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60, width: 60,
child: Image.asset("assets/images/new/payment/visa.png"), child: Image.asset("assets/images/new/payment/visa.png"),
), ),
mWidth(12), // mWidth(12),
Text( // Text(
"VISA", // "VISA",
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), // ),
), mFlex(1), // )
// ,
mFlex(1),
if (selectedPaymentMethod == "VISA") if (selectedPaymentMethod == "VISA")
Container( Container(
decoration: containerRadius(CustomColors.green, 200), decoration: containerRadius(CustomColors.green, 200),
@ -185,15 +187,16 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60, width: 60,
child: Image.asset("assets/images/new/payment/Mastercard.png"), child: Image.asset("assets/images/new/payment/Mastercard.png"),
), ),
mWidth(12), // mWidth(12),
Text( // Text(
"MasterCard", // "MasterCard",
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), // ),
), mFlex(1), // ),
mFlex(1),
if (selectedPaymentMethod == "MASTERCARD") if (selectedPaymentMethod == "MASTERCARD")
Container( Container(
decoration: containerRadius(CustomColors.green, 200), decoration: containerRadius(CustomColors.green, 200),
@ -242,15 +245,16 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60, width: 60,
child: Image.asset("assets/images/new/payment/installments.png"), child: Image.asset("assets/images/new/payment/installments.png"),
), ),
mWidth(12), // mWidth(12),
Text( // Text(
"Installments", // "Installments",
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), // ),
), mFlex(1), // ),
mFlex(1),
if (selectedPaymentMethod == "Installment") if (selectedPaymentMethod == "Installment")
Container( Container(
decoration: containerRadius(CustomColors.green, 200), decoration: containerRadius(CustomColors.green, 200),
@ -300,15 +304,16 @@ class _PaymentMethodState extends State<PaymentMethod> {
width: 60, width: 60,
child: Image.asset("assets/images/new/payment/Apple_Pay.png"), child: Image.asset("assets/images/new/payment/Apple_Pay.png"),
), ),
mWidth(12), // mWidth(12),
Text( // Text(
"Apple Pay", // "Apple Pay",
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), // ),
), mFlex(1), // ),
mFlex(1),
if (selectedPaymentMethod == "ApplePay") if (selectedPaymentMethod == "ApplePay")
Container( Container(
decoration: containerRadius(CustomColors.green, 200), decoration: containerRadius(CustomColors.green, 200),

@ -73,6 +73,7 @@ class _AppUpdatePageState extends State<AppUpdatePage> {
child: RaisedButton( child: RaisedButton(
color: Colors.red[800], color: Colors.red[800],
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {

@ -130,6 +130,7 @@ class _HomePageState extends State<HomePage> {
height: 25.0, height: 25.0,
child: RaisedButton( child: RaisedButton(
color: Colors.red[800], color: Colors.red[800],
elevation: 0,
textColor: Colors.white, textColor: Colors.white,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),

@ -132,6 +132,7 @@ class _LiveCarePendingRequestState extends State<LiveCarePendingRequest> {
child: RaisedButton( child: RaisedButton(
color: Colors.red[800], color: Colors.red[800],
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {

@ -485,6 +485,7 @@ class _clinic_listState extends State<ClinicList> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: startScheduleLiveCare, onPressed: startScheduleLiveCare,

@ -129,6 +129,7 @@ class _Register extends State<Register> {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
), ),
elevation: 0,
color: Colors.white, color: Colors.white,
onPressed: () => {if (isHijri != null) _selectDate(context)}, onPressed: () => {if (isHijri != null) _selectDate(context)},
icon: Icon(Icons.date_range), icon: Icon(Icons.date_range),

@ -309,6 +309,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -382,6 +383,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -406,6 +408,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -701,6 +704,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -779,6 +783,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {
@ -803,6 +808,7 @@ class _SmartWatchInstructionsState extends State<SmartWatchInstructions> {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFF60686b), color: new Color(0xFF60686b),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4), disabledColor: new Color(0xFFbcc2c4),
onPressed: () { onPressed: () {

@ -380,6 +380,7 @@ Widget _payNow(BuildContext context, {@required VoidCallback onPayNowClick}) {
), ),
Expanded(child: Container()), Expanded(child: Container()),
RaisedButton( RaisedButton(
elevation: 0,
child: Texts( child: Texts(
TranslationBase.of(context).payNow, TranslationBase.of(context).payNow,
fontSize: 15, fontSize: 15,

@ -22,6 +22,7 @@ class AddressSelectPageTest extends StatelessWidget {
"Set address", "Set address",
style: new TextStyle(color: Colors.white, fontSize: 14), style: new TextStyle(color: Colors.white, fontSize: 14),
), ),
elevation: 0,
color: Colors.blueAccent, color: Colors.blueAccent,
disabledColor: Colors.blueAccent, disabledColor: Colors.blueAccent,
), ),

@ -421,6 +421,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
fontSize: 14), fontSize: 14),
), ),
color: Color(0xff005aff), color: Color(0xff005aff),
elevation: 0,
disabledColor: Color(0xff005aff), disabledColor: Color(0xff005aff),
) )
// RaisedButton( // RaisedButton(

@ -407,6 +407,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
isAgree ? Colors.white : Colors.grey.shade300, isAgree ? Colors.white : Colors.grey.shade300,
fontSize: 14), fontSize: 14),
), ),
elevation: 0,
color: Color(0xff005aff), color: Color(0xff005aff),
disabledColor: Color(0xff005aff), disabledColor: Color(0xff005aff),
), ),

@ -68,6 +68,7 @@ class PaymentBottomWidget extends StatelessWidget {
), ),
Container( Container(
child: RaisedButton( child: RaisedButton(
elevation: 0,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
side: BorderSide( side: BorderSide(

@ -226,7 +226,7 @@ class _ProfileSettings extends State<ProfileSettings> with TickerProviderStateMi
width: double.infinity, width: double.infinity,
child: Card( child: Card(
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
elevation: 20, elevation: 0,
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 16), padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 16),
child: DefaultButton( child: DefaultButton(

@ -11,6 +11,7 @@ class CustomColors {
static const Color white = Color(0xFFFFFFFF); static const Color white = Color(0xFFFFFFFF);
static const Color accentColor = Color(0xFFD02127); static const Color accentColor = Color(0xFFD02127);
static const Color lightGreyColor = Color(0xFFE2E2E2); static const Color lightGreyColor = Color(0xFFE2E2E2);
static const Color devider = Color(0xFFE5E5E5);
static const Color darkGreyColor = Color(0xFFC9C9C9); static const Color darkGreyColor = Color(0xFFC9C9C9);
static const Color pharmacyGreyColor = Color(0xFFDBDBDB); static const Color pharmacyGreyColor = Color(0xFFDBDBDB);
static const Color backgroudGreyColor = Color(0xFFEFEFEF); static const Color backgroudGreyColor = Color(0xFFEFEFEF);

@ -70,6 +70,7 @@ class LabResultWidget extends StatelessWidget {
child: RaisedButton( child: RaisedButton(
color: new Color(0xFFc5272d), color: new Color(0xFFc5272d),
textColor: Colors.white, textColor: Colors.white,
elevation: 0,
disabledTextColor: Colors.white, disabledTextColor: Colors.white,
disabledColor: Colors.red[300], disabledColor: Colors.red[300],
onPressed: () { onPressed: () {

@ -128,6 +128,7 @@ class _NfcLayoutState extends State<NfcLayout> {
_stream?.cancel(); _stream?.cancel();
Navigator.pop(context); Navigator.pop(context);
}, },
elevation: 0,
child: Text("CANCEL"), child: Text("CANCEL"),
), ),
), ),
@ -188,7 +189,7 @@ class _NfcLayoutState extends State<NfcLayout> {
// Navigator.pop(context); // Navigator.pop(context);
// }, // },
onPressed: null, onPressed: null,
elevation: 0,
child: Text("DONE"), child: Text("DONE"),
), ),
), ),

@ -1000,6 +1000,7 @@ class _MyStatefulBuilderState extends State<MyStatefulBuilder> {
? Center( ? Center(
child: RaisedButton( child: RaisedButton(
child: AppText('Retry'), child: AppText('Retry'),
elevation: 0,
onPressed: () { onPressed: () {
RoboSearch.closeAlertDialog(context); RoboSearch.closeAlertDialog(context);
event.setValue({'startPopUp': 'true'}); event.setValue({'startPopUp': 'true'});

Loading…
Cancel
Save