From e1b39df1533d250301f8447e784bb3a221a52a63 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Sun, 27 Mar 2022 12:41:46 +0300 Subject: [PATCH] Edit some design issues --- lib/core/config/config.dart | 3 +- lib/core/enum/font_enum.dart | 6 ++++ lib/home/home_screen.dart | 13 ++++---- lib/home/que_item/que_item.dart | 56 +++++++-------------------------- 4 files changed, 25 insertions(+), 53 deletions(-) diff --git a/lib/core/config/config.dart b/lib/core/config/config.dart index 31b19f0..7221b93 100644 --- a/lib/core/config/config.dart +++ b/lib/core/config/config.dart @@ -18,6 +18,7 @@ class AppGlobal { static Color appTextColor = const Color(0xFF2B353E); static Color scheduleTextColor = const Color(0xFF2E303A); static Color inProgressColor = const Color(0xFFCC9B14); - static Color appLightGreyColor = const Color(0xFF575757); + static Color appGreyColor = const Color(0xFF575757); + static Color appLightGreyColor = const Color(0xFFE6E6E6); } diff --git a/lib/core/enum/font_enum.dart b/lib/core/enum/font_enum.dart index e69de29..8852b2e 100644 --- a/lib/core/enum/font_enum.dart +++ b/lib/core/enum/font_enum.dart @@ -0,0 +1,6 @@ +enum FontType { + Poppins_Bold, + poppins_Medium, + poppins_Regular, + poppins_SemiBold, +} \ No newline at end of file diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart index 17e6afb..101a14d 100644 --- a/lib/home/home_screen.dart +++ b/lib/home/home_screen.dart @@ -11,11 +11,10 @@ import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; class MyHomePage extends StatefulWidget { - String title ="MyHomePage"; - bool haveOnePatient = false; - bool have3Patient = true; - bool haveListOfPatient = false; + bool haveOnePatient = true; + bool have3Patient = false; + bool haveListOfPatient = true; @override @@ -30,7 +29,7 @@ class _MyHomePageState extends State { appBar: AppHeader(), body: Column( children: [ - SizedBox(height: SizeConfig.getHeightMultiplier() * (widget.haveOnePatient?20: 3)), + SizedBox(height: SizeConfig.getHeightMultiplier() * (widget.haveOnePatient?20: 2)), widget.haveListOfPatient? Row( children: [ @@ -44,7 +43,7 @@ class _MyHomePageState extends State { Container( width: 10, height:SizeConfig.getHeightMultiplier()*40, - color: Colors.grey, + color: AppGlobal.appLightGreyColor, ), if(widget.haveListOfPatient) const SizedBox( @@ -58,7 +57,7 @@ class _MyHomePageState extends State { ), bottomSheet: Container( color: Colors.transparent, - height: Utils.getHeight(), + height: Utils.getHeight()* 0.9, width: double.infinity, child: Row( children: [ diff --git a/lib/home/que_item/que_item.dart b/lib/home/que_item/que_item.dart index c7b38d7..94020d5 100644 --- a/lib/home/que_item/que_item.dart +++ b/lib/home/que_item/que_item.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:queuing_system/core/config/config.dart'; import 'package:queuing_system/core/config/size_config.dart'; +import 'package:queuing_system/home/que_item/que_item_widget.dart'; import 'package:queuing_system/widget/data_display/app_texts_widget.dart'; class QueItem extends StatelessWidget { @@ -26,51 +27,16 @@ class QueItem extends StatelessWidget { Widget build(BuildContext context) { return haveListOfPatient? Padding( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(45.0), child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - AppText( - queNo, - fontSize: SizeConfig.getWidthMultiplier() * - (isFirstLine - ? 13 - : isSecondLine - ? 8.5 - : 5.5), - letterSpacing: -5.00, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins-Bold.ttf', + QueItemWidget( + isFirstLine: isFirstLine, + isNurseVisit: isNurseVisit, + isSecondLine: isSecondLine, + queNo: queNo, ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SvgPicture.asset( - isNurseVisit - ? "assets/images/nurseicon.svg" - : "assets/images/doctoricon.svg", height:(isFirstLine - ? 40 - : isSecondLine - ? 40 - : 40) ,), - const SizedBox(width: 8,), - AppText( - isNurseVisit ? "Please visit Nurse" : "Please visit doctor", - color: isNurseVisit - ? AppGlobal.appGreenColor - : AppGlobal.appRedColor, - fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine - ? 3.3 - : isSecondLine - ? 3.3 - : 3.3), - letterSpacing: -2.6, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins-Bold.ttf', - ), - ], - ) ], ), ) @@ -100,14 +66,14 @@ class QueItem extends StatelessWidget { isNurseVisit ? "assets/images/nurseicon.svg" : "assets/images/doctoricon.svg", height:(isFirstLine - ? 40 + ? SizeConfig.getHeightMultiplier()*3 : isSecondLine - ? 40 - : 40) ,), + ? SizeConfig.getHeightMultiplier()*3 + : SizeConfig.getHeightMultiplier()*3) ,), const SizedBox(width: 8,), AppText( isNurseVisit ? " Please visit Nurse" : " Please visit doctor", - color: AppGlobal.appLightGreyColor, + color: AppGlobal.appGreyColor, fontSize: SizeConfig.getWidthMultiplier() * (isFirstLine ? 3.3 : isSecondLine