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

fix arabic and font style

Browse Source
merge-requests/618/head
mosazaid 5 years ago
parent f08a91b0b8
commit 3d6b55681a
14 changed files with 141 additions and 273 deletions
Show Stats Download Patch File Download Diff File

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

@ -870,4 +870,6 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"showDetail": {"en": "Show Detail", "ar": "أظهر المعلومات"}, "showDetail": {"en": "Show Detail", "ar": "أظهر المعلومات"},
"viewProfile": {"en": "View Profile", "ar": "إعرض الملف"}, "viewProfile": {"en": "View Profile", "ar": "إعرض الملف"},
"severe": {"en": "Severe", "ar": "الشدة"},
"graphDetails": {"en": "Graph Details", "ar": "تفاصيل الرسم البياني"},
}; };

2
lib/core/service/patient-admission-request-service.dart
Unescape Escape View File

@ -163,7 +163,7 @@ class AdmissionRequestService extends LookupService {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['patientMRN'] = patientMrn; body['PatientMRN'] = patientMrn;
await baseAppClient.post( await baseAppClient.post(
GET_DIET_TYPES, GET_DIET_TYPES,

6
lib/core/viewModel/patient-vital-sign-viewmodel.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class VitalSignsViewModel extends BaseViewModel {
String hartRat = "0"; String hartRat = "0";
String respirationBeatPerMinute = "0"; String respirationBeatPerMinute = "0";
String bloodPressure = "0 / 0"; String bloodPressure = "0 / 0";
String oxygenation = "0 - 0"; String oxygenation = "0";
String painScore = "-"; String painScore = "-";
String painLocation = "-"; String painLocation = "-";
String painCharacter = "-"; String painCharacter = "-";
@ -93,11 +93,11 @@ class VitalSignsViewModel extends BaseViewModel {
bloodPressure == 'null') { bloodPressure == 'null') {
bloodPressure = element.bloodPressure.toString(); bloodPressure = element.bloodPressure.toString();
} }
if (oxygenation == "0 - 0" || if (oxygenation == "0" ||
oxygenation == null || oxygenation == null ||
oxygenation == 'null') { oxygenation == 'null') {
oxygenation = oxygenation =
"${element.sAO2.toString()} - ${element.fIO2.toString()}"; "${element.sAO2.toString()}";/* - ${element.fIO2.toString()}*/
} }
if (painScore == null || painScore == "-") { if (painScore == null || painScore == "-") {
painScore = element.painScore.toString() != 'null' painScore = element.painScore.toString() != 'null'

3
lib/screens/patients/profile/lab_result/lab_result_chart_and_detials.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -45,7 +46,7 @@ class LabResultChartAndDetails extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Graph Details", TranslationBase.of(context).graphDetails,
fontSize: SizeConfig.textMultiplier * 2.1, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',

2
lib/screens/patients/profile/patient_profile_screen.dart
Unescape Escape View File

@ -431,7 +431,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
NeverScrollableScrollPhysics(), NeverScrollableScrollPhysics(),
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
childAspectRatio: 1 / 1.0, childAspectRatio: 1 / 1.01,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
PatientProfileButton( PatientProfileButton(

201
lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
Unescape Escape View File

@ -57,15 +57,15 @@ class VitalSignDetailsScreen extends StatelessWidget {
children: [ children: [
AppText( AppText(
"${patient.firstName ?? patient.patientDetails.firstName}'s", "${patient.firstName ?? patient.patientDetails.firstName}'s",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.6, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),
), ),
AppText( AppText(
TranslationBase.of(context).vitalSign, TranslationBase.of(context).vitalSign,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
) )
], ],
), ),
@ -90,7 +90,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).yourBodyMassIndex} ${mode.bodyMax}", "${TranslationBase.of(context).yourBodyMassIndex} ${mode.bodyMax}",
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 2.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -544,8 +544,8 @@ class VitalSignDetailsScreen extends StatelessWidget {
.oxygenation, .oxygenation,
imagePath: imagePath:
"${assetBasePath}oxg.png", "${assetBasePath}oxg.png",
lastVal: mode.oxygenation, lastVal: "${mode.oxygenation}%",
unit: "%", unit: "",
), ),
), ),
InkWell( InkWell(
@ -576,198 +576,11 @@ class VitalSignDetailsScreen extends StatelessWidget {
imagePath: imagePath:
"${assetBasePath}painScale.png", "${assetBasePath}painScale.png",
lastVal: mode.painScore, lastVal: mode.painScore,
unit: "", unit: TranslationBase.of(context).severe,
), ),
), ),
], ],
), ),
/*RoundedContainer(
width: MediaQuery.of(context).size.width / 2,
margin: EdgeInsets.symmetric(
horizontal: 0.0, vertical: 16),
child: Container(
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(top: 8),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
Expanded(
child: Container(
child: Column(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
Row(
children: [
AppText(
"${TranslationBase.of(context).painScale}",
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.painScore}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
Row(
children: [
AppText(
"Location",
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.painLocation}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
Row(
children: [
AppText(
"Character",
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.painCharacter}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
Row(
children: [
AppText(
"Duration",
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.painDuration}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).painManagement,
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.isPainDone}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).frequency,
fontSize: SizeConfig.textMultiplier * 1.5,
color: Colors.black,
fontWeight: FontWeight.w700,
),
SizedBox(
width: 8,
),
AppText(
"${mode.painFrequency}",
fontSize: SizeConfig.textMultiplier * 1.3,
color: Colors.grey.shade700,
fontWeight: FontWeight.normal,
),
],
),
],
),
),
),
Container(
child: Image.asset(
"${assetBasePath}painScale.png",
width: 40,
height: 40,
))
],
),
),
Container(
child: Column(
children: [
Align(
alignment:
Alignment.topRight,
child: Icon(
EvaIcons.eye,
),
),
Align(
alignment:
Alignment.topLeft,
child: Container(
margin: EdgeInsets.only(
left: 5, right: 5),
child: AppText(
"${TranslationBase.of(context).painScale}",
fontFamily: 'Poppins',
fontSize: SizeConfig
.textMultiplier *
1.3,
fontWeight:
FontWeight.bold,
),
),
),
],
),
),
],
),
),
),*/
], ],
), ),
), ),

5
lib/screens/patients/profile/vital_sign/vital_sign_item.dart
Unescape Escape View File

@ -52,6 +52,7 @@ class VitalSignItem extends StatelessWidget {
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.4, fontSize: SizeConfig.textMultiplier * 1.4,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
margin: 0, margin: 0,
), ),
Expanded( Expanded(
@ -62,7 +63,7 @@ class VitalSignItem extends StatelessWidget {
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.2, fontSize: SizeConfig.textMultiplier * 1.2,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: Color(0xFFB8382C), color: Color(0xFFD02127),
margin: 0, margin: 0,
), ),
], ],
@ -98,7 +99,7 @@ class VitalSignItem extends StatelessWidget {
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 5, right: 5),
child: AppText( child: AppText(
"$des", "$des",
fontFamily: 'Poppins', color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.3, fontSize: SizeConfig.textMultiplier * 1.3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),

2
lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart
Unescape Escape View File

@ -58,7 +58,7 @@ class VitalSingChartAndDetials extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Graph Details", TranslationBase.of(context).graphDetails,
fontSize: SizeConfig.textMultiplier * 2.1, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

2
lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart
Unescape Escape View File

@ -63,7 +63,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Graph Details", TranslationBase.of(context).graphDetails,
fontSize: SizeConfig.textMultiplier * 2.3, fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',

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

@ -1247,6 +1247,8 @@ class TranslationBase {
String get acknowledged => String get acknowledged =>
localizedValues['acknowledged'][locale.languageCode]; localizedValues['acknowledged'][locale.languageCode];
String get didntCatch => localizedValues["didntCatch"][locale.languageCode]; String get didntCatch => localizedValues["didntCatch"][locale.languageCode];
String get severe => localizedValues["severe"][locale.languageCode];
String get graphDetails => localizedValues["graphDetails"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

8
lib/widgets/patients/profile/PatientProfileButton.dart
Unescape Escape View File

@ -1,9 +1,11 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; 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';
class PatientProfileButton extends StatelessWidget { class PatientProfileButton extends StatelessWidget {
final String nameLine1; final String nameLine1;
@ -42,6 +44,8 @@ class PatientProfileButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context);
return new Container( return new Container(
margin: new EdgeInsets.symmetric(horizontal: 4.0), margin: new EdgeInsets.symmetric(horizontal: 4.0),
padding: EdgeInsets.fromLTRB(10, 10, 10, 5), padding: EdgeInsets.fromLTRB(10, 10, 10, 5),
@ -63,11 +67,11 @@ class PatientProfileButton extends StatelessWidget {
url + icon, url + icon,
width: 50, width: 50,
height: 50, height: 50,
)) ),)
], ],
)), )),
Container( Container(
alignment: Alignment.topLeft, alignment: projectsProvider.isArabic ? Alignment.topRight : Alignment.topLeft,
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

3
lib/widgets/shared/app_expandable_notifier.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:expandable/expandable.dart'; import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -30,7 +31,7 @@ class AppExpandableNotifier extends StatelessWidget {
header: Padding( header: Padding(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Text( child: Text(
"See Graph Details", "${TranslationBase.of(context).graphDetails}",
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
)), )),
collapsed: Text(''), collapsed: Text(''),

123
lib/widgets/shared/buttons/app_buttons_widget.dart
Unescape Escape View File

@ -48,71 +48,74 @@ class AppButton extends StatefulWidget {
class _AppButtonState extends State<AppButton> { class _AppButtonState extends State<AppButton> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return IgnorePointer( return Container(
ignoring: widget.loading ||widget.disabled, height: MediaQuery.of(context).size.height * 0.075,
child: RawMaterialButton( child: IgnorePointer(
fillColor: widget.disabled ignoring: widget.loading ||widget.disabled,
? Colors.grey : widget.color != null ? widget.color : HexColor("#B8382C"), child: RawMaterialButton(
splashColor: widget.color, fillColor: widget.disabled
child: Padding( ? Colors.grey : widget.color != null ? widget.color : HexColor("#B8382C"),
padding: (widget.hPadding > 0 || widget.vPadding > 0) splashColor: widget.color,
? EdgeInsets.symmetric( child: Padding(
vertical: widget.vPadding, horizontal: widget.hPadding) padding: (widget.hPadding > 0 || widget.vPadding > 0)
: EdgeInsets.only( ? EdgeInsets.symmetric(
top: widget.padding, vertical: widget.vPadding, horizontal: widget.hPadding)
bottom: widget.padding, : EdgeInsets.only(
//right: SizeConfig.widthMultiplier * widget.padding, top: widget.padding,
//left: SizeConfig.widthMultiplier * widget.padding bottom: widget.padding,
), //right: SizeConfig.widthMultiplier * widget.padding,
child: Row( //left: SizeConfig.widthMultiplier * widget.padding
mainAxisSize: MainAxisSize.max, ),
mainAxisAlignment: MainAxisAlignment.center, child: Row(
children: <Widget>[ mainAxisSize: MainAxisSize.max,
if (widget.icon != null) mainAxisAlignment: MainAxisAlignment.center,
Container(width: 25, height: 25, child: widget.icon), children: <Widget>[
if (widget.iconData != null) if (widget.icon != null)
Icon( Container(width: 25, height: 25, child: widget.icon),
widget.iconData, if (widget.iconData != null)
color: Colors.white, Icon(
), widget.iconData,
if (widget.icon != null || widget.iconData != null) color: Colors.white,
SizedBox( ),
width: 5.0, if (widget.icon != null || widget.iconData != null)
), SizedBox(
widget.loading width: 5.0,
? Padding( ),
padding: EdgeInsets.all(2.6), widget.loading
child: SizedBox( ? Padding(
height: 19.0, padding: EdgeInsets.all(2.6),
width: 19.0, child: SizedBox(
child: CircularProgressIndicator( height: 19.0,
backgroundColor: Colors.white, width: 19.0,
valueColor: AlwaysStoppedAnimation<Color>( child: CircularProgressIndicator(
Colors.grey[300], backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[300],
),
), ),
), ),
)
: Container(
child: AppText(
widget.title,
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
fontWeight: widget.fontWeight,
),
), ),
) ],
: Container( ),
child: AppText(
widget.title,
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
fontWeight: widget.fontWeight,
),
),
],
), ),
onPressed: widget.disabled ? (){} : widget.onPressed,
shape: RoundedRectangleBorder(
side: BorderSide(
color:
widget.hasBorder ? widget.borderColor : widget.disabled
? Colors.grey : widget.color ?? Color(0xFFB8382C),
width: 0.8,
),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))),
), ),
onPressed: widget.disabled ? (){} : widget.onPressed,
shape: RoundedRectangleBorder(
side: BorderSide(
color:
widget.hasBorder ? widget.borderColor : widget.disabled
? Colors.grey : widget.color ?? Color(0xFFB8382C),
width: 0.8,
),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))),
), ),
); );
} }

53
lib/widgets/shared/buttons/button_bottom_sheet.dart
Unescape Escape View File

@ -4,20 +4,61 @@ import 'app_buttons_widget.dart';
class ButtonBottomSheet extends StatelessWidget { class ButtonBottomSheet extends StatelessWidget {
final double height; final GestureTapCallback onPressed;
final String buttonTitle; final String title;
final Function onPressed; final IconData iconData;
final Widget icon;
final Color color;
final double fontSize;
final double padding;
final Color fontColor;
final bool loading;
final bool disabled;
final FontWeight fontWeight;
final bool hasBorder;
final Color borderColor;
final double radius;
final double vPadding;
final double hPadding;
ButtonBottomSheet({@required this.height, @required this.buttonTitle, @required this.onPressed}); ButtonBottomSheet({@required this.onPressed,
this.title,
this.iconData,
this.icon,
this.color,
this.fontSize = 2,
this.padding = 13,
this.loading = false,
this.disabled = false,
this.fontColor = Colors.white,
this.fontWeight = FontWeight.normal,
this.vPadding = 0,
this.hPadding = 0,
this.radius = 8.0,
this.hasBorder = false,
this.borderColor,});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: height ?? null,
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16), margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: AppButton( child: AppButton(
title: buttonTitle, title: title,
onPressed: onPressed, onPressed: onPressed,
fontWeight: fontWeight,
color: color,
fontSize: fontSize,
padding: padding,
disabled: disabled,
radius: radius,
hasBorder: hasBorder,
fontColor: fontColor,
icon: icon,
iconData: iconData,
hPadding: hPadding,
vPadding: vPadding,
borderColor: borderColor,
loading: loading,
), ),
); );
} }

Write Preview
Loading…
Cancel
Save