Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_design_update

 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
logut
hussam al-habibeh 6 years ago
commit 9006dbd25c

@ -12,6 +12,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
import 'package:driverapp/config/shared_pref_kay.dart';
class DashboardScreen extends StatefulWidget { class DashboardScreen extends StatefulWidget {
@override @override
@ -163,7 +164,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
.width * .width *
0.20, 0.20,
scale: 0.9, scale: 0.9,
fit: BoxFit.cover, fit: BoxFit.contain,
), ),
], ],
), ),
@ -242,7 +243,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
MediaQuery.of(context).size.width * MediaQuery.of(context).size.width *
0.20, 0.20,
scale: 0.9, scale: 0.9,
fit: BoxFit.cover, fit: BoxFit.contain,
), ),
], ],
), ),
@ -301,30 +302,33 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
Column( Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
_scanQrAndGetPatient(context, model); _scanQrAndGetPatient(context, model);
}, },
child: Text( child: Padding(
'SCAN', padding: EdgeInsets.only(top: 8.0),
style: TextStyle( child: Text(
fontSize: 35.0, 'SCAN',
color: Colors.white, style: TextStyle(
fontWeight: FontWeight.w400), fontSize: 35.0,
color: Colors.white,
fontWeight: FontWeight.w400),
),
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 6.0), padding: EdgeInsets.only(top: 0.0),
child: Text( child: Text(
'To add package to que ', 'To add package to que ',
style: TextStyle( style: TextStyle(
fontSize: 12.0, fontSize: 15.0,
color: Colors.white, color: Colors.white,
letterSpacing: 0.5, letterSpacing: 0.2,
wordSpacing: 5.5, wordSpacing: 0.5,
), ),
), ),
), ),
@ -373,10 +377,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => OrdersListScreen()), builder: (context) => OrdersListScreen()),
)), )),
], ],
), ),
], ],
@ -395,18 +399,18 @@ 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(
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>[
Expanded( Expanded(
flex: 1, flex: 1,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 10.0, bottom: 5.0), left: 10.0, bottom: 5.0, top: 10.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: height:
@ -428,7 +432,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 5.0), padding: EdgeInsets.only(top: 10.0),
child: Text( child: Text(
model.orders[index].firstName + model.orders[index].firstName +
' ' + ' ' +
@ -448,7 +452,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Text( child: Text(
'Olaya ST, Behind kfc next to king , ', 'Olaya ST, Behind kfc next to king , ',
style: style:
TextStyle(color: Colors.black45), TextStyle(color: Color(0xff636363)),
), ),
), ),
], ],
@ -461,11 +465,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CircleAvatar( child: CircleAvatar(
backgroundColor: Colors.black45, backgroundColor: Color(0xff707070),
radius: 28.0, radius: 28.0,
child: CircleAvatar( child: CircleAvatar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
maxRadius: 25.1, maxRadius: 25.0,
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(

@ -34,6 +34,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
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, height: MediaQuery.of(context).size.height * 0.109,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -41,11 +42,11 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
Expanded( Expanded(
flex: 1, flex: 1,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 10.0, bottom: 5.0), left: 10.0, bottom: 5.0, top: 10.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: height:
@ -65,7 +66,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 5.0), padding: EdgeInsets.only(top: 10.0),
child: Text( child: Text(
model.orders[index].firstName + model.orders[index].firstName +
' ' + ' ' +
@ -83,8 +84,9 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
), ),
Expanded( Expanded(
child: Text( child: Text(
'Olaya ST, Behind kfc next to king ,', 'Olaya ST, Behind kfc next to king , ',
style: TextStyle(color: Colors.black45), style:
TextStyle(color: Color(0xff636363)),
), ),
), ),
], ],
@ -101,7 +103,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
radius: 28.0, radius: 28.0,
child: CircleAvatar( child: CircleAvatar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
maxRadius: 24.1, maxRadius: 25.0,
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(

Loading…
Cancel
Save