add middle screen height size

middle_screen
Elham Rababah 5 years ago
parent 08e104ca56
commit cc7fedc8f5

@ -18,16 +18,18 @@ class SizeConfig {
static bool isMobilePortrait = false; static bool isMobilePortrait = false;
static bool isMobile = false; static bool isMobile = false;
static bool isHeightShort = false; static bool isHeightShort = false;
static bool isHeightVeryShort = false;
void init(BoxConstraints constraints, Orientation orientation) { void init(BoxConstraints constraints, Orientation orientation) {
realScreenHeight = constraints.maxHeight; realScreenHeight = constraints.maxHeight;
realScreenWidth = constraints.maxWidth; realScreenWidth = constraints.maxWidth;
if (constraints.maxWidth <= MAX_SMALL_SCREEN) { if (constraints.maxWidth <= MAX_SMALL_SCREEN) {
isMobile = true; isMobile = true;
} }
if (constraints.maxHeight < 800) { if (constraints.maxHeight < 600) {
isHeightVeryShort = true;
} else if (constraints.maxHeight < 800) {
isHeightShort = true; isHeightShort = true;
} }
if (orientation == Orientation.portrait) { if (orientation == Orientation.portrait) {

@ -34,7 +34,7 @@ class _LoginScreenState extends State<LoginScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
authenticationViewModel = Provider.of<AuthenticationViewModel>(context); authenticationViewModel = Provider.of<AuthenticationViewModel>(context);
double textFieldHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightShort ?10:6); double textFieldHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ?10:SizeConfig.isHeightShort?8:6);
return AppScaffold( return AppScaffold(
isShowAppBar: false, isShowAppBar: false,
backgroundColor: HexColor('#F8F8F8'), backgroundColor: HexColor('#F8F8F8'),
@ -163,7 +163,7 @@ class _LoginScreenState extends State<LoginScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 8 : 6), (SizeConfig.isHeightVeryShort ? 8 : 6),
hPadding: 1, hPadding: 1,
title: TranslationBase.of(context).login, title: TranslationBase.of(context).login,
color: Color(0xFFD02127), color: Color(0xFFD02127),
@ -175,7 +175,6 @@ class _LoginScreenState extends State<LoginScreen> {
}, },
), ),
// SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 1 : 3),)
], ],
), ),
), ),

@ -1,6 +1,5 @@
import 'dart:io' show Platform; import 'dart:io' show Platform;
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/enum/auth_method_types.dart'; import 'package:doctor_app_flutter/core/enum/auth_method_types.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
@ -13,21 +12,15 @@ import 'package:doctor_app_flutter/widgets/shared/app_loader_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/secondary_button.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import '../../landing_page.dart';
import '../../root_page.dart';
import '../../routes.dart';
import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_shared_pref.dart';
import '../../util/helpers.dart'; import '../../util/helpers.dart';
import '../../widgets/auth/verification_methods_list.dart'; import '../../widgets/auth/verification_methods_list.dart';
import 'login_screen.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = Helpers(); Helpers helpers = Helpers();
@ -72,7 +65,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?6:4), height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?6:4),
), ),
if(authenticationViewModel.isFromLogin) if(authenticationViewModel.isFromLogin)
InkWell( InkWell(
@ -86,7 +79,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
Column( Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier*(SizeConfig.isHeightShort?3:4), height: SizeConfig.heightMultiplier*(SizeConfig.isHeightVeryShort?3:4),
), ),
authenticationViewModel.user != null && isMoreOption == false authenticationViewModel.user != null && isMoreOption == false
? Column( ? Column(
@ -439,7 +432,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
color: Color(0xFFD02127), color: Color(0xFFD02127),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 8 : 6), height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 8 : 6),
hPadding: 1, hPadding: 1,
onPressed: () { onPressed: () {
@ -448,7 +441,6 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
}, },
), ),
// SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 1 : 3),)
], ],
), ),
), ),

@ -69,7 +69,7 @@ class DashboardReferralPatient extends StatelessWidget {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightShort?14: 20) height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightVeryShort?5:SizeConfig.isHeightShort?14: 20)
) )
], ],
),), ),),
@ -131,7 +131,7 @@ class DashboardReferralPatient extends StatelessWidget {
) )
], ],
), ),
top: height * .40, top: height * (SizeConfig.isHeightVeryShort?0.35:0.40),
left: 0, left: 0,
right: 0) right: 0)
]), ]),

@ -24,7 +24,7 @@ class DashboardSliderItemWidget extends StatelessWidget {
], ],
), ),
new Container( new Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?13:12), height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:12),
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: children:

@ -26,7 +26,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double height = SizeConfig.heightMultiplier * double height = SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 40 : 37); (SizeConfig.isHeightVeryShort ? 40 : 37);
return Container( return Container(
height: height, height: height,
// height: 230, // height: 230,

@ -22,7 +22,7 @@ class HomePatientCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?16:11); double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightVeryShort?14:11);
return HomePageCard( return HomePageCard(
color: backgroundColor, color: backgroundColor,
width: width, width: width,
@ -72,7 +72,7 @@ class HomePatientCard extends StatelessWidget {
text, text,
color: textColor, color: textColor,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightShort?10:12), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort?10:12),
), ),
), ),
), ),

@ -213,7 +213,7 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
isClinic: true, isClinic: true,
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8), (SizeConfig.isHeightVeryShort ? 10 : 8),
), ),
]) ])
])), ])),
@ -291,7 +291,7 @@ class _HomeScreenState extends State<HomeScreen> {
height: SizeConfig.heightMultiplier *1, height: SizeConfig.heightMultiplier *1,
), ),
Container( Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?16:11), height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:11),
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
children: [ children: [

@ -17,7 +17,7 @@ class MethodTypeCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightShort? 22 : 15); double cardHeight = SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort? 22 : 15);
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(

@ -5,11 +5,8 @@ import 'package:doctor_app_flutter/core/enum/auth_method_types.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SMSOTP { class SMSOTP {
final AuthMethodTypes type; final AuthMethodTypes type;
final mobileNo; final mobileNo;
@ -50,7 +47,7 @@ class SMSOTP {
bool isClosed = false; bool isClosed = false;
displayDialog(BuildContext context) async { displayDialog(BuildContext context) async {
double dialogWidth = MediaQuery.of(context).size.width * 0.90; double dialogWidth = MediaQuery.of(context).size.width * 0.90;
double dialogHeight = SizeConfig.isHeightShort ?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(

@ -9,7 +9,7 @@ class GetActivityCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?13:12); double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:12);
return Container( return Container(
width: width, width: width,
padding: EdgeInsets.symmetric(horizontal: SizeConfig.heightMultiplier * .4, vertical: SizeConfig.heightMultiplier * .2), padding: EdgeInsets.symmetric(horizontal: SizeConfig.heightMultiplier * .4, vertical: SizeConfig.heightMultiplier * .2),
@ -34,7 +34,7 @@ class GetActivityCard extends StatelessWidget {
AppText( AppText(
value.kPIParameter, value.kPIParameter,
textOverflow: TextOverflow.clip, textOverflow: TextOverflow.clip,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightShort?6: 8), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 8),
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,

@ -34,7 +34,7 @@ class GetOutPatientStack extends StatelessWidget {
getStack(Summaryoptions value, max,context) { getStack(Summaryoptions value, max,context) {
double barHeight = SizeConfig.heightMultiplier * double barHeight = SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 23 : 25); (SizeConfig.isHeightVeryShort ? 23 : 25);
return Expanded( return Expanded(
child: Container( child: Container(
margin: EdgeInsets.symmetric(horizontal: 2), margin: EdgeInsets.symmetric(horizontal: 2),

@ -4,7 +4,6 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart'; import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -51,10 +50,10 @@ class _AppDrawerState extends State<AppDrawer> {
child: Image.asset( child: Image.asset(
'assets/images/dr_app_logo.png', 'assets/images/dr_app_logo.png',
width: SizeConfig.getWidthMultiplier( width: SizeConfig.getWidthMultiplier(
width: drawerWidth) * (SizeConfig.isHeightShort? 30: 32), width: drawerWidth) * (SizeConfig.isHeightVeryShort? 25:SizeConfig.isHeightVeryShort?30: 32),
), ),
margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5),
), ),
Container( Container(
child: InkWell( child: InkWell(
@ -66,13 +65,13 @@ class _AppDrawerState extends State<AppDrawer> {
size: SizeConfig.heightMultiplier * 2, size: SizeConfig.heightMultiplier * 2,
), ),
), ),
margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?2:3), bottom: SizeConfig.heightMultiplier * 0.5), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?2:3), bottom: SizeConfig.heightMultiplier * 0.5),
) )
], ],
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
), ),
SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?0.5:1),), SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?0.5:1),),
if (authenticationViewModel.doctorProfile != null) if (authenticationViewModel.doctorProfile != null)
InkWell( InkWell(
onTap: () { onTap: () {
@ -116,7 +115,7 @@ class _AppDrawerState extends State<AppDrawer> {
], ],
), ),
), ),
SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?4:6),), SizedBox(height: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?4:6),),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase TranslationBase
@ -154,7 +153,7 @@ class _AppDrawerState extends State<AppDrawer> {
// height: 80, // height: 80,
child: Image.asset('assets/images/qr_code.png', child: Image.asset('assets/images/qr_code.png',
width: SizeConfig.getWidthMultiplier( width: SizeConfig.getWidthMultiplier(
width: drawerWidth) * 30, width: drawerWidth) * (SizeConfig.isHeightVeryShort?25:30),
), ),
), ),
onTap: () {}, onTap: () {},
@ -163,7 +162,7 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier *(SizeConfig.isHeightShort?10:16), height: SizeConfig.heightMultiplier *(SizeConfig.isHeightVeryShort?8:SizeConfig.isHeightShort?10:16),
), ),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 20), margin: EdgeInsets.symmetric(horizontal: 20),
@ -192,7 +191,7 @@ class _AppDrawerState extends State<AppDrawer> {
projectsProvider.changeLanguage('ar'); projectsProvider.changeLanguage('ar');
}, },
), ),
SizedBox(height: SizeConfig.heightMultiplier *(SizeConfig.isHeightShort?0.5:1) ), SizedBox(height: SizeConfig.heightMultiplier *(SizeConfig.isHeightVeryShort?0.5:1) ),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase TranslationBase

@ -23,7 +23,7 @@ class BottomNavigationItem extends StatelessWidget {
return Expanded( return Expanded(
child: SizedBox( child: SizedBox(
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 6), (SizeConfig.isHeightVeryShort ? 10 : 6),
child: Material( child: Material(
type: MaterialType.transparency, type: MaterialType.transparency,
child: InkWell( child: InkWell(
@ -35,17 +35,17 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 12 : 9) ) * 10,), (SizeConfig.isHeightVeryShort ? 12 : 9) ) * 10,),
Container( Container(
child: Icon(currentIndex == index ? activeIcon : icon, child: Icon(currentIndex == index ? activeIcon : icon,
color: currentIndex == index color: currentIndex == index
? Color(0xFF333C45) ? Color(0xFF333C45)
: Theme.of(context).dividerColor, : Theme.of(context).dividerColor,
size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 6) ) * 40,), (SizeConfig.isHeightVeryShort ? 10 : 6) ) * 40,),
), ),
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 6) ) * 0.5,), (SizeConfig.isHeightVeryShort ? 10 : 6) ) * 0.5,),
Expanded( Expanded(
child: Text( child: Text(
name, name,

@ -51,7 +51,7 @@ class _DrawerItemState extends State<DrawerItem> {
marginLeft: 5, marginLeft: 5,
marginRight: 5, marginRight: 5,
color:widget.color ??Color(0xFF2E303A), color:widget.color ??Color(0xFF2E303A),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: widget.drawerWidth ) * 6, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: widget.drawerWidth ) * (SizeConfig.isHeightVeryShort?5:6),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),

Loading…
Cancel
Save