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) {
return RoundedContainer(
raduis: 16,
showBorder: true,
showBorder: false,
borderColor: Colors.white,
shadowWidth: 0.2,
shadowSpreadRadius: 3,

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

@ -22,11 +22,12 @@ class HomePatientCard extends StatelessWidget {
@override
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(
color: backgroundColor,
width: width,
margin: EdgeInsets.all(4),
margin: EdgeInsets.all(SizeConfig.widthMultiplier *1.6),
child: Container(
padding: EdgeInsets.all(8),
child: Column(
@ -72,7 +73,7 @@ class HomePatientCard extends StatelessWidget {
text,
color: textColor,
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: [
Column(children: <Widget>[
// SizedBox(
// height: SizeConfig.heightMultiplier * 1.4,
// ),
model.dashboardItemsList.length > 0
? DashboardSwipeWidget(
model.dashboardItemsList,
@ -90,6 +93,10 @@ class _HomeScreenState extends State<HomeScreen> {
},
)
: SizedBox(),
// SizedBox(
// height: SizeConfig.heightMultiplier * 1.4,
// ),
model.dashboardItemsList.length > 0
? FractionallySizedBox(
widthFactor: 0.90,
@ -113,14 +120,16 @@ class _HomeScreenState extends State<HomeScreen> {
),
)
: SizedBox(),
SizedBox(
height: SizeConfig.heightMultiplier * 1.4,
),
FractionallySizedBox(
// widthFactor: 0.90,
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topRight: Radius.circular(50),
topRight: Radius.circular(70),
)),
padding: EdgeInsets.only(left: 20, top: 10, right: 20),
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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
// ignore: must_be_immutable
@ -28,7 +29,6 @@ class HomeScreenHeader extends StatefulWidget with PreferredSizeWidget {
_HomeScreenHeaderState createState() => _HomeScreenHeaderState();
@override
// TODO: implement preferredSize
Size get preferredSize => Size(double.maxFinite,height);
}
@ -51,11 +51,8 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
color: Colors.grey[100],
child: Stack(children: [
IconButton(
icon: Image.asset(
'assets/images/menu.png',
width: SizeConfig.widthMultiplier * 7,
),
iconSize: SizeConfig.heightMultiplier * 2,
icon: Icon(FontAwesomeIcons.ellipsisH),
iconSize: SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort?4: 3),
color: Colors.black,
onPressed: () {
widget.onOpenDrawer();
@ -65,7 +62,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
children: <Widget>[
ProfileWelcomeWidget(
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
width: MediaQuery
@ -101,6 +98,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
mainAxisAlignment:
MainAxisAlignment
.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
padding:
@ -158,7 +156,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
width: MediaQuery
.of(context)
.size
.width * .6) * 5,
.width * .6) * (SizeConfig.isWidthLarge?4:5),
color: Color(0xFF2B353E),
textOverflow: TextOverflow
.ellipsis,

@ -13,7 +13,7 @@ class GetActivityCard extends StatelessWidget {
return Container(
width: width,
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(
color: Colors.white,
borderRadius: BorderRadius.circular(15),

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

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

@ -50,7 +50,7 @@ class _AppDrawerState extends State<AppDrawer> {
child: Image.asset(
'assets/images/dr_app_logo.png',
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),
@ -97,7 +97,7 @@ class _AppDrawerState extends State<AppDrawer> {
fontFamily: 'Poppins',
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth(
width: drawerWidth) * 8,
width: drawerWidth) * (SizeConfig.isWidthLarge?5: 8),
),
),
Padding(
@ -109,7 +109,7 @@ class _AppDrawerState extends State<AppDrawer> {
color: Color(0xFF2E303A),
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth(
width: drawerWidth) * 6,
width: drawerWidth) * (SizeConfig.isWidthLarge?3: 6),
fontFamily: 'Poppins',
))
],
@ -232,7 +232,7 @@ class _AppDrawerState extends State<AppDrawer> {
fontWeight: FontWeight.bold,
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth(
width: drawerWidth) * 6,
width: drawerWidth) * (SizeConfig.isWidthLarge?4: 6),
fontFamily: 'Poppins',
),
children: <TextSpan>[
@ -242,7 +242,7 @@ class _AppDrawerState extends State<AppDrawer> {
color: Color(0xFF2E303A),
fontSize: SizeConfig
.getTextMultiplierBasedOnWidth(
width: drawerWidth) * 7,
width: drawerWidth) * (SizeConfig.isWidthLarge?5: 7),
fontFamily: 'Poppins',
),
)

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

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

Loading…
Cancel
Save