home design fixes

middle_screen
Elham Rababah 5 years ago
parent 259ea53319
commit d0173bd061

@ -73,7 +73,7 @@ class DashboardReferralPatient extends StatelessWidget {
.of(context) .of(context)
.referral, .referral,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontSize: SizeConfig secondLineFontSize: SizeConfig
.getHeightMultiplier( .getHeightMultiplier(
height: height) * height: height) *
(SizeConfig.isHeightVeryShort (SizeConfig.isHeightVeryShort
@ -90,7 +90,7 @@ class DashboardReferralPatient extends StatelessWidget {
? 5 ? 5
: SizeConfig.isHeightShort : SizeConfig.isHeightShort
? 10 ? 10
: 12) : 5)
) )
], ],
),), ),),

@ -71,7 +71,7 @@ class _HomeScreenState extends State<HomeScreen> {
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,
appBar: HomeScreenHeader( appBar: HomeScreenHeader(
model: model, model: model,
onOpenDrawer: (){ onOpenDrawer: (){
Scaffold.of(context).openDrawer(); Scaffold.of(context).openDrawer();
@ -98,7 +98,7 @@ class _HomeScreenState extends State<HomeScreen> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier * 5, height: SizeConfig.heightMultiplier * 3,
), ),
sliderActiveIndex == 1 sliderActiveIndex == 1
? DashboardSliderItemWidget( ? DashboardSliderItemWidget(
@ -128,7 +128,7 @@ class _HomeScreenState extends State<HomeScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier * 2, height: SizeConfig.heightMultiplier * 1,
), ),
Container( Container(
child: Label( child: Label(
@ -136,7 +136,7 @@ class _HomeScreenState extends State<HomeScreen> {
secondLine: TranslationBase.of(context).services, secondLine: TranslationBase.of(context).services,
)), )),
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier * 1, height: SizeConfig.heightMultiplier * .6,
), ),
Container( Container(
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
@ -152,7 +152,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
), ),
SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:3)) SizedBox(height: SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?6:SizeConfig.isHeightShort?4:2))
], ],
), ),

@ -45,18 +45,20 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context); ProjectViewModel projectsProvider = Provider.of<ProjectViewModel>(context);
authenticationViewModel = Provider.of<AuthenticationViewModel>(context); authenticationViewModel = Provider.of<AuthenticationViewModel>(context);
return Container( return widget.model.state == ViewState.Busy
color: Colors.grey[100], ? Container(color: Colors.grey.withOpacity(0.6))
child: Stack(children: [ : Container(
IconButton( color: Colors.grey[100],
icon: Image.asset( child: Stack(children: [
'assets/images/menu.png', IconButton(
width: SizeConfig.widthMultiplier * 7, icon: Image.asset(
), 'assets/images/menu.png',
iconSize: SizeConfig.heightMultiplier * 2, width: SizeConfig.widthMultiplier * 7,
color: Colors.black, ),
onPressed: (){ iconSize: SizeConfig.heightMultiplier * 2,
widget.onOpenDrawer(); color: Colors.black,
onPressed: () {
widget.onOpenDrawer();
}, },
), ),
Column( Column(
@ -117,9 +119,13 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
constraints: constraints:
BoxConstraints( BoxConstraints(
minWidth: SizeConfig minWidth: SizeConfig
.getHeightMultiplier(height: widget.height) * 50, .getHeightMultiplier(
height: widget.height) *
35,
minHeight: SizeConfig minHeight: SizeConfig
.getHeightMultiplier(height: widget.height) * 50, .getHeightMultiplier(
height: widget.height) *
30,
), ),
child: Center( child: Center(
child: AppText( child: AppText(
@ -133,9 +139,12 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
projectsProvider projectsProvider
.isArabic .isArabic
? SizeConfig ? SizeConfig
.getHeightMultiplier(height: widget.height) .getHeightMultiplier(
height: widget.height)
: SizeConfig : SizeConfig
.getHeightMultiplier(height: widget.height) * 30, .getHeightMultiplier(
height: widget
.height) * 20,
textAlign: textAlign:
TextAlign TextAlign
.center, .center,
@ -150,7 +159,7 @@ class _HomeScreenHeaderState extends State<HomeScreenHeader> {
.of(context) .of(context)
.size .size
.width * .6) * 5, .width * .6) * 5,
color: Colors.black, color: Color(0xFF2B353E),
textOverflow: TextOverflow textOverflow: TextOverflow
.ellipsis, .ellipsis,
fontWeight: fontWeight:

@ -7,12 +7,13 @@ import 'package:flutter/material.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class Label extends StatelessWidget { class Label extends StatelessWidget {
Label({ Label({
Key key, this.firstLine, this.secondLine, this.color, this.fontSize, Key key, this.firstLine, this.secondLine, this.color, this.secondLineFontSize, this.firstLineFontSize,
}) : super(key: key); }) : super(key: key);
final String firstLine; final String firstLine;
final String secondLine; final String secondLine;
Color color; Color color;
final double fontSize; final double secondLineFontSize;
final double firstLineFontSize;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -25,15 +26,16 @@ class Label extends StatelessWidget {
children: [ children: [
AppText( AppText(
firstLine, firstLine,
fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) , fontSize: firstLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) ,
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
color: color, color: color,
fontHeight: .5, fontHeight: .5,
fontWeight: FontWeight.w600,
), ),
AppText( AppText(
secondLine, secondLine,
color: color, color: color,
fontSize: fontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?6:6.40), fontSize: secondLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?4:6.40),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],

@ -13,7 +13,7 @@ class GetOutPatientStack extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
double barHeight = double barHeight =
SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 23 : 19); SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ? 20 : 17);
value.summaryoptions value.summaryoptions
.sort((Summaryoptions a, Summaryoptions b) => b.value - a.value); .sort((Summaryoptions a, Summaryoptions b) => b.value - a.value);
@ -32,12 +32,20 @@ class GetOutPatientStack extends StatelessWidget {
firstLine: Helpers.getLabelFromKPI(value.kPIName), firstLine: Helpers.getLabelFromKPI(value.kPIName),
secondLine: Helpers.getNameFromKPI(value.kPIName), secondLine: Helpers.getNameFromKPI(value.kPIName),
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontSize: SizeConfig.getHeightMultiplier(height: barHeight) * firstLineFontSize:
SizeConfig.getHeightMultiplier(height: barHeight) *
(SizeConfig.isHeightVeryShort (SizeConfig.isHeightVeryShort
? 5 ? 10
: SizeConfig.isHeightShort : SizeConfig.isHeightShort
? 9 ? 10
: 12), : 8.5),
secondLineFontSize:
SizeConfig.getHeightMultiplier(height: barHeight) *
(SizeConfig.isHeightVeryShort
? 15
: SizeConfig.isHeightShort
? 15
: 14.5),
), ),
), ),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list) Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list)

@ -23,7 +23,7 @@ class BottomNavigationItem extends StatelessWidget {
return Expanded( return Expanded(
child: SizedBox( child: SizedBox(
height: SizeConfig.heightMultiplier * height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 :SizeConfig.isHeightShort ? 6: 7), (SizeConfig.isHeightVeryShort ? 10 :SizeConfig.isHeightShort ? 8: 8),
child: Material( child: Material(
type: MaterialType.transparency, type: MaterialType.transparency,
child: InkWell( child: InkWell(
@ -35,14 +35,14 @@ 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.isHeightVeryShort ? 12 : 9) ) * 10,), (SizeConfig.isHeightVeryShort ? 12:SizeConfig.isHeightShort ?10 : 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, : Color(0xFF989898),
size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 6) ) * 40,), (SizeConfig.isHeightVeryShort ? 10:SizeConfig.isHeightShort ?8.5 : 7) ) * 40,),
), ),
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort ? 10 : 6) ) * 0.5,), (SizeConfig.isHeightVeryShort ? 10 : 6) ) * 0.5,),
@ -53,7 +53,7 @@ class BottomNavigationItem extends StatelessWidget {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
color: currentIndex == index color: currentIndex == index
? Color(0xFF333C45) ? Color(0xFF333C45)
: Theme.of(context).dividerColor, : Color(0xFF989898)//#989898,
), ),
), ),
), ),

Loading…
Cancel
Save