fix issue on design

middle_screen
Elham Rababah 5 years ago
parent 1f8a90e47b
commit 39887f3ead

@ -19,6 +19,8 @@ class SizeConfig {
static bool isMobile = false; static bool isMobile = false;
static bool isHeightShort = false; static bool isHeightShort = false;
static bool isHeightVeryShort = false; static bool isHeightVeryShort = false;
static bool isHeightMiddle = false;
static bool isHeightLarge = false;
static bool isWidthLarge = false; static bool isWidthLarge = false;
void init(BoxConstraints constraints, Orientation orientation) { void init(BoxConstraints constraints, Orientation orientation) {
@ -32,6 +34,10 @@ class SizeConfig {
isHeightVeryShort = true; isHeightVeryShort = true;
} else if (constraints.maxHeight < 800) { } else if (constraints.maxHeight < 800) {
isHeightShort = true; isHeightShort = true;
} else if (constraints.maxHeight < 1400) {
isHeightMiddle = true;
} else {
isHeightLarge = true;
} }
if(constraints.maxWidth > 600) { if(constraints.maxWidth > 600) {

@ -38,13 +38,14 @@ class HomePatientCard extends StatelessWidget {
child: Stack( child: Stack(
children: [ children: [
Positioned( Positioned(
bottom: 0.02, top: SizeConfig.isHeightVeryShort ? 8 : 8,
right: 0.2, left: SizeConfig.isHeightVeryShort ? 5 : 10,
width: SizeConfig.getWidthMultiplier(width: width) * 10, width: SizeConfig.getWidthMultiplier(width: width) * 10,
height: SizeConfig.getWidthMultiplier(width: width) * 15, height: SizeConfig.getWidthMultiplier(width: width) * 15,
child: Icon( child: Icon(
cardIcon, cardIcon,
size: SizeConfig.getWidthMultiplier(width: width) * 40, size: SizeConfig.getWidthMultiplier(width: width) *
(SizeConfig.isHeightVeryShort ? 45 : 60),
color: backgroundIconColor, color: backgroundIconColor,
), ),
), ),
@ -55,7 +56,8 @@ class HomePatientCard extends StatelessWidget {
children: [ children: [
Icon( Icon(
cardIcon, cardIcon,
size: SizeConfig.getWidthMultiplier(width: width) * 20, size:
SizeConfig.getWidthMultiplier(width: width) * 22,
color: textColor, color: textColor,
), ),
SizedBox( SizedBox(
@ -73,7 +75,9 @@ class HomePatientCard extends StatelessWidget {
text, text,
color: textColor, color: textColor,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort?11:12), fontSize:
SizeConfig.getTextMultiplierBasedOnWidth(width: width) *
(SizeConfig.isHeightVeryShort ? 11 : 10),
), ),
), ),
), ),

@ -131,7 +131,7 @@ class _HomeScreenState extends State<HomeScreen> {
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topRight: Radius.circular(70), 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), margin: EdgeInsets.only(top: 10),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,

@ -17,7 +17,7 @@ class MethodTypeCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 22 : 15); double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 22 : 20);
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
@ -39,7 +39,7 @@ class MethodTypeCard extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
assetPath, assetPath,
width: SizeConfig.widthMultiplier* 12, width: SizeConfig.widthMultiplier* (12),
height: cardHeight * 0.35, height: cardHeight * 0.35,
// height: , // height: ,
), ),
@ -48,9 +48,9 @@ class MethodTypeCard extends StatelessWidget {
), ),
AppText( AppText(
label, label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* 3, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7),
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700,
) )
], ],
), ),

@ -51,11 +51,15 @@ class SMSOTP {
double dialogHeight = SizeConfig.isHeightVeryShort ?MediaQuery.of(context).size.height * 0.50:MediaQuery.of(context).size.height * 0.40; double dialogHeight = SizeConfig.isHeightVeryShort ?MediaQuery.of(context).size.height * 0.50:MediaQuery.of(context).size.height * 0.40;
return showDialog( return showDialog(
context: context, context: context,
builder: (ctx) => Center( builder: (ctx) => Center(
child: Container( child: Container(
color: Colors.white,
height: dialogHeight, height: dialogHeight,
width: dialogWidth, width: dialogWidth,
child: Material( child: Material(
color: Colors.white,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Center( child: Center(
child: Container( child: Container(
@ -82,12 +86,14 @@ class SMSOTP {
? DoctorApp.verify_sms_1 ? DoctorApp.verify_sms_1
: DoctorApp.verify_whtsapp, : DoctorApp.verify_whtsapp,
size: SizeConfig.getHeightMultiplier(height:dialogHeight) * 9, size: SizeConfig.getHeightMultiplier(height:dialogHeight) * 9,
color: Color(0xFF2B353E),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
IconButton( IconButton(
icon: Icon(Icons.close), icon: Icon(Icons.close),
color: Color(0xFF2B353E),
iconSize: SizeConfig.getHeightMultiplier(height:dialogHeight) * 15, iconSize: SizeConfig.getHeightMultiplier(height:dialogHeight) * 15,
onPressed: () { onPressed: () {
this.isClosed = true; this.isClosed = true;
@ -108,7 +114,9 @@ class SMSOTP {
.toString() .toString()
.substring(mobileNo.toString().length - 3), .substring(mobileNo.toString().length - 3),
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w700,
letterSpacing: -0.48,
color: Color(0xFF2B353E),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, //14, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, //14,
maxLines: 2, maxLines: 2,
)), )),
@ -255,7 +263,11 @@ class SMSOTP {
AppText( AppText(
TranslationBase.of(context).validationMessage + 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, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5,
), ),
AppText( AppText(

@ -99,7 +99,7 @@ class GetOutPatientStack extends StatelessWidget {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
letterSpacing: -0.3, letterSpacing: -0.3,
), ),
AppText( AppText(

Loading…
Cancel
Save