From 291215907c58c86a25cfa25bf3213416ad492ddb Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Mon, 2 Sep 2024 15:17:37 +0300 Subject: [PATCH] Fixed VitalSign issue --- lib/home/home_screen.dart | 14 +++----------- lib/home/priority_calls_components.dart | 15 +++++---------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart index 4c9e52d..b6bce35 100644 --- a/lib/home/home_screen.dart +++ b/lib/home/home_screen.dart @@ -18,16 +18,11 @@ class MyHomePage extends StatelessWidget { getWeatherWidget() { return Consumer(builder: (BuildContext context, AppProvider appProvider, Widget? child) { - if (appProvider.currentWeathersWidgetModel.maxTemp == null || - appProvider.currentWeathersWidgetModel.minTemp == null || - appProvider.currentWeathersWidgetModel.iconPhrase == null) { + if (appProvider.currentWeathersWidgetModel.maxTemp == null || appProvider.currentWeathersWidgetModel.minTemp == null || appProvider.currentWeathersWidgetModel.iconPhrase == null) { return const SizedBox.shrink(); } return Container( - height: (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || - appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) - ? SizeConfig.getHeightMultiplier() * 8 - : SizeConfig.getHeightMultiplier() * 5, + height: (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) ? SizeConfig.getHeightMultiplier() * 8 : SizeConfig.getHeightMultiplier() * 5, padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 10), decoration: AppGlobal.configWidgetDecoration, child: Directionality( @@ -69,10 +64,7 @@ class MyHomePage extends StatelessWidget { return const SizedBox.shrink(); } return Container( - height: (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || - appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) - ? SizeConfig.getHeightMultiplier() * 8 - : SizeConfig.getHeightMultiplier() * 5, + height: (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) ? SizeConfig.getHeightMultiplier() * 8 : SizeConfig.getHeightMultiplier() * 5, padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 10), decoration: AppGlobal.configWidgetDecoration, child: Directionality( diff --git a/lib/home/priority_calls_components.dart b/lib/home/priority_calls_components.dart index 008be96..f92f3c6 100644 --- a/lib/home/priority_calls_components.dart +++ b/lib/home/priority_calls_components.dart @@ -106,7 +106,7 @@ class TicketItem extends StatelessWidget { // endColor: blink ? AppGlobal.appRedColor : Colors.black, times: 0, duration: const Duration(seconds: 1)), - const SizedBox(height: 10), + const SizedBox(height: 13), Directionality( textDirection: callConfig.textDirection, child: Row( @@ -114,10 +114,10 @@ class TicketItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Padding( - padding: const EdgeInsets.only(bottom: 8), + padding: EdgeInsets.only(bottom: callType == CallType.vitalSign ? 0 : 8), child: callType.icon(SizeConfig.getHeightMultiplier() * 3), ), - const SizedBox(width: 10), + const SizedBox(width: 13), AppText( callType.message(callConfig), color: callType.color(), @@ -160,9 +160,7 @@ Widget noPatientInQueue({required ScreenOrientationEnum screenOrientationEnum}) child: AppText( "Awaiting Patients Arrival", fontFamily: 'Poppins-SemiBold.ttf', - fontSize: (screenOrientationEnum == ScreenOrientationEnum.portraitDown || screenOrientationEnum == ScreenOrientationEnum.portraitUp) - ? SizeConfig.getWidthMultiplier() * 9 - : SizeConfig.getWidthMultiplier() * 7, + fontSize: (screenOrientationEnum == ScreenOrientationEnum.portraitDown || screenOrientationEnum == ScreenOrientationEnum.portraitUp) ? SizeConfig.getWidthMultiplier() * 9 : SizeConfig.getWidthMultiplier() * 7, ), ), ], @@ -358,8 +356,5 @@ Widget priorityTicketsWithSideList({required List tickets, r ), ) ]; - return (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || - appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) - ? Row(children: children) - : Column(children: children); + return (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) ? Row(children: children) : Column(children: children); }