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

fix issue of design

Browse Source
merge-requests/3/head
Elham Rababh 4 years ago
parent 5fe631c759
commit 507e3b0ac1
7 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
assets/images/doctoricon.svg
Unescape Escape View File

@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="54.029" height="58" viewBox="0 0 54.029 58">
<g id="doctor_2_" data-name="doctor (2)" transform="translate(-4.985 -3)">
<g id="doctor_2_" data-name="Doctor (2)" transform="translate(-4.985 -3)">
<path id="Path_57" data-name="Path 57" d="M49.73,40,47,39.43c1.51,3,.89,5.33,1,7.71a4,4,0,1,1-2,0c-.2-2.18.71-5.24-1.72-8.24l-6.36-1.23a13.83,13.83,0,0,1-11.84,0L19.72,38.9A7.68,7.68,0,0,0,18,43.77v.33a5.21,5.21,0,0,1,4.11,4.16l.95,5.2a3,3,0,0,1-.65,2.46c-1.19,1.44-2.83,1-3.41,1.08V55c.6-.07,1.42.21,1.87-.36a1,1,0,0,0,.22-.82l-.95-5.2a3.19,3.19,0,0,0-6.28,0l-.95,5.2a1,1,0,0,0,1,1.18H15v2H13.9a3.006,3.006,0,0,1-2.96-3.54l1-5.2A5.21,5.21,0,0,1,16,44.1v-.33a9.61,9.61,0,0,1,1-4.34L14.27,40A9.05,9.05,0,0,0,7.1,47.32L5,59.83A1,1,0,0,0,6,61H27.42a1,1,0,0,0,1-1.16l-3-18.57,5.83,4.32a1,1,0,0,0,1.18,0l6.24-4.42-3,18.65a1,1,0,0,0,1,1.16H58a1,1,0,0,0,1-1.17L56.9,47.32A9.05,9.05,0,0,0,49.73,40Z" fill="#ec1c2b"/>
<path id="Path_58" data-name="Path 58" d="M39.77,34.13A11.94,11.94,0,0,0,44,25.9,5,5,0,0,0,46,17c.34-1.32,1.76-7.65-1.32-10.73-2.3-2.27-5.8-1.78-7.3-1.42C36.66,4.09,35.1,3,32,3,27.65,3,20.38,3,18.11,7.55c-1.79,3.57-1,8.35-.7,10a5,5,0,0,0,2.64,8.36,11.94,11.94,0,0,0,4.18,8.23,9.74,9.74,0,0,0-7.2,5.3l2.69-.53A7.73,7.73,0,0,1,25.77,36h1.45a12,12,0,0,0,9.56,0h1.45a7.73,7.73,0,0,1,6.05,2.9l2.69.52A9.77,9.77,0,0,0,39.77,34.13ZM44,18.35l.25-.08A3,3,0,0,1,44,23.82ZM20,23.82a3,3,0,0,1-1-5.07l1-.34ZM32,35A10,10,0,0,1,22,25V20a41.82,41.82,0,0,0,8.24-1,11.86,11.86,0,0,0,5.47-3.11c1.56,2.55,4.81,3.78,6.29,4.23V25A10,10,0,0,1,32,35Z" fill="#ec1c2b"/>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@ -211,7 +211,7 @@ const Map<String, Map<String, String>> 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<String, Map<String, String>> 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": "اختر عيادة"},

16
lib/home/home_screen.dart
Unescape Escape View File

@ -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<MyHomePage> createState() => _MyHomePageState();
@ -88,7 +88,7 @@ class _MyHomePageState extends State<MyHomePage> {
@override
void initState() {
startTimer();
// startTimer();
super.initState();
}
@ -113,6 +113,7 @@ class _MyHomePageState extends State<MyHomePage> {
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<MyHomePage> {
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<MyHomePage> {
padding: const EdgeInsets.only(top: 40, left: 18),
child: Image.asset(
"assets/images/cloud_logo.png",
height: SizeConfig.getHeightMultiplier() * 5,
height: SizeConfig.getHeightMultiplier() * 6,
),
),
],

16
lib/home/que_item/que_item.dart
Unescape Escape View File

@ -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

22
lib/home/que_item/que_item_widget.dart
Unescape Escape View File

@ -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',
),
],
),

21
lib/home/que_item_list.dart
Unescape Escape View File

@ -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,),
],),
);

8
lib/widget/data_display/app_texts_widget.dart
Unescape Escape View File

@ -151,12 +151,6 @@ class _AppTextState extends State<AppText> {
],
),
),
// 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<AppText> {
: 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),

Write Preview
Loading…
Cancel
Save