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

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

Loading…
Cancel
Save