Merge branch 'order_list' into 'development'

design updates

See merge request Cloud_Solution/driver-app!53
logut
Elham 6 years ago
commit e032c87b5f

@ -125,10 +125,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
Text( Text(
TranslationBase.of(context).youHave, TranslationBase.of(context).youHave,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * .orientation ==
2.2), Orientation.landscape
? SizeConfig.textMultiplier *
2.2
: SizeConfig.textMultiplier *
1.3,
),
), ),
Text( Text(
'5', '5',
@ -136,16 +141,21 @@ class _DashboardScreenState extends State<DashboardScreen> {
color: Colors.white, color: Colors.white,
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier *
4.0), 3.0),
), ),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context)
.undeliveredPackages, .undeliveredPackages,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * .orientation ==
2.2), Orientation.landscape
? SizeConfig.textMultiplier *
2.2
: SizeConfig.textMultiplier *
1.3,
),
) )
], ],
), ),
@ -154,8 +164,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.only(right: 9.5), padding: EdgeInsets.only(right: 9.5),
child: Container( child: Container(
width: 110, width: 100,
height: 110, height: 100,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white10, color: Colors.white10,
shape: BoxShape.circle), shape: BoxShape.circle),
@ -171,7 +181,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
? MediaQuery.of(context) ? MediaQuery.of(context)
.size .size
.height * .height *
0.10 0.09
: MediaQuery.of(context) : MediaQuery.of(context)
.size .size
.height * .height *
@ -225,27 +235,37 @@ class _DashboardScreenState extends State<DashboardScreen> {
Text( Text(
TranslationBase.of(context).youHave, TranslationBase.of(context).youHave,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * .orientation ==
2.2), Orientation.landscape
? SizeConfig.textMultiplier *
2.2
: SizeConfig.textMultiplier *
1.3,
),
), ),
Text( Text(
'25', '5',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier *
4.0), 3.0),
), ),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context)
.deliveredPackages, .undeliveredPackages,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * .orientation ==
2.2), Orientation.landscape
? SizeConfig.textMultiplier *
2.2
: SizeConfig.textMultiplier *
1.3,
),
) )
], ],
), ),
@ -254,8 +274,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.only(right: 9.5), padding: EdgeInsets.only(right: 9.5),
child: Container( child: Container(
width: 110, width: 100,
height: 110, height: 100,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white10, color: Colors.white10,
shape: BoxShape.circle), shape: BoxShape.circle),
@ -271,7 +291,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
? MediaQuery.of(context) ? MediaQuery.of(context)
.size .size
.height * .height *
0.10 0.09
: MediaQuery.of(context) : MediaQuery.of(context)
.size .size
.height * .height *
@ -352,8 +372,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Text( child: Text(
TranslationBase.of(context).scan, TranslationBase.of(context).scan,
style: TextStyle( style: TextStyle(
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * 6.0, .orientation ==
Orientation.landscape
? SizeConfig.textMultiplier * 6.0
: SizeConfig.textMultiplier * 4.0,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
@ -366,8 +389,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
TranslationBase.of(context) TranslationBase.of(context)
.toAddPackageToQue, .toAddPackageToQue,
style: TextStyle( style: TextStyle(
fontSize: fontSize: MediaQuery.of(context)
SizeConfig.textMultiplier * 3.0, .orientation ==
Orientation.landscape
? SizeConfig.textMultiplier * 3.0
: SizeConfig.textMultiplier * 2.0,
color: Colors.white, color: Colors.white,
letterSpacing: 0.2, letterSpacing: 0.2,
wordSpacing: 0.5, wordSpacing: 0.5,

Loading…
Cancel
Save