home design fixes for small and large screen

middle_screen
Elham Rababah 5 years ago
parent c671b60097
commit 60b5d474c1

@ -22,7 +22,7 @@ class DashboardReferralPatient extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
showBorder: true, showBorder: false,
borderColor: Colors.white, borderColor: Colors.white,
shadowWidth: 0.2, shadowWidth: 0.2,
shadowSpreadRadius: 3, shadowSpreadRadius: 3,

@ -86,7 +86,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
if (index == 1) if (index == 1)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
showBorder: true, showBorder: false,
borderColor: Colors.white, borderColor: Colors.white,
shadowWidth: 0.2, shadowWidth: 0.2,
shadowSpreadRadius: 3, shadowSpreadRadius: 3,
@ -102,7 +102,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
if (index == 0) if (index == 0)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
showBorder: true, showBorder: false,
borderColor: Colors.white, borderColor: Colors.white,
shadowWidth: 0.2, shadowWidth: 0.2,
shadowSpreadRadius: 3, shadowSpreadRadius: 3,

@ -22,11 +22,12 @@ class HomePatientCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightVeryShort?14:13); double width = SizeConfig.heightMultiplier*
(SizeConfig.isHeightVeryShort ? 16 : 13);
return HomePageCard( return HomePageCard(
color: backgroundColor, color: backgroundColor,
width: width, width: width,
margin: EdgeInsets.all(4), margin: EdgeInsets.all(SizeConfig.widthMultiplier *1.6),
child: Container( child: Container(
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: Column( child: Column(
@ -72,7 +73,7 @@ class HomePatientCard extends StatelessWidget {
text, text,
color: textColor, color: textColor,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort?10:12), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort?11:12),
), ),
), ),
), ),

@ -79,6 +79,9 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
body: ListView(children: [ body: ListView(children: [
Column(children: <Widget>[ Column(children: <Widget>[
// SizedBox(
// height: SizeConfig.heightMultiplier * 1.4,
// ),
model.dashboardItemsList.length > 0 model.dashboardItemsList.length > 0
? DashboardSwipeWidget( ? DashboardSwipeWidget(
model.dashboardItemsList, model.dashboardItemsList,
@ -90,6 +93,10 @@ class _HomeScreenState extends State<HomeScreen> {
}, },
) )
: SizedBox(), : SizedBox(),
// SizedBox(
// height: SizeConfig.heightMultiplier * 1.4,
// ),
model.dashboardItemsList.length > 0 model.dashboardItemsList.length > 0
? FractionallySizedBox( ? FractionallySizedBox(
widthFactor: 0.90, widthFactor: 0.90,
@ -113,14 +120,16 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
) )
: SizedBox(), : SizedBox(),
SizedBox(
height: SizeConfig.heightMultiplier * 1.4,
),
FractionallySizedBox( FractionallySizedBox(
// widthFactor: 0.90, // widthFactor: 0.90,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topRight: Radius.circular(50), topRight: Radius.circular(70),
)), )),
padding: EdgeInsets.only(left: 20, top: 10, right: 20), padding: EdgeInsets.only(left: 20, top: 10, right: 20),
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
@ -153,7 +162,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
), ),
SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:2)) SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?3:SizeConfig.isHeightShort?4:2))
], ],
), ),

@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
@ -28,7 +29,6 @@ class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget {
_HomeScreenHeaderState createState() => _HomeScreenHeaderState(); _HomeScreenHeaderState createState() => _HomeScreenHeaderState();
@override @override
// TODO: implement preferredSize
Size get preferredSize => Size(double.maxFinite,height); Size get preferredSize => Size(double.maxFinite,height);
} }
@ -51,11 +51,8 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
color: Colors.grey[100], color: Colors.grey[100],
child: Stack(children: [ child: Stack(children: [
IconButton( IconButton(
icon: Image.asset( icon: Icon(FontAwesomeIcons.ellipsisH),
'assets/images/menu.png', iconSize: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?4: 3),
width: SizeConfig.widthMultiplier * 7,
),
iconSize: SizeConfig.heightMultiplier * 2,
color: Colors.black, color: Colors.black,
onPressed: () { onPressed: () {
widget.onOpenDrawer(); widget.onOpenDrawer();
@ -65,7 +62,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
children: <Widget>[ children: <Widget>[
ProfileWelcomeWidget( ProfileWelcomeWidget(
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Container( Container(
width: MediaQuery width: MediaQuery
@ -101,6 +98,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.center, .center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
padding: padding:
@ -158,7 +156,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
width: MediaQuery width: MediaQuery
.of(context) .of(context)
.size .size
.width * .6) * 5, .width * .6) * (SizeConfig.isWidthLarge?4:5),
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
textOverflow: TextOverflow textOverflow: TextOverflow
.ellipsis, .ellipsis,

@ -13,7 +13,7 @@ class GetActivityCard extends StatelessWidget {
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),
margin: EdgeInsets.all(SizeConfig.heightMultiplier * .5), margin: EdgeInsets.all(SizeConfig.widthMultiplier *1),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class SwiperRoundedPagination extends StatelessWidget { class SwiperRoundedPagination extends StatelessWidget {
@ -7,15 +8,14 @@ class SwiperRoundedPagination extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return active == true return active == true
? Container( ? Container(
height: 5, height: SizeConfig.heightMultiplier * .6,
width: 30, width: SizeConfig.widthMultiplier * 6,
// margin: EdgeInsets.only(10),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5), color: Colors.black), borderRadius: BorderRadius.circular(5), color: Colors.black),
) )
: Container( : Container(
height: 5, height: SizeConfig.heightMultiplier * .6,
width: 8, width: SizeConfig.widthMultiplier * 2,
margin: EdgeInsets.all(2), margin: EdgeInsets.all(2),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), color: Colors.grey)); borderRadius: BorderRadius.circular(10), color: Colors.grey));

@ -22,7 +22,7 @@ class ProfileWelcomeWidget extends StatelessWidget {
widthFactor: 0.9, widthFactor: 0.9,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
this.isClinic == true ? clinicWidget : SizedBox(), this.isClinic == true ? clinicWidget : SizedBox(),
SizedBox( SizedBox(

@ -50,7 +50,7 @@ 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.isHeightVeryShort? 25:SizeConfig.isHeightVeryShort?30: 32), width: drawerWidth) * (SizeConfig.isHeightVeryShort? 25:SizeConfig.isHeightShort?32: 32),
), ),
margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5),
@ -97,7 +97,7 @@ class _AppDrawerState extends State<AppDrawer> {
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth( .getTextMultiplierBasedOnWidth(
width: drawerWidth) * 8, width: drawerWidth) * (SizeConfig.isWidthLarge?5: 8),
), ),
), ),
Padding( Padding(
@ -109,7 +109,7 @@ class _AppDrawerState extends State<AppDrawer> {
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth( .getTextMultiplierBasedOnWidth(
width: drawerWidth) * 6, width: drawerWidth) * (SizeConfig.isWidthLarge?3: 6),
fontFamily: 'Poppins', fontFamily: 'Poppins',
)) ))
], ],
@ -232,7 +232,7 @@ class _AppDrawerState extends State<AppDrawer> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth( .getTextMultiplierBasedOnWidth(
width: drawerWidth) * 6, width: drawerWidth) * (SizeConfig.isWidthLarge?4: 6),
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
children: <TextSpan>[ children: <TextSpan>[
@ -242,7 +242,7 @@ class _AppDrawerState extends State<AppDrawer> {
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontSize: SizeConfig fontSize: SizeConfig
.getTextMultiplierBasedOnWidth( .getTextMultiplierBasedOnWidth(
width: drawerWidth) * 7, width: drawerWidth) * (SizeConfig.isWidthLarge?5: 7),
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
) )

@ -21,7 +21,6 @@ class AppScaffold extends StatelessWidget {
final Widget appBar; final Widget appBar;
final String subtitle; final String subtitle;
final bool isHomeIcon; final bool isHomeIcon;
final Key key;
AppScaffold( AppScaffold(
{this.appBarTitle = '', {this.appBarTitle = '',
this.body, this.body,
@ -31,7 +30,7 @@ class AppScaffold extends StatelessWidget {
this.bottomSheet, this.bottomSheet,
this.backgroundColor, this.backgroundColor,
this.isHomeIcon = true, this.isHomeIcon = true,
this.appBar, this.subtitle, this.key}); this.appBar, this.subtitle});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -43,7 +42,6 @@ class AppScaffold extends StatelessWidget {
}, },
child: Scaffold( child: Scaffold(
backgroundColor: backgroundColor ?? Colors.white, backgroundColor: backgroundColor ?? Colors.white,
key: key,
appBar: isShowAppBar appBar: isShowAppBar
? appBar ?? ? appBar ??
AppBar( AppBar(

@ -29,15 +29,15 @@ class _DrawerItemState extends State<DrawerItem> {
children: <Widget>[ children: <Widget>[
if(widget.assetLink!=null) if(widget.assetLink!=null)
Container( Container(
height: 20, height: SizeConfig.imageSizeMultiplier * (SizeConfig.isWidthLarge?3: 5),
width: 20, width: SizeConfig.imageSizeMultiplier * (SizeConfig.isWidthLarge?3: 5),
child: Image.asset(widget.assetLink), child: Image.asset(widget.assetLink),
), ),
if(widget.assetLink==null) if(widget.assetLink==null)
Icon( Icon(
widget.icon, widget.icon,
color: widget.color ?? Colors.black87, color: widget.color ?? Colors.black87,
size: SizeConfig.imageSizeMultiplier * 5, size: SizeConfig.imageSizeMultiplier * (SizeConfig.isWidthLarge?3: 5),
), ),
Expanded( Expanded(
child: Column( child: Column(
@ -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 ) * (SizeConfig.isHeightVeryShort?5:6), fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: widget.drawerWidth ) * (SizeConfig.isHeightVeryShort?5:(SizeConfig.isWidthLarge?4: 6)),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),

Loading…
Cancel
Save