Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'design-updates' into 'development'

Browse Source 
patients out and patients in screens design updates

See merge request Cloud_Solution/doctor_app_flutter!177
pull/181/head
Elham 4 years ago
parent e1d4111284 6bbc629060
commit 664d2b5c2b
4 changed files with 94 additions and 114 deletions
Show Stats Download Patch File Download Diff File

4
lib/config/config.dart
Unescape Escape View File

@ -100,8 +100,8 @@ var SERVICES_PATIANT2 = [
"List_MyReferralPatient" "List_MyReferralPatient"
]; ];
var SERVICES_PATIANT_HEADER = [ var SERVICES_PATIANT_HEADER = [
"OutPatient", "Search Out-Patient",
"InPatient", "Search In-Patient",
"Discharge", "Discharge",
"Referred", "Referred",
"Referral Discharge", "Referral Discharge",

9
lib/config/localized_values.dart
Unescape Escape View File

@ -6,7 +6,6 @@ const Map<String, Map<String, String>> localizedValues = {
'lanArabic': {'en': 'العربية', 'ar': 'العربية'}, 'lanArabic': {'en': 'العربية', 'ar': 'العربية'},
'theDoctor': {'en': 'Doctor', 'ar': 'الطبيب'}, 'theDoctor': {'en': 'Doctor', 'ar': 'الطبيب'},
'reply': {'en': 'Reply', 'ar': 'رد'}, 'reply': {'en': 'Reply', 'ar': 'رد'},
'time': {'en': 'Time', 'ar': 'الوقت'}, 'time': {'en': 'Time', 'ar': 'الوقت'},
'fileNo': {'en': 'File No:', 'ar': 'رقم الملف:'}, 'fileNo': {'en': 'File No:', 'ar': 'رقم الملف:'},
'mobileNo': {'en': 'Mobile No', 'ar': 'رقم الموبايل'}, 'mobileNo': {'en': 'Mobile No', 'ar': 'رقم الموبايل'},
@ -242,11 +241,11 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'You don\'t have any Items', 'en': 'You don\'t have any Items',
'ar': 'لا يوجد اي نتائج' 'ar': 'لا يوجد اي نتائج'
}, },
'typeMedicineName': { 'typeMedicineName': {'en': 'Type Medicine Name', 'ar': 'اكتب اسم الدواء'},
'en': 'Type Medicine Name', 'moreThan3Letter': {
'ar': 'اكتب اسم الدواء'
},'moreThan3Letter': {
'en': 'Medicine Name Should Be More Than 3 letter', 'en': 'Medicine Name Should Be More Than 3 letter',
'ar': 'يجب أن يكون اسم الدواء أكثر من 3 أحرف' 'ar': 'يجب أن يكون اسم الدواء أكثر من 3 أحرف'
}, },
'gender2': {'en': 'Gender: ', 'ar': 'الجنس: '},
'age2': {'en': 'Age: ', 'ar': 'العمر: '},
}; };

181
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -323,6 +323,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
Container( Container(
child: lItems == null child: lItems == null
? Column( ? Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
child: Center( child: Center(
@ -349,7 +351,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
? _locationBar(context) ? _locationBar(context)
: Container(), : Container(),
), ),
SizedBox(height: 10.0), SizedBox(height: 18.5),
Container( Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,
height: SizeConfig.screenHeight * 0.05, height: SizeConfig.screenHeight * 0.05,
@ -361,23 +363,22 @@ class _PatientsScreenState extends State<PatientsScreen> {
decoration: buildInputDecoration( decoration: buildInputDecoration(
context, context,
TranslationBase.of(context) TranslationBase.of(context)
.search), .searchPatient),
), ),
), ),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
Divider( Divider(
thickness: 1, thickness: 0.5,
color: Colors.grey, color: Color(0xffCCCCCC),
), ),
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), color: Color(0Xffffffff),
borderRadius: borderRadius:
BorderRadius.circular(20)), BorderRadius.circular(20)),
margin: margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
EdgeInsets.fromLTRB(15, 0, 15, 0),
child: (responseModelList.length > 0) child: (responseModelList.length > 0)
? Column( ? Column(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
@ -394,22 +395,15 @@ class _PatientsScreenState extends State<PatientsScreen> {
MainAxisAlignment MainAxisAlignment
.start, .start,
children: <Widget>[ children: <Widget>[
Container( Padding(
padding: EdgeInsets
.only(
left:
12.0),
child:
Container(
decoration: decoration:
BoxDecoration( BoxDecoration(
gradient: LinearGradient(
begin: Alignment(
-1,
-1),
end: Alignment(
1,
1),
colors: [
Colors
.grey[100],
Colors
.grey[200],
]),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Color.fromRGBO( color: Color.fromRGBO(
@ -425,7 +419,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
], ],
borderRadius: borderRadius:
BorderRadius.all( BorderRadius.all(
Radius.circular(50.0)), Radius.circular(35.0)),
color: Color(
0xffCCCCCC),
), ),
width: 70, width: 70,
height: 70, height: 70,
@ -436,8 +432,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
.male .male
: DoctorApp : DoctorApp
.female_icon, .female_icon,
size: 80, size: 70,
)), color: Colors
.white,
),
),
),
], ],
), ),
@ -447,13 +447,22 @@ class _PatientsScreenState extends State<PatientsScreen> {
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
Column( Column(
children: [ children: [
SizedBox(
height:
10.0,
),
Padding( Padding(
padding: EdgeInsets padding: EdgeInsets.symmetric(
.only( vertical:
top: 10.5), 5.5,
horizontal:
22.5),
child: child:
AppText( AppText(
item.firstName + item.firstName +
@ -466,8 +475,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
FontWeight.bold, FontWeight.bold,
backGroundcolor: backGroundcolor:
Colors.white, Colors.white,
textAlign:
TextAlign.left,
), ),
), ),
], ],
@ -475,7 +482,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.spaceEvenly, .spaceAround,
children: [ children: [
Column( Column(
crossAxisAlignment: crossAxisAlignment:
@ -483,18 +490,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
.start, .start,
children: < children: <
Widget>[ Widget>[
SizedBox(
height:
15,
),
SizedBox(
height:
0,
),
SizedBox(
height:
3.5,
),
Wrap( Wrap(
children: [ children: [
AppText( AppText(
@ -534,21 +529,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: Hexcolor("#20A169"),
),
child: AppText(
item.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox( SizedBox(
width: 3.5, width: 3.5,
), ),
@ -560,12 +540,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
), ),
SizedBox( SizedBox(
height: 25.5, height: 0.5,
) )
], ],
) )
: SizedBox( : SizedBox(
height: 15, height: 5,
), ),
], ],
), ),
@ -580,7 +560,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Widget>[ Widget>[
SizedBox( SizedBox(
height: height:
20.5, 0.5,
), ),
SizedBox( SizedBox(
height: height:
@ -589,7 +569,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Wrap( Wrap(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).age, TranslationBase.of(context).age2,
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.white, backGroundcolor: Colors.white,
@ -609,7 +589,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Wrap( Wrap(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).gender, TranslationBase.of(context).gender2,
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.white, backGroundcolor: Colors.white,
@ -631,21 +611,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: Hexcolor("#20A169"),
),
child: AppText(
item.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox( SizedBox(
width: 3.5, width: 3.5,
), ),
@ -722,10 +687,15 @@ class _PatientsScreenState extends State<PatientsScreen> {
Widget _locationBar(BuildContext _context) { Widget _locationBar(BuildContext _context) {
return Expanded( return Expanded(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.065, height: MediaQuery.of(context).size.height * 0.0619,
width: SizeConfig.screenWidth * 0.95, width: SizeConfig.screenWidth * 0.94,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)), color: Color(0Xffffffff),
borderRadius: BorderRadius.circular(12.5),
border: Border.all(
width: 0.5,
),
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
@ -735,26 +705,33 @@ class _PatientsScreenState extends State<PatientsScreen> {
return Column(mainAxisSize: MainAxisSize.min, children: <Widget>[ return Column(mainAxisSize: MainAxisSize.min, children: <Widget>[
InkWell( InkWell(
child: Center( child: Center(
child: Container( child: Expanded(
height: 40, child: Container(
width: 90, height: MediaQuery.of(context).size.height * 0.058,
decoration: BoxDecoration( width: SizeConfig.screenWidth * 0.2334,
borderRadius: BorderRadius.circular(3.0), decoration: BoxDecoration(
color: _isActive ? Hexcolor("#B8382B") : Colors.white, borderRadius: BorderRadius.only(
), bottomRight: Radius.circular(12.5),
child: Center( topRight: Radius.circular(12.5),
child: Text( topLeft: Radius.circular(9.5),
item, bottomLeft: Radius.circular(9.5)),
style: TextStyle( color:
fontSize: 12, _isActive ? Hexcolor("#B8382B") : Colors.white,
color: _isActive
? Colors.white
: Colors.black, //Colors.black,
fontWeight: FontWeight.bold,
),
), ),
)), child: Center(
child: Text(
item,
style: TextStyle(
fontSize: 12,
color: _isActive
? Colors.white
: Colors.black, //Colors.black,
fontWeight: FontWeight.normal,
),
),
)),
),
), ),
onTap: () { onTap: () {
print(_locations.indexOf(item)); print(_locations.indexOf(item));
@ -768,11 +745,13 @@ class _PatientsScreenState extends State<PatientsScreen> {
_isActive _isActive
? Container( ? Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.only(
bottomRight: Radius.circular(10),
topRight: Radius.circular(10)),
color: Colors.white), color: Colors.white),
alignment: Alignment.center, alignment: Alignment.center,
height: 3, height: 1,
width: 90, width: SizeConfig.screenWidth * 0.23,
) )
: Container() : Container()
]); ]);

14
lib/util/translations_delegate_base.dart
Unescape Escape View File

@ -57,10 +57,8 @@ class TranslationBase {
String get outPatients => localizedValues['outPatients'][locale.languageCode]; String get outPatients => localizedValues['outPatients'][locale.languageCode];
String get searchPatient => String get searchPatient =>
localizedValues['searchPatient'][locale.languageCode]; localizedValues['searchPatient'][locale.languageCode];
String get searchAbout => String get searchAbout => localizedValues['searchAbout'][locale.languageCode];
localizedValues['searchAbout'][locale.languageCode]; String get patient => localizedValues['patient'][locale.languageCode];
String get patient =>
localizedValues['patient'][locale.languageCode];
String get labResult => localizedValues['labResult'][locale.languageCode]; String get labResult => localizedValues['labResult'][locale.languageCode];
String get todayStatistics => String get todayStatistics =>
localizedValues['todayStatistics'][locale.languageCode]; localizedValues['todayStatistics'][locale.languageCode];
@ -271,8 +269,12 @@ class TranslationBase {
localizedValues['searchPatientImageCaptionBody'][locale.languageCode]; localizedValues['searchPatientImageCaptionBody'][locale.languageCode];
String get welcome => localizedValues['welcome'][locale.languageCode]; String get welcome => localizedValues['welcome'][locale.languageCode];
String get typeMedicineName => localizedValues['typeMedicineName'][locale.languageCode]; String get typeMedicineName =>
String get moreThan3Letter => localizedValues['moreThan3Letter'][locale.languageCode]; localizedValues['typeMedicineName'][locale.languageCode];
String get moreThan3Letter =>
localizedValues['moreThan3Letter'][locale.languageCode];
String get gender2 => localizedValues['gender2'][locale.languageCode];
String get age2 => localizedValues['age2'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Write Preview
Loading…
Cancel
Save