diff --git a/assets/images/doctoricon.svg b/assets/images/doctoricon.svg index a8dd640..a83af92 100644 --- a/assets/images/doctoricon.svg +++ b/assets/images/doctoricon.svg @@ -1,5 +1,5 @@ - + diff --git a/lib/core/config/localized_values.dart b/lib/core/config/localized_values.dart index 4225ed6..12a25a4 100644 --- a/lib/core/config/localized_values.dart +++ b/lib/core/config/localized_values.dart @@ -211,7 +211,7 @@ const Map> localizedValues = { "producerName": {"en": "PRODUCER NAME", "ar": "اسم المنتج"}, "receiptOn": {"en": "RECEIPT ON", "ar": "تاريخ الاستلام"}, "approvalNo": {"en": "Approval No:", "ar": "رقم الموافقة:"}, - "doctor": {"en": "Doctor", "ar": "الدكتور"}, + "Doctor": {"en": "Doctor", "ar": "الدكتور"}, "ext": {"en": "Ext#", "ar": "رقم التحويلة"}, "veryUrgent": {"en": "Very Urgent", "ar": "عاجل جدا"}, "urgent": {"en": "Urgent", "ar": "عاجل"}, @@ -307,7 +307,7 @@ const Map> localizedValues = { "ar": "معلومات السجل الصحي" }, "prevoius-sickleave-issed": { - "en": "Total previous sick leave issued by the doctor", + "en": "Total previous sick leave issued by the Doctor", "ar": "مجموع الإجازات المرضية السابقة التي أصدرها الطبيب" }, "clinicSelect": {"en": "Select Clinic", "ar": "اختر عيادة"}, diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart index 2327b76..97361a5 100644 --- a/lib/home/home_screen.dart +++ b/lib/home/home_screen.dart @@ -15,11 +15,11 @@ import 'first_column.dart'; class MyHomePage extends StatefulWidget { String title = "MyHomePage"; - bool have0Patient = true; + bool have0Patient = false; bool have1Patient = false; bool have2Patient = false; - bool have3Patient = false; - bool haveListOfPatient = false; + bool have3Patient = true; + bool haveListOfPatient = true; @override State createState() => _MyHomePageState(); @@ -88,7 +88,7 @@ class _MyHomePageState extends State { @override void initState() { - startTimer(); + // startTimer(); super.initState(); } @@ -113,6 +113,7 @@ class _MyHomePageState extends State { Center( child: AppText("Awaiting Patients Arrival", fontFamily: 'Poppins-SemiBold.ttf', + letterSpacing: -1.56, fontSize: SizeConfig.getWidthMultiplier() * 9), ), ], @@ -156,9 +157,8 @@ class _MyHomePageState extends State { padding: const EdgeInsets.only(top: 30, left: 30), child: AppText( "Powered By", - letterSpacing: -1.1, - color: AppGlobal.appTextColor, - fontSize: SizeConfig.getWidthMultiplier() * 2.5, + letterSpacing: -1.56, + fontSize: SizeConfig.getWidthMultiplier() * 2.6, fontFamily: 'Poppins-Medium.ttf', ), ), @@ -166,7 +166,7 @@ class _MyHomePageState extends State { padding: const EdgeInsets.only(top: 40, left: 18), child: Image.asset( "assets/images/cloud_logo.png", - height: SizeConfig.getHeightMultiplier() * 5, + height: SizeConfig.getHeightMultiplier() * 6, ), ), ], diff --git a/lib/home/que_item/que_item.dart b/lib/home/que_item/que_item.dart index 94020d5..5917726 100644 --- a/lib/home/que_item/que_item.dart +++ b/lib/home/que_item/que_item.dart @@ -52,12 +52,14 @@ class QueItem extends StatelessWidget { ? 13 : isSecondLine ? 8.5 - : 5.5), - letterSpacing: -2.6, - fontWeight: FontWeight.bold, + : 5.0), + letterSpacing: -3.26, + fontWeight: FontWeight.w600, fontFamily: 'Poppins', ), ), + const SizedBox(width: 25,), + Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -65,14 +67,10 @@ class QueItem extends StatelessWidget { SvgPicture.asset( isNurseVisit ? "assets/images/nurseicon.svg" - : "assets/images/doctoricon.svg", height:(isFirstLine - ? SizeConfig.getHeightMultiplier()*3 - : isSecondLine - ? SizeConfig.getHeightMultiplier()*3 - : SizeConfig.getHeightMultiplier()*3) ,), + : "assets/images/doctoricon.svg", height:SizeConfig.getHeightMultiplier()*2.5 ,), const SizedBox(width: 8,), AppText( - isNurseVisit ? " Please visit Nurse" : " Please visit doctor", + isNurseVisit ? " Please Visit Nurse" : " Please Visit Doctor", color: AppGlobal.appGreyColor, fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine ? 3.3 diff --git a/lib/home/que_item/que_item_widget.dart b/lib/home/que_item/que_item_widget.dart index 7ac5d60..43cf084 100644 --- a/lib/home/que_item/que_item_widget.dart +++ b/lib/home/que_item/que_item_widget.dart @@ -4,6 +4,8 @@ import 'package:queuing_system/core/config/config.dart'; import 'package:queuing_system/core/config/size_config.dart'; import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; +///TODO Roaa we have dublicated code between this and the que item widget we need to make it customize + class QueItemWidget extends StatelessWidget { const QueItemWidget({ Key key, @@ -26,11 +28,11 @@ class QueItemWidget extends StatelessWidget { queNo, fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine - ? 13 + ? 15 : isSecondLine - ? 7.5 + ? 9.5 : 5.5), - letterSpacing: -5.00, + letterSpacing: -11.72, fontWeight: FontWeight.bold, fontFamily: 'Poppins-Bold.ttf', @@ -42,14 +44,10 @@ class QueItemWidget extends StatelessWidget { SvgPicture.asset( isNurseVisit ? "assets/images/nurseicon.svg" - : "assets/images/doctoricon.svg", height:(isFirstLine - ? SizeConfig.getHeightMultiplier()*3 - : isSecondLine - ? SizeConfig.getHeightMultiplier()*3 - : SizeConfig.getHeightMultiplier()*3) ,), - const SizedBox(width: 8,), + : "assets/images/doctoricon.svg", height:SizeConfig.getHeightMultiplier()*2.5 ,), + const SizedBox(width: 25,), AppText( - isNurseVisit ? "Please visit Nurse" : "Please visit doctor", + isNurseVisit ? "Please Visit Nurse" : "Please Visit Doctor", color: isNurseVisit ? AppGlobal.appGreenColor : AppGlobal.appRedColor, @@ -58,9 +56,9 @@ class QueItemWidget extends StatelessWidget { : isSecondLine ? 3.3 : 3.3), - letterSpacing: -2.6, + letterSpacing: -3.25, fontWeight: FontWeight.w600, - fontFamily: 'Poppins-Bold.ttf', + fontFamily: 'Poppins-Medium.ttf', ), ], ), diff --git a/lib/home/que_item_list.dart b/lib/home/que_item_list.dart index 4826085..e4e1461 100644 --- a/lib/home/que_item_list.dart +++ b/lib/home/que_item_list.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:queuing_system/core/config/size_config.dart'; import 'package:queuing_system/home/que_item/que_item.dart'; class QueItemList extends StatelessWidget { @@ -8,15 +9,17 @@ class QueItemList extends StatelessWidget { Widget build(BuildContext context) { return SizedBox( child: Column( - children: const [ - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), - QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: SizeConfig.getHeightMultiplier() *2.3,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: true, haveListOfPatient: false,), + const QueItem(queNo: "OBG-T45", isInListLine: true, isNurseVisit: false, haveListOfPatient: false,), ],), ); diff --git a/lib/widget/data_display/app_texts_widget.dart b/lib/widget/data_display/app_texts_widget.dart index 9fe77a2..7420d78 100644 --- a/lib/widget/data_display/app_texts_widget.dart +++ b/lib/widget/data_display/app_texts_widget.dart @@ -151,12 +151,6 @@ class _AppTextState extends State { ], ), ), - // onLongPress: (){ - // if(widget.isCopyable){ - // DrAppToastMsg.showShortToast(TranslationBase.of(context).textCopiedSuccessfully); - // Clipboard.setData(new ClipboardData(text: widget.text)); - // } - // }, ); } @@ -191,7 +185,7 @@ class _AppTextState extends State { : TextStyle( fontStyle: widget.italic ? FontStyle.italic : null, color: - widget.color != null ? widget.color : Color(0xff2E303A), + widget.color != null ? widget.color : Color(0xff000000), fontSize: widget.fontSize ?? _getFontSize(), letterSpacing: widget.letterSpacing ?? (widget.variant == "overline" ? 1.5 : null),