merge conflect

logut
hussam al-habibeh 6 years ago
parent 9006dbd25c
commit b814562495

@ -96,14 +96,8 @@ 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 height: MediaQuery.of(context).size.height * 0.16,
.of(context) width: MediaQuery.of(context).size.width * 0.44,
.size
.height * 0.16,
width: MediaQuery
.of(context)
.size
.width * 0.44,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
gradient: LinearGradient( gradient: LinearGradient(
@ -153,15 +147,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/closed_box.png', 'assets/images/closed_box.png',
height: MediaQuery height:
.of(context) MediaQuery.of(context).size.height *
.size
.height *
0.10, 0.10,
width: MediaQuery width:
.of(context) MediaQuery.of(context).size.width *
.size
.width *
0.20, 0.20,
scale: 0.9, scale: 0.9,
fit: BoxFit.contain, fit: BoxFit.contain,
@ -184,10 +174,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
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).size.height * 0.16,
width: MediaQuery width: MediaQuery.of(context).size.width * 0.45,
.of(context)
.size
.width * 0.45,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
gradient: LinearGradient( gradient: LinearGradient(
@ -206,12 +193,14 @@ class _DashboardScreenState extends State<DashboardScreen> {
Text( Text(
'You Have', 'You Have',
style: TextStyle( style: TextStyle(
color: Colors.white, fontSize: 10.0), color: Colors.white,
fontSize: 10.0),
), ),
Text( Text(
'25', '25',
style: TextStyle( style: TextStyle(
color: Colors.white, fontSize: 25.0), color: Colors.white,
fontSize: 25.0),
), ),
Text( Text(
'Succesful\nDeliveries', 'Succesful\nDeliveries',
@ -265,14 +254,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded( Expanded(
child: InkWell( child: InkWell(
child: Container( child: Container(
height: MediaQuery height: MediaQuery.of(context).size.height * 0.18,
.of(context) width: MediaQuery.of(context).size.width * 0.50,
.size
.height * 0.18,
width: MediaQuery
.of(context)
.size
.width * 0.50,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
@ -288,15 +271,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
Image.asset( Image.asset(
'assets/images/qr_code.png', 'assets/images/qr_code.png',
width: width:
MediaQuery MediaQuery.of(context).size.width * 0.26,
.of(context)
.size
.width * 0.26,
height: height:
MediaQuery MediaQuery.of(context).size.height * 0.14,
.of(context)
.size
.height * 0.14,
fit: BoxFit.contain, fit: BoxFit.contain,
) )
], ],
@ -399,7 +376,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
padding: EdgeInsets.symmetric(horizontal: 12.2), padding: EdgeInsets.symmetric(horizontal: 12.2),
child: InkWell( child: InkWell(
child: RoundedContainer( child: RoundedContainer(
raduis: 25.0,height: MediaQuery.of(context).size.height * 0.109, raduis: 25.0,
height: MediaQuery.of(context).size.height * 0.109,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
@ -451,8 +429,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded( Expanded(
child: Text( child: Text(
'Olaya ST, Behind kfc next to king , ', 'Olaya ST, Behind kfc next to king , ',
style: style: TextStyle(
TextStyle(color: Color(0xff636363)), color: Color(0xff636363)),
), ),
), ),
], ],

Loading…
Cancel
Save