Updates & UI Fixes

merge-update-with-lab-changes
haroon amjad 5 years ago
parent 01512e6332
commit e5feef8a9d

@ -1035,5 +1035,13 @@ const Map localizedValues = {
"en": "Email the Report", "en": "Email the Report",
"ar": "أرسل التقرير" "ar": "أرسل التقرير"
}, },
"appoSurvey": {
"en": "Survey",
"ar": "إستبيان"
},
"appoSurveySubtitle": {
"en": "Survey",
"ar": "إستبيان"
},
}; };

@ -554,7 +554,7 @@ class _BookSuccessState extends State<BookSuccess> {
AppoitmentAllHistoryResultList appo) async { AppoitmentAllHistoryResultList appo) async {
if (paymentMethod == "ApplePay") { if (paymentMethod == "ApplePay") {
await widget.chromeBrowser.open( await widget.chromeBrowser.open(
url: "https://flutter.dev/", url: "https://applepay-datatrans-sample.herokuapp.com/",
options: ChromeSafariBrowserClassOptions( options: ChromeSafariBrowserClassOptions(
android: AndroidChromeCustomTabsOptions( android: AndroidChromeCustomTabsOptions(
addDefaultShareMenuItem: false), addDefaultShareMenuItem: false),

@ -4,32 +4,32 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
class ArrivedButtons { class ArrivedButtons {
static var buttons = [ static var buttons = [
{ {
"title": "Arrived", "title": TranslationBase.of(AppGlobal.context).arrived,
"subtitle": "Status", "subtitle": TranslationBase.of(AppGlobal.context).status,
"icon": "assets/images/new-design/waiting-room.png", "icon": "assets/images/new-design/waiting-room.png",
"caller": "openReschedule" "caller": "openReschedule"
}, },
{ {
"title": "Medicines", "title": TranslationBase.of(AppGlobal.context).medicines,
"subtitle": "Prescriptions", "subtitle": TranslationBase.of(AppGlobal.context).medicinesSubtitle,
"icon": "assets/images/new-design/medicine_prescriptions_icon.png", "icon": "assets/images/new-design/medicine_prescriptions_icon.png",
"caller": "prescriptions" "caller": "prescriptions"
}, },
{ {
"title": "Radiology", "title": TranslationBase.of(AppGlobal.context).radiology,
"subtitle": "Services", "subtitle": TranslationBase.of(AppGlobal.context).radiologySubtitle,
"icon": "assets/images/new-design/radiology_service_icon.png", "icon": "assets/images/new-design/radiology_service_icon.png",
"caller": "radiology" "caller": "radiology"
}, },
{ {
"title": "Lab", "title": TranslationBase.of(AppGlobal.context).lab,
"subtitle": "Result", "subtitle": TranslationBase.of(AppGlobal.context).labSubtitle,
"icon": "assets/images/new-design/lab_result_icon.png", "icon": "assets/images/new-design/lab_result_icon.png",
"caller": "labResult" "caller": "labResult"
}, },
{ {
"title": "Vital Signs", "title": TranslationBase.of(AppGlobal.context).vitalSigns,
"subtitle": "Values", "subtitle": TranslationBase.of(AppGlobal.context).vitalSignsSubtitle,
"icon": "assets/images/new-design/vital_signs.png", "icon": "assets/images/new-design/vital_signs.png",
"caller": "VitalSigns" "caller": "VitalSigns"
}, },
@ -40,20 +40,20 @@ class ArrivedButtons {
"caller": "insertComplaint" "caller": "insertComplaint"
}, },
{ {
"title": "Insurance", "title": TranslationBase.of(AppGlobal.context).insurance,
"subtitle": "Approvals", "subtitle": TranslationBase.of(AppGlobal.context).insuranceSubtitle,
"icon": "assets/images/new-design/insurance_approvals_icon.png", "icon": "assets/images/new-design/insurance_approvals_icon.png",
"caller": "Insurance" "caller": "Insurance"
}, },
{ {
"title": "Ask Your", "title": TranslationBase.of(AppGlobal.context).askYour,
"subtitle": "Doctor", "subtitle": TranslationBase.of(AppGlobal.context).askYourSubtitle,
"icon": "assets/images/new-design/ask_doctor_icon.png", "icon": "assets/images/new-design/ask_doctor_icon.png",
"caller": "askDoc" "caller": "askDoc"
}, },
{ {
"title": "Survey", "title": TranslationBase.of(AppGlobal.context).appoSurvey,
"subtitle": "Service", "subtitle": TranslationBase.of(AppGlobal.context).service,
"icon": "assets/images/new-design/survey.png", "icon": "assets/images/new-design/survey.png",
"caller": "Survey" "caller": "Survey"
} }

@ -53,7 +53,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var size = MediaQuery.of(context).size; var size = MediaQuery.of(context).size;
final double itemHeight = ((size.height - kToolbarHeight - 24) * 0.42) / 2; final double itemHeight = ((size.height - kToolbarHeight - 24) * 0.455) / 2;
final double itemWidth = size.width / 2; final double itemWidth = size.width / 2;
return Container( return Container(
@ -73,8 +73,8 @@ class _AppointmentActionsState extends State<AppointmentActions> {
_handleButtonClicks(e); _handleButtonClicks(e);
}, },
child: Container( child: Container(
height: 100.0, // height: 100.0,
margin: EdgeInsets.all(9.0), margin: EdgeInsets.all(7.0),
decoration: BoxDecoration( decoration: BoxDecoration(
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
@ -90,17 +90,17 @@ class _AppointmentActionsState extends State<AppointmentActions> {
children: <Widget>[ children: <Widget>[
Container( Container(
margin: margin:
EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), EdgeInsets.fromLTRB(5.0, 5.0, 5.0, 0.0),
child: Text(e.title, child: Text(e.title,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
color: new Color(0xFF40ACC9), color: new Color(0xFF40ACC9),
letterSpacing: 1.0, letterSpacing: 1.0,
fontSize: 20.0)), fontSize: 18.0)),
), ),
Container( Container(
margin: margin:
EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), EdgeInsets.fromLTRB(5.0, 0.0, 5.0, 0.0),
child: Text(e.subtitle, child: Text(e.subtitle,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
@ -113,7 +113,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
margin: margin:
EdgeInsets.fromLTRB(0.0, 10.0, 10.0, 7.0), EdgeInsets.fromLTRB(0.0, 10.0, 10.0, 7.0),
child: Image.asset(e.icon, child: Image.asset(e.icon,
width: 45.0, height: 45.0), width: 40.0, height: 40.0),
), ),
], ],
), ),

@ -734,7 +734,7 @@ class _HomePageState extends State<HomePage> {
], ],
), ),
), ),
height: 100, height: 106,
imageName: 'rectangle.png', imageName: 'rectangle.png',
color: Colors.grey[700], color: Colors.grey[700],
width: MediaQuery.of(context).size.width * 0.45, width: MediaQuery.of(context).size.width * 0.45,

@ -46,7 +46,7 @@ class VitalSignItem extends StatelessWidget {
des, des,
style: TextStyle( style: TextStyle(
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
color: HexColor('#B8382C'), color: Color(0xff40ACC9),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
@ -78,9 +78,9 @@ class VitalSignItem extends StatelessWidget {
children: [ children: [
TextSpan(text: lastVal), TextSpan(text: lastVal),
TextSpan( TextSpan(
text: unit, text: " " + unit,
style: TextStyle( style: TextStyle(
color: HexColor('#B8382C'), color: Color(0xff40ACC9),
), ),
), ),
]), ]),

@ -866,6 +866,7 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
String get report => localizedValues['report'][locale.languageCode]; String get report => localizedValues['report'][locale.languageCode];
String get openRad => localizedValues['open-rad'][locale.languageCode]; String get openRad => localizedValues['open-rad'][locale.languageCode];
String get sendCopyRad => localizedValues['send-copy'][locale.languageCode]; String get sendCopyRad => localizedValues['send-copy'][locale.languageCode];
String get appoSurvey => localizedValues['appoSurvey'][locale.languageCode];
} }

@ -25,7 +25,7 @@ class MedicalProfileItem extends StatelessWidget {
showBorder: true, showBorder: true,
borderWidth: 0, borderWidth: 0,
margin: 4, margin: 4,
height: 120, // height: 120,
// MediaQuery.of(context).size.height * 0.12, // MediaQuery.of(context).size.height * 0.12,
child: Container( child: Container(
//width: MediaQuery.of(context).size.width * 0.25, //width: MediaQuery.of(context).size.width * 0.25,

Loading…
Cancel
Save