diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index a0ef6310..2bc42f5e 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -113,6 +113,7 @@ class _HomeScreenState extends State { ), ) : SizedBox(), + FractionallySizedBox( // widthFactor: 0.90, child: Container( @@ -177,7 +178,7 @@ class _HomeScreenState extends State { backgroundIconColors[2] = Colors.white10; List textColors = List(3); textColors[0] = Colors.white; - textColors[1] = Colors.black; + textColors[1] = Color(0xFF353E47); textColors[2] = Colors.white; List patientCards = List(); diff --git a/lib/screens/home/home_screen_header.dart b/lib/screens/home/home_screen_header.dart index 1e0536e1..8e30504c 100644 --- a/lib/screens/home/home_screen_header.dart +++ b/lib/screens/home/home_screen_header.dart @@ -46,7 +46,7 @@ class _HomeScreenHeaderState extends State { authenticationViewModel = Provider.of(context); return widget.model.state == ViewState.Busy - ? Container(color: Colors.grey.withOpacity(0.6)) + ? Container(color: Colors.grey.withOpacity(0.65)) : Container( color: Colors.grey[100], child: Stack(children: [ diff --git a/lib/screens/home/label.dart b/lib/screens/home/label.dart index d732d1c9..221215c0 100644 --- a/lib/screens/home/label.dart +++ b/lib/screens/home/label.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; // ignore: must_be_immutable class Label extends StatelessWidget { Label({ - Key key, this.firstLine, this.secondLine, this.color, this.secondLineFontSize, this.firstLineFontSize, + Key key, this.firstLine, this.secondLine, this.color= const Color(0xFF2E303A), this.secondLineFontSize, this.firstLineFontSize, }) : super(key: key); final String firstLine; final String secondLine; @@ -17,9 +17,7 @@ class Label extends StatelessWidget { @override Widget build(BuildContext context) { - if(color == null) { - color = Color(0xFF2E303A); - } + return Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/widgets/dashboard/activity_card.dart b/lib/widgets/dashboard/activity_card.dart index c1729b82..44f0c50c 100644 --- a/lib/widgets/dashboard/activity_card.dart +++ b/lib/widgets/dashboard/activity_card.dart @@ -34,7 +34,7 @@ class GetActivityCard extends StatelessWidget { AppText( value.kPIParameter, textOverflow: TextOverflow.clip, - fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 8), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9), color: Color(0xFF2B353E), textAlign: TextAlign.start, fontWeight: FontWeight.w700, diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index eb87f50f..aa986a39 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -37,6 +37,7 @@ class BottomNavigationItem extends StatelessWidget { SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 12:SizeConfig.isHeightShort ?10 : 9) ) * 10,), Container( + margin: EdgeInsets.only(bottom: 3), child: Icon(currentIndex == index ? activeIcon : icon, color: currentIndex == index ? Color(0xFF333C45) @@ -49,8 +50,9 @@ class BottomNavigationItem extends StatelessWidget { Expanded( child: Text( name, + textAlign: TextAlign.center, style: TextStyle( - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2, color: currentIndex == index ? Color(0xFF333C45) : Color(0xFF989898)//#989898,