First step from medicine search and change the logo

pull/161/head
Elham Rababah 6 years ago
parent d28d2ecdeb
commit fbc99d681f

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

@ -56,10 +56,7 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'Only Arrived Patient', 'en': 'Only Arrived Patient',
'ar': 'المريض الذي حضر للموعد' 'ar': 'المريض الذي حضر للموعد'
}, },
'searchMedicineNameHere': { 'searchMedicineNameHere': {'en': 'Search Medicine ', 'ar': 'ابحث هنا'},
'en': 'Search Medicine Name Here',
'ar': 'ابحث عن الدواء هنا'
},
'youCanFind': {'en': 'You Can Find', 'ar': 'تستطيع ان تجد '}, 'youCanFind': {'en': 'You Can Find', 'ar': 'تستطيع ان تجد '},
'itemsInSearch': {'en': 'items in search', 'ar': 'عناصر في البحث'}, 'itemsInSearch': {'en': 'items in search', 'ar': 'عناصر في البحث'},
'qrReader': {'en': 'QR Reader', 'ar': 'قارىء رمز الQR'}, 'qrReader': {'en': 'QR Reader', 'ar': 'قارىء رمز الQR'},
@ -216,4 +213,12 @@ const Map<String, Map<String, String>> localizedValues = {
'beingGreat': {'en': 'being great', 'ar': 'رائع'}, 'beingGreat': {'en': 'being great', 'ar': 'رائع'},
'cancel': {'en': 'CANCEL', 'ar': 'الغاء'}, 'cancel': {'en': 'CANCEL', 'ar': 'الغاء'},
'done': {'en': 'DONE', 'ar': 'تأكيد'}, 'done': {'en': 'DONE', 'ar': 'تأكيد'},
"searchMedicineImageCaption": {
'en': 'Type the medicine name to search',
'ar': 'اكتب اسم الدواء الذي تبحت عنه '
},
"type": {
'en': 'Type',
'ar': 'اكتب اسم الدواء '
}
}; };

@ -1,10 +1,12 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_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/providers/medicine_provider.dart';
import 'package:doctor_app_flutter/screens/medicine/pharmacies_list_screen.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_shared_pref.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.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/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/medicine/medicine_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_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:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../util/extenstions.dart'; import '../../util/extenstions.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
@ -50,6 +52,33 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
appBarTitle: TranslationBase.of(context).searchMedicine, appBarTitle: TranslationBase.of(context).searchMedicine,
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
Column(
children: <Widget>[
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(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: SizeConfig.heightMultiplier * 1, bottom: SizeConfig.heightMultiplier * 1,
@ -76,8 +105,9 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).search, title: TranslationBase
color: Color(PRIMARY_COLOR), .of(context)
.search,
onPressed: () { onPressed: () {
searchMedicine(context); searchMedicine(context);
}, },
@ -91,12 +121,16 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).youCanFind + TranslationBase
.of(context)
.youCanFind +
(_medicineProvider.pharmacyItemsList == null (_medicineProvider.pharmacyItemsList == null
? "0" ? " 0 "
: _medicineProvider.pharmacyItemsList.length : _medicineProvider.pharmacyItemsList.length
.toString()) + .toString()) +
TranslationBase.of(context).itemsInSearch, TranslationBase
.of(context)
.itemsInSearch,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
margin: 5, margin: 5,
), ),

@ -450,7 +450,6 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).search, title: TranslationBase.of(context).search,
color: Color(0xff58434F),
onPressed: () { onPressed: () {
_validateInputs(); _validateInputs();
}, },

@ -235,6 +235,8 @@ class TranslationBase {
String get beingGreat => localizedValues['beingGreat'][locale.languageCode]; String get beingGreat => localizedValues['beingGreat'][locale.languageCode];
String get cancel => localizedValues['cancel'][locale.languageCode]; String get cancel => localizedValues['cancel'][locale.languageCode];
String get done => localizedValues['done'][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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -67,15 +67,7 @@ class AuthHeader extends StatelessWidget {
} }
Image buildImageLogo() { Image buildImageLogo() {
String img = 'assets/images/login_icon.png'; String img = 'assets/images/dr_app_logo.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';
}
return Image.asset( return Image.asset(
img, img,
fit: BoxFit.cover, fit: BoxFit.cover,

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
@ -14,7 +15,7 @@ class AppButton extends StatefulWidget {
final double fontSize; final double fontSize;
final double padding; 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(); _AppButtonState createState() => _AppButtonState();
@ -25,37 +26,38 @@ class AppButton extends StatefulWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return return
RawMaterialButton( RawMaterialButton(
fillColor: widget.color, fillColor: widget.color != null ? widget.color : Hexcolor("#B8382C"),
splashColor: widget.color, splashColor: widget.color,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 15, top: widget.padding,
bottom: 15, bottom: widget.padding,
//right: SizeConfig.widthMultiplier * widget.padding, //right: SizeConfig.widthMultiplier * widget.padding,
//left: SizeConfig.widthMultiplier * widget.padding //left: SizeConfig.widthMultiplier * widget.padding
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
if (widget.icon != null) Icon( if (widget.icon != null)
Icon(
widget.icon, widget.icon,
color: Colors.white, color: Colors.white,
), ),
if (widget.icon != null) SizedBox( if (widget.icon != null)
SizedBox(
width: 5.0, width: 5.0,
), ),
AppText( AppText(
widget.title, widget.title.toUpperCase(),
color: Colors.white, color: Colors.white,
fontSize: SizeConfig.textMultiplier * widget.fontSize , fontSize: SizeConfig.textMultiplier * widget.fontSize ,
fontWeight: FontWeight.bold,
), ),
], ],
), ),
), ),
onPressed: widget.onPressed, onPressed: widget.onPressed,
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))), shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(6))),
); );
} }
} }

@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:hexcolor/hexcolor.dart';
// OWNER : Ibrahim albitar // OWNER : Ibrahim albitar
// DATE : 19-04-2020 // DATE : 19-04-2020
@ -29,30 +30,34 @@ class AppTextFormField extends FormField<String> {
builder: (FormFieldState<String> state) { builder: (FormFieldState<String> state) {
return Column( return Column(
children: <Widget>[ children: <Widget>[
TextFormField( SizedBox(
focusNode: focusNode, height: 40.0,
keyboardType: textInputType, child: TextFormField(
inputFormatters: [WhitelistingTextInputFormatter(RegExp(inputFormatter)),], focusNode: focusNode,
onChanged: onChanged?? (value){ keyboardType: textInputType,
state.didChange(value); inputFormatters: [WhitelistingTextInputFormatter(RegExp(inputFormatter)),],
}, onChanged: onChanged?? (value){
textInputAction: textInputAction, state.didChange(value);
onFieldSubmitted: onFieldSubmitted, },
decoration: InputDecoration( textInputAction: textInputAction,
hintText: hintText, onFieldSubmitted: onFieldSubmitted,
hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 2), decoration: InputDecoration(
enabledBorder: OutlineInputBorder( hintText: hintText,
borderRadius: BorderRadius.all(Radius.circular(10)), hintStyle: TextStyle(fontSize: SizeConfig.textMultiplier * 1.8,),
borderSide: BorderSide(color: Color(0xff707070)), contentPadding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 0.0),
), enabledBorder: OutlineInputBorder(
focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(6)),
borderRadius: BorderRadius.all(Radius.circular(10)), borderSide: BorderSide(color: Hexcolor("#CCCCCC")),
) ),
//BorderRadius.all(Radius.circular(20)); focusedBorder: OutlineInputBorder(
), borderRadius: BorderRadius.all(Radius.circular(6)),
onTap: onTap, )
controller: controller, //BorderRadius.all(Radius.circular(20));
),
onTap: onTap,
controller: controller,
), ),
),
state.hasError? state.hasError?
Text( Text(
state.errorText, state.errorText,

Loading…
Cancel
Save