Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/driver-app!51
logout_function
Mohammad Aljammal 5 years ago
commit 2aab227e0c

@ -14,7 +14,7 @@ import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:driverapp/config/size_config.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
class DashboardScreen extends StatefulWidget { class DashboardScreen extends StatefulWidget {
@ -100,7 +100,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0), padding: EdgeInsets.symmetric(horizontal: 10.0),
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.16, height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.16
: MediaQuery.of(context).size.height * 0.30,
width: MediaQuery.of(context).size.width * 0.44, width: MediaQuery.of(context).size.width * 0.44,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
@ -123,20 +126,26 @@ class _DashboardScreenState extends State<DashboardScreen> {
TranslationBase.of(context).youHave, TranslationBase.of(context).youHave,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 10.0), fontSize:
SizeConfig.textMultiplier *
2.2),
), ),
Text( Text(
'5', '5',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 25.0), fontSize:
SizeConfig.textMultiplier *
4.0),
), ),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context)
.undeliveredPackages, .undeliveredPackages,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 9.5), fontSize:
SizeConfig.textMultiplier *
2.2),
) )
], ],
), ),
@ -157,9 +166,16 @@ class _DashboardScreenState extends State<DashboardScreen> {
Image.asset( Image.asset(
'assets/images/closed_box.png', 'assets/images/closed_box.png',
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .orientation ==
.height * Orientation.portrait
0.10, ? MediaQuery.of(context)
.size
.height *
0.10
: MediaQuery.of(context)
.size
.height *
0.20,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
@ -184,7 +200,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0), padding: EdgeInsets.symmetric(horizontal: 10.0),
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.16, height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.16
: MediaQuery.of(context).size.height * 0.30,
width: MediaQuery.of(context).size.width * 0.45, width: MediaQuery.of(context).size.width * 0.45,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
@ -207,20 +226,26 @@ class _DashboardScreenState extends State<DashboardScreen> {
TranslationBase.of(context).youHave, TranslationBase.of(context).youHave,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 10.0), fontSize:
SizeConfig.textMultiplier *
2.2),
), ),
Text( Text(
'25', '25',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 25.0), fontSize:
SizeConfig.textMultiplier *
4.0),
), ),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context)
.deliveredPackages, .deliveredPackages,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 10.0), fontSize:
SizeConfig.textMultiplier *
2.2),
) )
], ],
), ),
@ -241,9 +266,16 @@ class _DashboardScreenState extends State<DashboardScreen> {
Image.asset( Image.asset(
'assets/images/opend_box.png', 'assets/images/opend_box.png',
height: MediaQuery.of(context) height: MediaQuery.of(context)
.size .orientation ==
.height * Orientation.portrait
0.10, ? MediaQuery.of(context)
.size
.height *
0.10
: MediaQuery.of(context)
.size
.height *
0.20,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
@ -274,7 +306,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
height: MediaQuery.of(context).orientation == height: MediaQuery.of(context).orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery.of(context).size.height * 0.18 ? MediaQuery.of(context).size.height * 0.18
: MediaQuery.of(context).size.height * 0.28, : MediaQuery.of(context).size.height * 0.30,
width: MediaQuery.of(context).size.width * 0.50, width: MediaQuery.of(context).size.width * 0.50,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
@ -295,8 +327,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
'assets/images/qr_code.png', 'assets/images/qr_code.png',
width: MediaQuery.of(context).size.width * width: MediaQuery.of(context).size.width *
0.26, 0.26,
height: MediaQuery.of(context).size.height * height: MediaQuery.of(context)
0.14, .orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height *
0.14
: MediaQuery.of(context).size.height *
0.28,
fit: BoxFit.contain, fit: BoxFit.contain,
) )
], ],
@ -315,7 +352,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Text( child: Text(
TranslationBase.of(context).scan, TranslationBase.of(context).scan,
style: TextStyle( style: TextStyle(
fontSize: 35.0, fontSize:
SizeConfig.textMultiplier * 6.0,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
@ -328,7 +366,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
TranslationBase.of(context) TranslationBase.of(context)
.toAddPackageToQue, .toAddPackageToQue,
style: TextStyle( style: TextStyle(
fontSize: 15.0, fontSize:
SizeConfig.textMultiplier * 3.0,
color: Colors.white, color: Colors.white,
letterSpacing: 0.2, letterSpacing: 0.2,
wordSpacing: 0.5, wordSpacing: 0.5,
@ -478,13 +517,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: 15.0, fontSize: 15.0,
), ),
), ),
Expanded(
child: Text(
'Olaya ST, Behind kfc next to king , ',
style: TextStyle(
color: Color(0xff636363)),
),
),
], ],
), ),
), ),

@ -96,13 +96,6 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
fontSize: 15.0, fontSize: 15.0,
), ),
), ),
Expanded(
child: Text(
'Olaya ST, Behind kfc next to king',
style:
TextStyle(color: Color(0xff636363)),
),
),
], ],
), ),
), ),

Loading…
Cancel
Save