diff --git a/lib/config/size_config.dart b/lib/config/size_config.dart index 943bce75..55cc6128 100644 --- a/lib/config/size_config.dart +++ b/lib/config/size_config.dart @@ -19,6 +19,8 @@ class SizeConfig { static bool isMobile = false; static bool isHeightShort = false; static bool isHeightVeryShort = false; + static bool isHeightMiddle = false; + static bool isHeightLarge = false; static bool isWidthLarge = false; void init(BoxConstraints constraints, Orientation orientation) { @@ -32,6 +34,10 @@ class SizeConfig { isHeightVeryShort = true; } else if (constraints.maxHeight < 800) { isHeightShort = true; + } else if (constraints.maxHeight < 1400) { + isHeightMiddle = true; + } else { + isHeightLarge = true; } if(constraints.maxWidth > 600) { diff --git a/lib/screens/home/home_patient_card.dart b/lib/screens/home/home_patient_card.dart index 16877677..df1784c1 100644 --- a/lib/screens/home/home_patient_card.dart +++ b/lib/screens/home/home_patient_card.dart @@ -38,13 +38,14 @@ class HomePatientCard extends StatelessWidget { child: Stack( children: [ Positioned( - bottom: 0.02, - right: 0.2, + top: SizeConfig.isHeightVeryShort ? 8 : 8, + left: SizeConfig.isHeightVeryShort ? 5 : 10, width: SizeConfig.getWidthMultiplier(width: width) * 10, height: SizeConfig.getWidthMultiplier(width: width) * 15, child: Icon( cardIcon, - size: SizeConfig.getWidthMultiplier(width: width) * 40, + size: SizeConfig.getWidthMultiplier(width: width) * + (SizeConfig.isHeightVeryShort ? 45 : 60), color: backgroundIconColor, ), ), @@ -55,7 +56,8 @@ class HomePatientCard extends StatelessWidget { children: [ Icon( cardIcon, - size: SizeConfig.getWidthMultiplier(width: width) * 20, + size: + SizeConfig.getWidthMultiplier(width: width) * 22, color: textColor, ), SizedBox( @@ -73,7 +75,9 @@ class HomePatientCard extends StatelessWidget { text, color: textColor, textAlign: TextAlign.start, - fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort?11:12), + fontSize: + SizeConfig.getTextMultiplierBasedOnWidth(width: width) * + (SizeConfig.isHeightVeryShort ? 11 : 10), ), ), ), diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 9b50e8c7..a33009af 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -131,7 +131,7 @@ class _HomeScreenState extends State { borderRadius: BorderRadius.only( topRight: Radius.circular(70), )), - padding: EdgeInsets.only(left: 10, top: 10, right: 10), + padding: EdgeInsets.only(left: SizeConfig.widthMultiplier * 3.1, top: 10, right: SizeConfig.widthMultiplier * 3.1), margin: EdgeInsets.only(top: 10), child: Column( mainAxisAlignment: MainAxisAlignment.start, diff --git a/lib/widgets/auth/method_type_card.dart b/lib/widgets/auth/method_type_card.dart index db3a724b..2d2f81e8 100644 --- a/lib/widgets/auth/method_type_card.dart +++ b/lib/widgets/auth/method_type_card.dart @@ -17,7 +17,7 @@ class MethodTypeCard extends StatelessWidget { @override Widget build(BuildContext context) { - double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 22 : 15); + double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 22 : 20); return InkWell( onTap: onTap, child: Container( @@ -39,7 +39,7 @@ class MethodTypeCard extends StatelessWidget { children: [ Image.asset( assetPath, - width: SizeConfig.widthMultiplier* 12, + width: SizeConfig.widthMultiplier* (12), height: cardHeight * 0.35, // height: , ), @@ -48,9 +48,9 @@ class MethodTypeCard extends StatelessWidget { ), AppText( label, - fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 3, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7), color: Color(0xFF2B353E), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w700, ) ], ), diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index 42e4d263..fbe6492b 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -51,11 +51,15 @@ class SMSOTP { double dialogHeight = SizeConfig.isHeightVeryShort ?MediaQuery.of(context).size.height * 0.50:MediaQuery.of(context).size.height * 0.40; return showDialog( context: context, + + builder: (ctx) => Center( child: Container( + color: Colors.white, height: dialogHeight, width: dialogWidth, child: Material( + color: Colors.white, child: SingleChildScrollView( child: Center( child: Container( @@ -82,12 +86,14 @@ class SMSOTP { ? DoctorApp.verify_sms_1 : DoctorApp.verify_whtsapp, size: SizeConfig.getHeightMultiplier(height:dialogHeight) * 9, + color: Color(0xFF2B353E), ), Row( mainAxisAlignment: MainAxisAlignment.end, children: [ IconButton( icon: Icon(Icons.close), + color: Color(0xFF2B353E), iconSize: SizeConfig.getHeightMultiplier(height:dialogHeight) * 15, onPressed: () { this.isClosed = true; @@ -108,7 +114,9 @@ class SMSOTP { .toString() .substring(mobileNo.toString().length - 3), textAlign: TextAlign.start, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + color: Color(0xFF2B353E), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, //14, maxLines: 2, )), @@ -255,7 +263,11 @@ class SMSOTP { AppText( TranslationBase.of(context).validationMessage + ' ', - fontWeight: FontWeight.w600, + + textAlign: TextAlign.start, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + color: Color(0xFF2B353E), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, ), AppText( diff --git a/lib/widgets/dashboard/out_patient_stack.dart b/lib/widgets/dashboard/out_patient_stack.dart index 0405b5b7..d83e4cd6 100644 --- a/lib/widgets/dashboard/out_patient_stack.dart +++ b/lib/widgets/dashboard/out_patient_stack.dart @@ -99,7 +99,7 @@ class GetOutPatientStack extends StatelessWidget { fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5, textAlign: TextAlign.center, color: Color(0xFF2B353E), - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, letterSpacing: -0.3, ), AppText(