diff --git a/lib/config/config.dart b/lib/config/config.dart index a6565ecf..75a904ea 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -12,8 +12,8 @@ const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart index 2221ea5c..904f4183 100644 --- a/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart +++ b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart @@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; +import 'package:diplomaticquarterapp/widgets/dialogs/radio_selection_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -266,18 +267,19 @@ class _H2oSettingState extends State { SizedBox(height: 12), _containerWidget( _commonDropDownView(TranslationBase.of(context).activityLevel, _activityLevelListEng[_selectedActiveLevel - 1], () { + List list = [ + for (int i = 0; i < _activityLevelListEng.length; i++) RadioSelectionDialogModel(_activityLevelListEng[i], i + 1), + ]; + showDialog( context: context, - child: CommonRadioButtonDialog( - list: _activityLevelListEng, - title: TranslationBase.of(context).activityLevel, - onSelect: (index) { - Navigator.pop(context); - setState(() { - _selectedActiveLevel = index + 1; - }); + child: RadioSelectionDialog( + listData: list, + selectedIndex: _selectedActiveLevel, + onValueSelected: (index) { + _selectedActiveLevel = index; + setState(() {}); }, - selectedIndex: _selectedActiveLevel - 1, ), ); }), @@ -296,17 +298,19 @@ class _H2oSettingState extends State { SizedBox(height: 12), _containerWidget( _commonDropDownView(TranslationBase.of(context).reminderTimesLabel, _remindedTimeListEng[_selectedRemindedTime], () { + List list = [ + for (int i = 0; i < _remindedTimeListEng.length; i++) RadioSelectionDialogModel(_remindedTimeListEng[i], i), + ]; + showDialog( context: context, - child: CommonRadioButtonDialog( - list: _remindedTimeListEng, - onSelect: (index) { - Navigator.pop(context); - setState(() { - _selectedRemindedTime = index; - }); - }, + child: RadioSelectionDialog( + listData: list, selectedIndex: _selectedRemindedTime, + onValueSelected: (index) { + _selectedRemindedTime = index; + setState(() {}); + }, ), ); }), @@ -493,36 +497,6 @@ class _H2oSettingState extends State { ), ], ); - - return Row(children: [ - Expanded( - child: SizedBox( - height: 40, - child: RaisedButton( - color: checkParam ? Theme.of(context).appBarTheme.color : Colors.white, - child: Text( - rightText, - style: TextStyle(color: checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600), - ), - onPressed: () => callBack(true), - ), - ), - ), - SizedBox(width: 12), - Expanded( - child: SizedBox( - height: 40, - child: RaisedButton( - color: !checkParam ? Theme.of(context).appBarTheme.color : Colors.white, - child: Text( - leftText, - style: TextStyle(color: !checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600), - ), - onPressed: () => callBack(false), - ), - ), - ), - ]); } Widget _commonInputAndUnitRow(_title, _controller, double _minValue, double _maxValue, double _valueOrg, Function(String) onTextValueChange, Function(double) onValueChange, String unitTitle, @@ -624,7 +598,7 @@ class _H2oSettingState extends State { if (tag) { AppToast.showSuccessToast(message: TranslationBase.of(context).success); await prefs.setString(H2O_UNIT, _isUnitML ? "ml" : "l"); - int _tempRemindTime = prefs.getInt(H2O_REMINDER) ?? _selectedRemindedTime; + int _tempRemindTime = prefs.getInt(H2O_REMINDER) ?? 0; if (_tempRemindTime != _selectedRemindedTime) { await prefs.setInt(H2O_REMINDER, _selectedRemindedTime); _addReminderToCalender(_selectedRemindedTime); diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart index 9576d7b0..323567b7 100644 --- a/lib/pages/BookAppointment/BookConfirm.dart +++ b/lib/pages/BookAppointment/BookConfirm.dart @@ -192,6 +192,7 @@ class _BookConfirmState extends State { child: RaisedButton( color: CustomColors.green, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart index 15ccf128..04086ee3 100644 --- a/lib/pages/BookAppointment/BookSuccess.dart +++ b/lib/pages/BookAppointment/BookSuccess.dart @@ -143,6 +143,7 @@ class _BookSuccessState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -177,6 +178,7 @@ class _BookSuccessState extends State { child: RaisedButton( color: CustomColors.green, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -197,6 +199,7 @@ class _BookSuccessState extends State { child: RaisedButton( color: new Color(0xffc5272d), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -232,6 +235,7 @@ class _BookSuccessState extends State { child: RaisedButton( color: new Color(0xffc5272d), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -252,6 +256,7 @@ class _BookSuccessState extends State { child: RaisedButton( color: CustomColors.green, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { diff --git a/lib/pages/BookAppointment/DentalComplaints.dart b/lib/pages/BookAppointment/DentalComplaints.dart index da7ec5c1..342bff21 100644 --- a/lib/pages/BookAppointment/DentalComplaints.dart +++ b/lib/pages/BookAppointment/DentalComplaints.dart @@ -70,7 +70,7 @@ class _DentalComplaintsState extends State { separatorBuilder: (BuildContext context, int index) { return Padding( padding: const EdgeInsets.only(left: 14, right: 14), - child: mDivider(Colors.grey), + child: mDivider(CustomColors.devider), ); }, ) diff --git a/lib/pages/BookAppointment/DoctorProfile.dart b/lib/pages/BookAppointment/DoctorProfile.dart index 5c2cb113..87941ed5 100644 --- a/lib/pages/BookAppointment/DoctorProfile.dart +++ b/lib/pages/BookAppointment/DoctorProfile.dart @@ -85,6 +85,7 @@ class _DoctorProfileState extends State with TickerProviderStateM child: RaisedButton( color: CustomColors.accentColor, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: goToBookConfirm, diff --git a/lib/pages/BookAppointment/Search.dart b/lib/pages/BookAppointment/Search.dart index 3c89b2f5..d4942ccf 100644 --- a/lib/pages/BookAppointment/Search.dart +++ b/lib/pages/BookAppointment/Search.dart @@ -14,7 +14,7 @@ class Search extends StatefulWidget { final List clnicIds; Function onBackClick; - Search({this.type = 0, this.clnicIds,this.onBackClick}); + Search({this.type = 0, this.clnicIds, this.onBackClick}); @override _SearchState createState() => _SearchState(); @@ -68,7 +68,10 @@ class _SearchState extends State with TickerProviderStateMixin { Expanded( child: TabBarView( physics: NeverScrollableScrollPhysics(), - children: [SearchByClinic(clnicIds: widget.clnicIds), SearchByDoctor()], + children: [ + SearchByClinic(clnicIds: widget.clnicIds), + SearchByDoctor(), + ], controller: _tabController, ), ) diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index e4b8068c..0a654e22 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -47,7 +47,7 @@ class _SearchResultsState extends State { bodyWidget: ListView.separated( shrinkWrap: true, 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) { //widget.patientDoctorAppointmentListHospital[index].patientDoctorAppointmentList[_index].speciality = null; return DoctorView( diff --git a/lib/pages/BookAppointment/book_reminder_page.dart b/lib/pages/BookAppointment/book_reminder_page.dart index 637f732e..39f1648f 100644 --- a/lib/pages/BookAppointment/book_reminder_page.dart +++ b/lib/pages/BookAppointment/book_reminder_page.dart @@ -62,7 +62,7 @@ class _BookReminderPageState extends State { isShowAppBar: true, showNewAppBarTitle: true, showNewAppBar: true, - backgroundColor: CustomColors.appBackgroudGreyColor, + backgroundColor: CustomColors.appBackgroudGrey2Color, body: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.max, @@ -153,7 +153,7 @@ class _BookReminderPageState extends State { bottomSheet: Container( color: CustomColors.appBackgroudGreyColor, child: Container( - color: CustomColors.appBackgroudGreyColor, + color: CustomColors.white, margin: EdgeInsets.all(14), height: 45.0, child: Row( @@ -167,8 +167,9 @@ class _BookReminderPageState extends State { ), height: 45.0, child: RaisedButton( - color: new Color(0xFF60686b), + color: CustomColors.accentColor, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFEAEAEA), onPressed: () { @@ -187,8 +188,9 @@ class _BookReminderPageState extends State { ), height: 45.0, child: RaisedButton( - color: new Color(0xffc5272d), + color: CustomColors.green, textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: CustomColors.green, onPressed: () async { diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index ab36738e..147cb9f9 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -176,48 +176,9 @@ class _SearchByClinicState extends State { ), ], ), - Container( - width: double.infinity, - 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, - // ), - // ), - ], - ), - ), + + Container(child: inputWidget("Age", "", ageController),margin: EdgeInsets.only(left: 20, right: 20),), + ], ), Padding( @@ -403,6 +364,89 @@ class _SearchByClinicState extends State { ); } + 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) { GestureDetector detector; void searchForGestureDetector(BuildContext element) { diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index e0e0fa66..dde431e6 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -26,54 +26,70 @@ class _SearchByDoctorState extends State { @override Widget build(BuildContext context) { - return Container( - margin: EdgeInsets.all(20.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.max, - children: [ - Container( - margin: EdgeInsets.only(top: 10.0, bottom: 15.0), - child: Text(TranslationBase.of(context).searchByDocText, style: TextStyle(fontSize: 16.0, letterSpacing: 0.9)), - ), - Container( - decoration: BoxDecoration(color: Colors.white), - child: TextField( - controller: doctorNameController, - onChanged: (content) { - _onDocTextChanged(content); - }, - decoration: InputDecoration(labelText: TranslationBase.of(context).enterDocName, fillColor: Colors.white, prefixIcon: Icon(Icons.search), border: OutlineInputBorder())), - ), - Expanded( - child: Align( - alignment: FractionalOffset.bottomCenter, - child: _buildCounterButton(), + return Column( + children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(20.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Container( + margin: EdgeInsets.only(top: 10.0, bottom: 15.0), + child: Text( + TranslationBase.of(context).searchByDocText, + style: TextStyle( + fontSize: 14.0, + letterSpacing: -0.9, + fontWeight: FontWeight.w600, + ), + ), + ), + // Container( + // decoration: BoxDecoration(color: Colors.white), + // 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() { - return new ButtonTheme( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10.0), - ), - minWidth: MediaQuery.of(context).size.width, - height: 45.0, - child: RaisedButton( - color: CustomColors.accentColor, - textColor: Colors.white, - disabledTextColor: Colors.white, - disabledColor: new Color(0xFFbcc2c4), - onPressed: () { - if (_isButtonDisabled == false) { - _searchDoctor(context); - } - }, - child: Text(TranslationBase.of(context).search, style: TextStyle(fontSize: 18.0)), + return Container( + width: double.infinity, + padding: EdgeInsets.all(16), + color: Colors.white, + child: new ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width, + height: 45.0, + child: RaisedButton( + color: CustomColors.accentColor, + textColor: Colors.white, + disabledTextColor: Colors.white, + elevation: 0, + disabledColor: new Color(0xFFbcc2c4), + 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 { navigateToSearchResults(context, List docList, List 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), + ], + ), + ), + ); + } } diff --git a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart index 241e20c8..3c56aa24 100644 --- a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart +++ b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart @@ -34,7 +34,15 @@ class _DentalComplaintCardState extends State { mainAxisSize: MainAxisSize.max, children: [ 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, + ), + ), ), ], ), diff --git a/lib/pages/BookAppointment/widgets/reminder_dialog.dart b/lib/pages/BookAppointment/widgets/reminder_dialog.dart index 2eb5e062..43038658 100644 --- a/lib/pages/BookAppointment/widgets/reminder_dialog.dart +++ b/lib/pages/BookAppointment/widgets/reminder_dialog.dart @@ -133,57 +133,83 @@ class _ReminderDialogState extends State { letterSpacing: -0.48, ), ), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text(TranslationBase.of(context).appoReminder30), - leading: Radio( - value: 0, - groupValue: i, - onChanged: (int value) { - setState(() { - i = value; - }); - }, - ), + Row( + children: [ + Radio( + value: 0, + groupValue: i, + onChanged: (int value) { + setState(() { + i = value; + }); + }, + ), + Text(TranslationBase.of(context).appoReminder30, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ),), + ], ), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text(TranslationBase.of(context).appoReminder60), - leading: Radio( - value: 1, - groupValue: i, - onChanged: (int value) { - setState(() { - i = value; - }); - }, - ), + Row( + children: [ + Radio( + value: 1, + groupValue: i, + onChanged: (int value) { + setState(() { + i = value; + }); + }, + ), + Text(TranslationBase.of(context).appoReminder60, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ),), + ], ), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text(TranslationBase.of(context).appoReminder90), - leading: Radio( - value: 2, - groupValue: i, - onChanged: (int value) { - setState(() { - i = value; - }); - }, - ), + Row( + children: [ + Radio( + value: 2, + groupValue: i, + onChanged: (int value) { + setState(() { + i = value; + }); + }, + ), + Text(TranslationBase.of(context).appoReminder90, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ),), + ], ), - ListTile( - contentPadding: EdgeInsets.zero, - title: Text(TranslationBase.of(context).appoReminder120), - leading: Radio( - value: 3, - groupValue: i, - onChanged: (int value) { - setState(() { - i = value; - }); - }, - ), + Row( + children: [ + Radio( + value: 3, + groupValue: i, + onChanged: (int value) { + setState(() { + i = value; + }); + }, + ), + Text( + TranslationBase.of(context).appoReminder120, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ), + ), + ], ), mHeight(12), DefaultButton( diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart index 8d0ea4e3..fb73280b 100644 --- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -361,6 +361,7 @@ class _CovidTimeSlotsState extends State with TickerProviderStat Widget getSelectedButton(int index) { return RaisedButton( color: CustomColors.green, //Color of the border + elevation: 0, textColor: Colors.white, onPressed: () { setState(() { diff --git a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart index 9e0da18a..78ee36f0 100644 --- a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart +++ b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart @@ -222,7 +222,7 @@ class CovidDirveThruQuestionsState extends State { ), Card( margin: EdgeInsets.zero, - elevation: 20, + elevation: 0, child: Container( padding: EdgeInsets.all(12), child: FractionallySizedBox( diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart index 9a75ca49..0d169ef8 100644 --- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart +++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart @@ -221,7 +221,7 @@ class _CovidDrivethruLocationState extends State { ), ), Card( - elevation: 20, + elevation: 0, margin: EdgeInsets.zero, child: Container( width: double.infinity, diff --git a/lib/pages/Covid-DriveThru/covid-payment-alert.dart b/lib/pages/Covid-DriveThru/covid-payment-alert.dart index c42f2559..2b2121d0 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-alert.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-alert.dart @@ -169,7 +169,7 @@ class _CovidPaymentAlertState extends State { ), Card( margin: EdgeInsets.zero, - elevation: 20, + elevation: 0, child: Container( margin: EdgeInsets.all(12), width: double.infinity, diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart index dfbd072c..e567dbe7 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-details.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart @@ -120,28 +120,54 @@ class _CovidPaymentDetailsState extends State { getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID); }); }, - child: ListTile( - title: Text( - projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName, - style: TextStyle( - fontSize: 12.0, - letterSpacing: -0.48, - fontWeight: FontWeight.w600, + child: Row( + children: [ + Radio( + 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); + }); + }, + + ), + Text( + projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName, + style: TextStyle( + fontSize: 12.0, + letterSpacing: -0.48, + fontWeight: FontWeight.w600, + ), ), - ), - leading: Radio( - 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); - }); - }, - ), + // ListTile( + // title: Text( + // projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName, + // style: TextStyle( + // fontSize: 12.0, + // letterSpacing: -0.48, + // fontWeight: FontWeight.w600, + // ), + // ), + // leading: Radio( + // 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 { Container( width: double.infinity, child: Card( - elevation: 20, + elevation: 0, margin: EdgeInsets.zero, child: Padding( padding: const EdgeInsets.only(top: 12, bottom: 12, left: 12, right: 12), diff --git a/lib/pages/MyAppointments/widgets/askDocDialog.dart b/lib/pages/MyAppointments/widgets/askDocDialog.dart index 15af9ae7..1098a389 100644 --- a/lib/pages/MyAppointments/widgets/askDocDialog.dart +++ b/lib/pages/MyAppointments/widgets/askDocDialog.dart @@ -52,6 +52,7 @@ class _AskDocDialogState extends State { borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)), color: Colors.blue, + elevation: 0, onPressed: () { if(AskDocDialog.selectedParameterCode != 0) Navigator.pop(context, AskDocDialog.selectedParameterCode); diff --git a/lib/pages/MyAppointments/widgets/reminder_dialog.dart b/lib/pages/MyAppointments/widgets/reminder_dialog.dart index bc120df8..6a5c685c 100644 --- a/lib/pages/MyAppointments/widgets/reminder_dialog.dart +++ b/lib/pages/MyAppointments/widgets/reminder_dialog.dart @@ -57,6 +57,7 @@ class _ReminderDialogState extends State { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)), color: Colors.blue, + elevation: 0, onPressed: () { print(ReminderDialog.selectedDuration); createCalendarEvent(); diff --git a/lib/pages/MyAppointments/widgets/reminder_dialog_prescription.dart b/lib/pages/MyAppointments/widgets/reminder_dialog_prescription.dart index ed8c324c..9a315bba 100644 --- a/lib/pages/MyAppointments/widgets/reminder_dialog_prescription.dart +++ b/lib/pages/MyAppointments/widgets/reminder_dialog_prescription.dart @@ -61,7 +61,7 @@ class _ReminderDialogState extends State { child: RaisedButton( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), side: BorderSide(color: Colors.blue)), - color: Colors.blue, + color: Colors.blue,elevation: 0, onPressed: () { createOrUpdateEvents(); }, diff --git a/lib/pages/ToDoList/payment_method_select.dart b/lib/pages/ToDoList/payment_method_select.dart index 2269eae9..ccee254b 100644 --- a/lib/pages/ToDoList/payment_method_select.dart +++ b/lib/pages/ToDoList/payment_method_select.dart @@ -70,15 +70,15 @@ class _PaymentMethodState extends State { padding: EdgeInsets.all(7.0), child: Image.asset("assets/images/new/payment/Mada.png"), ), - mWidth(12), - Text( - "Mada", - style: TextStyle( - color: Colors.black, - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), + // mWidth(12), + // Text( + // "Mada", + // style: TextStyle( + // color: Colors.black, + // fontSize: 14, + // fontWeight: FontWeight.bold, + // ), + // ), mFlex(1), if (selectedPaymentMethod == "MADA") Container( @@ -128,15 +128,17 @@ class _PaymentMethodState extends State { width: 60, child: Image.asset("assets/images/new/payment/visa.png"), ), - mWidth(12), - Text( - "VISA", - style: TextStyle( - color: Colors.black, - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), mFlex(1), + // mWidth(12), + // Text( + // "VISA", + // style: TextStyle( + // color: Colors.black, + // fontSize: 14, + // fontWeight: FontWeight.bold, + // ), + // ) + // , + mFlex(1), if (selectedPaymentMethod == "VISA") Container( decoration: containerRadius(CustomColors.green, 200), @@ -185,15 +187,16 @@ class _PaymentMethodState extends State { width: 60, child: Image.asset("assets/images/new/payment/Mastercard.png"), ), - mWidth(12), - Text( - "MasterCard", - style: TextStyle( - color: Colors.black, - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), mFlex(1), + // mWidth(12), + // Text( + // "MasterCard", + // style: TextStyle( + // color: Colors.black, + // fontSize: 14, + // fontWeight: FontWeight.bold, + // ), + // ), + mFlex(1), if (selectedPaymentMethod == "MASTERCARD") Container( decoration: containerRadius(CustomColors.green, 200), @@ -242,15 +245,16 @@ class _PaymentMethodState extends State { width: 60, child: Image.asset("assets/images/new/payment/installments.png"), ), - mWidth(12), - Text( - "Installments", - style: TextStyle( - color: Colors.black, - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), mFlex(1), + // mWidth(12), + // Text( + // "Installments", + // style: TextStyle( + // color: Colors.black, + // fontSize: 14, + // fontWeight: FontWeight.bold, + // ), + // ), + mFlex(1), if (selectedPaymentMethod == "Installment") Container( decoration: containerRadius(CustomColors.green, 200), @@ -300,15 +304,16 @@ class _PaymentMethodState extends State { width: 60, child: Image.asset("assets/images/new/payment/Apple_Pay.png"), ), - mWidth(12), - Text( - "Apple Pay", - style: TextStyle( - color: Colors.black, - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), mFlex(1), + // mWidth(12), + // Text( + // "Apple Pay", + // style: TextStyle( + // color: Colors.black, + // fontSize: 14, + // fontWeight: FontWeight.bold, + // ), + // ), + mFlex(1), if (selectedPaymentMethod == "ApplePay") Container( decoration: containerRadius(CustomColors.green, 200), diff --git a/lib/pages/appUpdatePage/app_update_page.dart b/lib/pages/appUpdatePage/app_update_page.dart index 7bcf2388..1296ac38 100644 --- a/lib/pages/appUpdatePage/app_update_page.dart +++ b/lib/pages/appUpdatePage/app_update_page.dart @@ -73,6 +73,7 @@ class _AppUpdatePageState extends State { child: RaisedButton( color: Colors.red[800], textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 4e19386b..07958a7d 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -130,6 +130,7 @@ class _HomePageState extends State { height: 25.0, child: RaisedButton( color: Colors.red[800], + elevation: 0, textColor: Colors.white, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), diff --git a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart index 839fb02c..26d2e829 100644 --- a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart +++ b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart @@ -132,6 +132,7 @@ class _LiveCarePendingRequestState extends State { child: RaisedButton( color: Colors.red[800], textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 3e2ba0cf..afb41ea2 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -485,6 +485,7 @@ class _clinic_listState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: startScheduleLiveCare, diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 012669c7..8d414886 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -129,6 +129,7 @@ class _Register extends State { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(15.0), ), + elevation: 0, color: Colors.white, onPressed: () => {if (isHijri != null) _selectDate(context)}, icon: Icon(Icons.date_range), diff --git a/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart b/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart index 057c6be6..eb8e916e 100644 --- a/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart +++ b/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart @@ -309,6 +309,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -382,6 +383,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -406,6 +408,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -701,6 +704,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -779,6 +783,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { @@ -803,6 +808,7 @@ class _SmartWatchInstructionsState extends State { child: RaisedButton( color: new Color(0xFF60686b), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: new Color(0xFFbcc2c4), onPressed: () { diff --git a/lib/pages/packages_offers/OfferAndPackagesCartPage.dart b/lib/pages/packages_offers/OfferAndPackagesCartPage.dart index 8e8085d7..727cea23 100644 --- a/lib/pages/packages_offers/OfferAndPackagesCartPage.dart +++ b/lib/pages/packages_offers/OfferAndPackagesCartPage.dart @@ -380,6 +380,7 @@ Widget _payNow(BuildContext context, {@required VoidCallback onPayNowClick}) { ), Expanded(child: Container()), RaisedButton( + elevation: 0, child: Texts( TranslationBase.of(context).payNow, fontSize: 15, diff --git a/lib/pages/pharmacies/screens/address-select-page.dart b/lib/pages/pharmacies/screens/address-select-page.dart index 3b78e3c1..9378fb3b 100644 --- a/lib/pages/pharmacies/screens/address-select-page.dart +++ b/lib/pages/pharmacies/screens/address-select-page.dart @@ -22,6 +22,7 @@ class AddressSelectPageTest extends StatelessWidget { "Set address", style: new TextStyle(color: Colors.white, fontSize: 14), ), + elevation: 0, color: Colors.blueAccent, disabledColor: Colors.blueAccent, ), diff --git a/lib/pages/pharmacies/screens/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-order-page.dart index f9c928eb..13dec0c3 100644 --- a/lib/pages/pharmacies/screens/cart-order-page.dart +++ b/lib/pages/pharmacies/screens/cart-order-page.dart @@ -421,6 +421,7 @@ class _OrderBottomWidgetState extends State { fontSize: 14), ), color: Color(0xff005aff), + elevation: 0, disabledColor: Color(0xff005aff), ) // RaisedButton( diff --git a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart index ef4904b2..44eb3e09 100644 --- a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart +++ b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart @@ -407,6 +407,7 @@ class _OrderBottomWidgetState extends State { isAgree ? Colors.white : Colors.grey.shade300, fontSize: 14), ), + elevation: 0, color: Color(0xff005aff), disabledColor: Color(0xff005aff), ), diff --git a/lib/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart b/lib/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart index e0063878..44ebd882 100644 --- a/lib/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart +++ b/lib/pages/pharmacies/screens/cart-page/payment_bottom_widget.dart @@ -68,6 +68,7 @@ class PaymentBottomWidget extends StatelessWidget { ), Container( child: RaisedButton( + elevation: 0, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: BorderSide( diff --git a/lib/pages/settings/profile_setting.dart b/lib/pages/settings/profile_setting.dart index b53e73d7..7f1f6a93 100644 --- a/lib/pages/settings/profile_setting.dart +++ b/lib/pages/settings/profile_setting.dart @@ -226,7 +226,7 @@ class _ProfileSettings extends State with TickerProviderStateMi width: double.infinity, child: Card( margin: EdgeInsets.zero, - elevation: 20, + elevation: 0, child: Padding( padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 16), child: DefaultButton( diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart index 463b0e70..0409222d 100644 --- a/lib/theme/colors.dart +++ b/lib/theme/colors.dart @@ -11,6 +11,7 @@ class CustomColors { static const Color white = Color(0xFFFFFFFF); static const Color accentColor = Color(0xFFD02127); static const Color lightGreyColor = Color(0xFFE2E2E2); + static const Color devider = Color(0xFFE5E5E5); static const Color darkGreyColor = Color(0xFFC9C9C9); static const Color pharmacyGreyColor = Color(0xFFDBDBDB); static const Color backgroudGreyColor = Color(0xFFEFEFEF); diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index 5ce5ceba..4c7656f6 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -70,6 +70,7 @@ class LabResultWidget extends StatelessWidget { child: RaisedButton( color: new Color(0xFFc5272d), textColor: Colors.white, + elevation: 0, disabledTextColor: Colors.white, disabledColor: Colors.red[300], onPressed: () { diff --git a/lib/widgets/nfc/nfc_reader_sheet.dart b/lib/widgets/nfc/nfc_reader_sheet.dart index f2d30c01..80ebc6e7 100644 --- a/lib/widgets/nfc/nfc_reader_sheet.dart +++ b/lib/widgets/nfc/nfc_reader_sheet.dart @@ -128,6 +128,7 @@ class _NfcLayoutState extends State { _stream?.cancel(); Navigator.pop(context); }, + elevation: 0, child: Text("CANCEL"), ), ), @@ -188,7 +189,7 @@ class _NfcLayoutState extends State { // Navigator.pop(context); // }, onPressed: null, - +elevation: 0, child: Text("DONE"), ), ), diff --git a/lib/widgets/others/floating_button_search.dart b/lib/widgets/others/floating_button_search.dart index 7cdeb4a4..8a9274be 100644 --- a/lib/widgets/others/floating_button_search.dart +++ b/lib/widgets/others/floating_button_search.dart @@ -1000,6 +1000,7 @@ class _MyStatefulBuilderState extends State { ? Center( child: RaisedButton( child: AppText('Retry'), + elevation: 0, onPressed: () { RoboSearch.closeAlertDialog(context); event.setValue({'startPopUp': 'true'});