diff --git a/lib/screens/home/dashboard_referral_patient.dart b/lib/screens/home/dashboard_referral_patient.dart index f7bb9ad5..1a9c09a2 100644 --- a/lib/screens/home/dashboard_referral_patient.dart +++ b/lib/screens/home/dashboard_referral_patient.dart @@ -73,7 +73,7 @@ class DashboardReferralPatient extends StatelessWidget { .of(context) .referral, color: Color(0xFF2B353E), - fontSize: SizeConfig + secondLineFontSize: SizeConfig .getHeightMultiplier( height: height) * (SizeConfig.isHeightVeryShort @@ -90,7 +90,7 @@ class DashboardReferralPatient extends StatelessWidget { ? 5 : SizeConfig.isHeightShort ? 10 - : 12) + : 5) ) ], ),), diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 684cf95a..a0ef6310 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -71,7 +71,7 @@ class _HomeScreenState extends State { builder: (_, model, w) => AppScaffold( baseViewModel: model, isShowAppBar: true, - appBar: HomeScreenHeader( + appBar: HomeScreenHeader( model: model, onOpenDrawer: (){ Scaffold.of(context).openDrawer(); @@ -98,7 +98,7 @@ class _HomeScreenState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ SizedBox( - height: SizeConfig.heightMultiplier * 5, + height: SizeConfig.heightMultiplier * 3, ), sliderActiveIndex == 1 ? DashboardSliderItemWidget( @@ -128,7 +128,7 @@ class _HomeScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( - height: SizeConfig.heightMultiplier * 2, + height: SizeConfig.heightMultiplier * 1, ), Container( child: Label( @@ -136,7 +136,7 @@ class _HomeScreenState extends State { secondLine: TranslationBase.of(context).services, )), SizedBox( - height: SizeConfig.heightMultiplier * 1, + height: SizeConfig.heightMultiplier * .6, ), Container( height: SizeConfig.heightMultiplier * @@ -152,7 +152,7 @@ class _HomeScreenState extends State { ], ), ), - SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:3)) + SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:2)) ], ), diff --git a/lib/screens/home/home_screen_header.dart b/lib/screens/home/home_screen_header.dart index 7d38e898..1e0536e1 100644 --- a/lib/screens/home/home_screen_header.dart +++ b/lib/screens/home/home_screen_header.dart @@ -45,18 +45,20 @@ class _HomeScreenHeaderState extends State { ProjectViewModel projectsProvider = Provider.of(context); authenticationViewModel = Provider.of(context); - return Container( - color: Colors.grey[100], - child: Stack(children: [ - IconButton( - icon: Image.asset( - 'assets/images/menu.png', - width: SizeConfig.widthMultiplier * 7, - ), - iconSize: SizeConfig.heightMultiplier * 2, - color: Colors.black, - onPressed: (){ - widget.onOpenDrawer(); + return widget.model.state == ViewState.Busy + ? Container(color: Colors.grey.withOpacity(0.6)) + : Container( + color: Colors.grey[100], + child: Stack(children: [ + IconButton( + icon: Image.asset( + 'assets/images/menu.png', + width: SizeConfig.widthMultiplier * 7, + ), + iconSize: SizeConfig.heightMultiplier * 2, + color: Colors.black, + onPressed: () { + widget.onOpenDrawer(); }, ), Column( @@ -117,9 +119,13 @@ class _HomeScreenHeaderState extends State { constraints: BoxConstraints( minWidth: SizeConfig - .getHeightMultiplier(height: widget.height) * 50, + .getHeightMultiplier( + height: widget.height) * + 35, minHeight: SizeConfig - .getHeightMultiplier(height: widget.height) * 50, + .getHeightMultiplier( + height: widget.height) * + 30, ), child: Center( child: AppText( @@ -133,9 +139,12 @@ class _HomeScreenHeaderState extends State { projectsProvider .isArabic ? SizeConfig - .getHeightMultiplier(height: widget.height) + .getHeightMultiplier( + height: widget.height) : SizeConfig - .getHeightMultiplier(height: widget.height) * 30, + .getHeightMultiplier( + height: widget + .height) * 20, textAlign: TextAlign .center, @@ -150,7 +159,7 @@ class _HomeScreenHeaderState extends State { .of(context) .size .width * .6) * 5, - color: Colors.black, + color: Color(0xFF2B353E), textOverflow: TextOverflow .ellipsis, fontWeight: diff --git a/lib/screens/home/label.dart b/lib/screens/home/label.dart index bf80dca8..d732d1c9 100644 --- a/lib/screens/home/label.dart +++ b/lib/screens/home/label.dart @@ -7,12 +7,13 @@ import 'package:flutter/material.dart'; // ignore: must_be_immutable class Label extends StatelessWidget { Label({ - Key key, this.firstLine, this.secondLine, this.color, this.fontSize, + Key key, this.firstLine, this.secondLine, this.color, this.secondLineFontSize, this.firstLineFontSize, }) : super(key: key); final String firstLine; final String secondLine; Color color; - final double fontSize; + final double secondLineFontSize; + final double firstLineFontSize; @override Widget build(BuildContext context) { @@ -25,15 +26,16 @@ class Label extends StatelessWidget { children: [ AppText( firstLine, - fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) , + fontSize: firstLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) , // fontWeight: FontWeight.bold, color: color, fontHeight: .5, + fontWeight: FontWeight.w600, ), AppText( secondLine, color: color, - fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?6:6.40), + fontSize: secondLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?4:6.40), fontWeight: FontWeight.bold, ), ], diff --git a/lib/widgets/dashboard/out_patient_stack.dart b/lib/widgets/dashboard/out_patient_stack.dart index a609986e..387c2625 100644 --- a/lib/widgets/dashboard/out_patient_stack.dart +++ b/lib/widgets/dashboard/out_patient_stack.dart @@ -13,7 +13,7 @@ class GetOutPatientStack extends StatelessWidget { @override Widget build(BuildContext context) { double barHeight = - SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 23 : 19); + SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 20 : 17); value.summaryoptions .sort((Summaryoptions a, Summaryoptions b) => b.value - a.value); @@ -32,12 +32,20 @@ class GetOutPatientStack extends StatelessWidget { firstLine: Helpers.getLabelFromKPI(value.kPIName), secondLine: Helpers.getNameFromKPI(value.kPIName), color: Color(0xFF2B353E), - fontSize: SizeConfig.getHeightMultiplier(height: barHeight) * + firstLineFontSize: + SizeConfig.getHeightMultiplier(height: barHeight) * (SizeConfig.isHeightVeryShort - ? 5 + ? 10 : SizeConfig.isHeightShort - ? 9 - : 12), + ? 10 + : 8.5), + secondLineFontSize: + SizeConfig.getHeightMultiplier(height: barHeight) * + (SizeConfig.isHeightVeryShort + ? 15 + : SizeConfig.isHeightShort + ? 15 + : 14.5), ), ), Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list) diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index baf5713a..eb87f50f 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -23,7 +23,7 @@ class BottomNavigationItem extends StatelessWidget { return Expanded( child: SizedBox( height: SizeConfig.heightMultiplier * - (SizeConfig.isHeightVeryShort ? 10 :SizeConfig.isHeightShort ? 6: 7), + (SizeConfig.isHeightVeryShort ? 10 :SizeConfig.isHeightShort ? 8: 8), child: Material( type: MaterialType.transparency, child: InkWell( @@ -35,14 +35,14 @@ class BottomNavigationItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * - (SizeConfig.isHeightVeryShort ? 12 : 9) ) * 10,), + (SizeConfig.isHeightVeryShort ? 12:SizeConfig.isHeightShort ?10 : 9) ) * 10,), Container( child: Icon(currentIndex == index ? activeIcon : icon, color: currentIndex == index ? Color(0xFF333C45) - : Theme.of(context).dividerColor, + : Color(0xFF989898), size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * - (SizeConfig.isHeightVeryShort ? 10 : 6) ) * 40,), + (SizeConfig.isHeightVeryShort ? 10:SizeConfig.isHeightShort ?8.5 : 7) ) * 40,), ), SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 10 : 6) ) * 0.5,), @@ -53,7 +53,7 @@ class BottomNavigationItem extends StatelessWidget { fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, color: currentIndex == index ? Color(0xFF333C45) - : Theme.of(context).dividerColor, + : Color(0xFF989898)//#989898, ), ), ),