From fbc99d681f513dfc76a8bbf83912afcb237b45fc Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Tue, 11 Aug 2020 10:35:25 +0300 Subject: [PATCH] First step from medicine search and change the logo --- assets/images/dr_app_logo.png | Bin 0 -> 7861 bytes lib/config/localized_values.dart | 13 +++-- .../medicine/medicine_search_screen.dart | 48 ++++++++++++++--- .../patients/patient_search_screen.dart | 1 - lib/util/translations_delegate_base.dart | 2 + lib/widgets/auth/auth_header.dart | 10 +--- lib/widgets/shared/app_buttons_widget.dart | 44 +++++++-------- lib/widgets/shared/app_text_form_field.dart | 51 ++++++++++-------- 8 files changed, 104 insertions(+), 65 deletions(-) create mode 100644 assets/images/dr_app_logo.png diff --git a/assets/images/dr_app_logo.png b/assets/images/dr_app_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9186c219a67a385d65df87b99dab94c61e567b GIT binary patch literal 7861 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 T3j_hj00000NkvXXu0mjf=zt*1 literal 0 HcmV?d00001 diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 508397e5..5b4adba1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -56,10 +56,7 @@ const Map> localizedValues = { 'en': 'Only Arrived Patient', 'ar': 'المريض الذي حضر للموعد' }, - 'searchMedicineNameHere': { - 'en': 'Search Medicine Name Here', - 'ar': 'ابحث عن الدواء هنا' - }, + 'searchMedicineNameHere': {'en': 'Search Medicine ', 'ar': 'ابحث هنا'}, 'youCanFind': {'en': 'You Can Find', 'ar': 'تستطيع ان تجد '}, 'itemsInSearch': {'en': 'items in search', 'ar': 'عناصر في البحث'}, 'qrReader': {'en': 'QR Reader', 'ar': 'قارىء رمز الQR'}, @@ -216,4 +213,12 @@ const Map> localizedValues = { 'beingGreat': {'en': 'being great', 'ar': 'رائع'}, 'cancel': {'en': 'CANCEL', 'ar': 'الغاء'}, 'done': {'en': 'DONE', 'ar': 'تأكيد'}, + "searchMedicineImageCaption": { + 'en': 'Type the medicine name to search', + 'ar': 'اكتب اسم الدواء الذي تبحت عنه ' + }, + "type": { + 'en': 'Type', + 'ar': 'اكتب اسم الدواء ' + } }; diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index af1eb11d..506122e3 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -1,10 +1,12 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/providers/medicine_provider.dart'; import 'package:doctor_app_flutter/screens/medicine/pharmacies_list_screen.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; +import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -13,8 +15,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; + import '../../util/extenstions.dart'; -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); @@ -50,6 +52,33 @@ class _MedicineSearchState extends State { appBarTitle: TranslationBase.of(context).searchMedicine, body: Column( children: [ + Column( + children: [ + Container( + child: Icon( + DoctorApp.medicinesearch, + size: 100, + color: Colors.black, + ), + margin: EdgeInsets.only(top: 50), + ), + Padding( + padding: const EdgeInsets.only(top: 12.0), + child: AppText( + TranslationBase.of(context).type.toUpperCase(), + fontWeight: FontWeight.bold, + fontSize: SizeConfig.heightMultiplier * 2.5, + ), + ), + Padding( + padding: const EdgeInsets.only(top: 5.0), + child: AppText( + TranslationBase.of(context).searchMedicineImageCaption, + fontSize: SizeConfig.heightMultiplier * 2, + ), + ) + ], + ), Padding( padding: EdgeInsets.only( bottom: SizeConfig.heightMultiplier * 1, @@ -76,8 +105,9 @@ class _MedicineSearchState extends State { alignment: WrapAlignment.center, children: [ AppButton( - title: TranslationBase.of(context).search, - color: Color(PRIMARY_COLOR), + title: TranslationBase + .of(context) + .search, onPressed: () { searchMedicine(context); }, @@ -91,12 +121,16 @@ class _MedicineSearchState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - TranslationBase.of(context).youCanFind + + TranslationBase + .of(context) + .youCanFind + (_medicineProvider.pharmacyItemsList == null - ? "0" + ? " 0 " : _medicineProvider.pharmacyItemsList.length - .toString()) + - TranslationBase.of(context).itemsInSearch, + .toString()) + + TranslationBase + .of(context) + .itemsInSearch, fontWeight: FontWeight.bold, margin: 5, ), diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 54eaf5ee..e60bd238 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -450,7 +450,6 @@ class _PatientSearchScreenState extends State { children: [ AppButton( title: TranslationBase.of(context).search, - color: Color(0xff58434F), onPressed: () { _validateInputs(); }, diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index ad52edd8..0b7ba3e2 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -235,6 +235,8 @@ class TranslationBase { String get beingGreat => localizedValues['beingGreat'][locale.languageCode]; String get cancel => localizedValues['cancel'][locale.languageCode]; String get done => localizedValues['done'][locale.languageCode]; + String get searchMedicineImageCaption => localizedValues['searchMedicineImageCaption'][locale.languageCode]; + String get type => localizedValues['type'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/auth/auth_header.dart b/lib/widgets/auth/auth_header.dart index e577d8b1..fb2cf322 100644 --- a/lib/widgets/auth/auth_header.dart +++ b/lib/widgets/auth/auth_header.dart @@ -67,15 +67,7 @@ class AuthHeader extends StatelessWidget { } Image buildImageLogo() { - String img = 'assets/images/login_icon.png'; - if (userType == loginType.unknownUser) { - img = 'assets/images/welcome_login_icon.png'; - } - if (userType == loginType.verifyPassword || - userType == loginType.verificationMethods) { - img = 'assets/images/verified_icon.png'; - } - + String img = 'assets/images/dr_app_logo.png'; return Image.asset( img, fit: BoxFit.cover, diff --git a/lib/widgets/shared/app_buttons_widget.dart b/lib/widgets/shared/app_buttons_widget.dart index 7b911d9a..53f4eda4 100644 --- a/lib/widgets/shared/app_buttons_widget.dart +++ b/lib/widgets/shared/app_buttons_widget.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'app_texts_widget.dart'; @@ -14,7 +15,7 @@ class AppButton extends StatefulWidget { final double fontSize; final double padding; - AppButton({@required this.onPressed, this.title, this.icon, this.color, this.fontSize = 2.5, this.padding = 15}); + AppButton({@required this.onPressed, this.title, this.icon, this.color, this.fontSize = 2, this.padding = 4}); _AppButtonState createState() => _AppButtonState(); @@ -25,37 +26,38 @@ class AppButton extends StatefulWidget { Widget build(BuildContext context) { return RawMaterialButton( - fillColor: widget.color, - splashColor: widget.color, - child: Padding( - padding: EdgeInsets.only( - top: 15, - bottom: 15, - //right: SizeConfig.widthMultiplier * widget.padding, - //left: SizeConfig.widthMultiplier * widget.padding - ), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - if (widget.icon != null) Icon( + fillColor: widget.color != null ? widget.color : Hexcolor("#B8382C"), + splashColor: widget.color, + child: Padding( + padding: EdgeInsets.only( + top: widget.padding, + bottom: widget.padding, + //right: SizeConfig.widthMultiplier * widget.padding, + //left: SizeConfig.widthMultiplier * widget.padding + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if (widget.icon != null) + Icon( widget.icon, color: Colors.white, ), - if (widget.icon != null) SizedBox( + if (widget.icon != null) + SizedBox( width: 5.0, ), - AppText( - widget.title, - color: Colors.white, + AppText( + widget.title.toUpperCase(), + color: Colors.white, fontSize: SizeConfig.textMultiplier * widget.fontSize , - fontWeight: FontWeight.bold, ), ], ), ), onPressed: widget.onPressed, - shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))), + shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(6))), ); } } \ No newline at end of file diff --git a/lib/widgets/shared/app_text_form_field.dart b/lib/widgets/shared/app_text_form_field.dart index b0b9a8ec..fedc38d1 100644 --- a/lib/widgets/shared/app_text_form_field.dart +++ b/lib/widgets/shared/app_text_form_field.dart @@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:hexcolor/hexcolor.dart'; // OWNER : Ibrahim albitar // DATE : 19-04-2020 @@ -29,30 +30,34 @@ class AppTextFormField extends FormField { builder: (FormFieldState state) { return Column( children: [ - TextFormField( - focusNode: focusNode, - keyboardType: textInputType, - inputFormatters: [WhitelistingTextInputFormatter(RegExp(inputFormatter)),], - onChanged: onChanged?? (value){ - state.didChange(value); - }, - textInputAction: textInputAction, - onFieldSubmitted: onFieldSubmitted, - decoration: InputDecoration( - hintText: hintText, - hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 2), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Color(0xff707070)), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.all(Radius.circular(10)), - ) - //BorderRadius.all(Radius.circular(20)); - ), - onTap: onTap, - controller: controller, + SizedBox( + height: 40.0, + child: TextFormField( + focusNode: focusNode, + keyboardType: textInputType, + inputFormatters: [WhitelistingTextInputFormatter(RegExp(inputFormatter)),], + onChanged: onChanged?? (value){ + state.didChange(value); + }, + textInputAction: textInputAction, + onFieldSubmitted: onFieldSubmitted, + decoration: InputDecoration( + hintText: hintText, + hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 1.8,), + contentPadding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 0.0), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.all(Radius.circular(6)), + borderSide: BorderSide(color: Hexcolor("#CCCCCC")), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.all(Radius.circular(6)), + ) + //BorderRadius.all(Radius.circular(20)); + ), + onTap: onTap, + controller: controller, ), + ), state.hasError? Text( state.errorText,