Merge branch 'design_changes' of https://gitlab.com/Cloud_Solution/driver-app into merge_design_canges_into_dev

 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/deliverd_orders_page.dart
	lib/pages/orders/pending_orders_page.dart
merge_design_canges_into_dev
Elham Rababah 6 years ago
commit dc290caca6

@ -93,7 +93,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
child:CircleAvatar( child: CircleAvatar(
radius: 25.5, radius: 25.5,
backgroundColor: Color(0xff30B7B9), backgroundColor: Color(0xff30B7B9),
child: CircleAvatar( child: CircleAvatar(
@ -102,14 +102,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Image.asset( child: Image.asset(
'assets/images/driver.png', 'assets/images/driver.png',
fit: BoxFit.contain, fit: BoxFit.contain,
),),
), ),
onTap: (){ ),
),
onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) => SettingPage(
SettingPage(driverName:_authenticationViewModel.user.userName, driverID:_authenticationViewModel.user.userID))); driverName: _authenticationViewModel
.user.userName,
driverID: _authenticationViewModel
.user.userID)));
}, },
), ),
], ],
@ -279,7 +283,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
), ),
Text( Text(
'5', '3',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: fontSize:
@ -288,7 +292,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
Text( Text(
TranslationBase.of(context) TranslationBase.of(context)
.undeliveredPackages, .deliveredPackages,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: MediaQuery.of(context) fontSize: MediaQuery.of(context)
@ -360,22 +364,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
_scanQrAndGetPatient(context, model); _scanQrAndGetPatient(context, model);
}, },
child: Container( child: Container(
height: MediaQuery height: MediaQuery.of(context).orientation ==
.of(context)
.orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery ? MediaQuery.of(context).size.height * 0.18
.of(context) : MediaQuery.of(context).size.height * 0.30,
.size width: MediaQuery.of(context).size.width * 0.50,
.height * 0.18
: MediaQuery
.of(context)
.size
.height * 0.30,
width: MediaQuery
.of(context)
.size
.width * 0.50,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
gradient: LinearGradient( gradient: LinearGradient(
@ -414,12 +407,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.only(top: 8.0), padding: EdgeInsets.only(top: 8.0),
child: Text( child: Text(
TranslationBase TranslationBase.of(context).scan,
.of(context)
.scan,
style: TextStyle( style: TextStyle(
fontSize: MediaQuery fontSize: MediaQuery.of(context)
.of(context)
.orientation == .orientation ==
Orientation.landscape Orientation.landscape
? SizeConfig.textMultiplier * 6.0 ? SizeConfig.textMultiplier * 6.0
@ -432,12 +422,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.only(top: 0.0), padding: EdgeInsets.only(top: 0.0),
child: Text( child: Text(
TranslationBase TranslationBase.of(context)
.of(context)
.toAddPackageToQue, .toAddPackageToQue,
style: TextStyle( style: TextStyle(
fontSize: MediaQuery fontSize: MediaQuery.of(context)
.of(context)
.orientation == .orientation ==
Orientation.landscape Orientation.landscape
? SizeConfig.textMultiplier * 3.0 ? SizeConfig.textMultiplier * 3.0
@ -465,8 +453,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
Text( Text(TranslationBase.of(context).nearestDropOffs,
TranslationBase.of(context).nearestDropOffs,
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
color: Hexcolor("#343333"), color: Hexcolor("#343333"),
@ -492,8 +479,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
], ],
), ),
onTap: () => onTap: () => Navigator.push(
Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => OrdersListScreen()), builder: (context) => OrdersListScreen()),
@ -521,18 +507,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: RoundedContainer( child: RoundedContainer(
showShadow: true, showShadow: true,
raduis: 25.0, raduis: 25.0,
height: MediaQuery height: MediaQuery.of(context).orientation ==
.of(context)
.orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery ? MediaQuery.of(context).size.height * 0.120
.of(context) : MediaQuery.of(context).size.height * 0.209,
.size
.height * 0.120
: MediaQuery
.of(context)
.size
.height * 0.209,
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
@ -550,31 +528,25 @@ class _DashboardScreenState extends State<DashboardScreen> {
left: 15.0, top: 14.0), left: 15.0, top: 14.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: MediaQuery height: MediaQuery.of(context)
.of(context)
.orientation == .orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery ? MediaQuery.of(context)
.of(context)
.size .size
.height * .height *
0.06 0.06
: MediaQuery : MediaQuery.of(context)
.of(context)
.size .size
.height * .height *
0.11, 0.11,
width: MediaQuery width: MediaQuery.of(context)
.of(context)
.orientation == .orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery ? MediaQuery.of(context)
.of(context)
.size .size
.width * .width *
0.05 0.05
: MediaQuery : MediaQuery.of(context)
.of(context)
.size .size
.width * .width *
0.09, 0.09,
@ -672,4 +644,3 @@ class _DashboardScreenState extends State<DashboardScreen> {
} }
} }
} }

@ -88,10 +88,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
), ),
], ],
), ),
Container( // Container(
width: MediaQuery.of(context).size.width, // width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width, // height: MediaQuery.of(context).size.width,
), // ),
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 1.0, height: MediaQuery.of(context).size.width * 1.0,
@ -105,12 +105,15 @@ class DeliveryConfirmedPage extends StatelessWidget {
topRight: Radius.circular(80)), topRight: Radius.circular(80)),
), ),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MediaQuery.of(context).orientation ==
Orientation.landscape
? MainAxisAlignment.center
: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.width * 0.09, bottom: MediaQuery.of(context).size.width * 0.00,
), ),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[

File diff suppressed because one or more lines are too long

@ -1,6 +1,7 @@
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart'; import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:driverapp/widgets/others/network_base_view.dart';
import 'package:driverapp/widgets/others/rounded_container.dart'; 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';
@ -28,7 +29,9 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Expanded( NetworkBaseView(
baseViewModel: model,
child: Expanded(
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
@ -55,23 +58,31 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: padding: EdgeInsets.only(
EdgeInsets.only(left: 15.0, top: 14.0), left: 15.0, top: 14.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: MediaQuery.of(context) height: MediaQuery.of(context)
.orientation == .orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery.of(context).size.height * ? MediaQuery.of(context)
.size
.height *
0.06 0.06
: MediaQuery.of(context).size.height * : MediaQuery.of(context)
.size
.height *
0.11, 0.11,
width: MediaQuery.of(context) width: MediaQuery.of(context)
.orientation == .orientation ==
Orientation.portrait Orientation.portrait
? MediaQuery.of(context).size.width * ? MediaQuery.of(context)
.size
.width *
0.05 0.05
: MediaQuery.of(context).size.width * : MediaQuery.of(context)
.size
.width *
0.09, 0.09,
), ),
) )
@ -82,12 +93,14 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
Expanded( Expanded(
flex: 5, flex: 5,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 20.0), padding: EdgeInsets.only(top: 20.0),
child: Text( child: Text(
model.deliverdOrders[index].firstName + model.deliverdOrders[index]
.firstName +
' ' + ' ' +
model.orders[index].lastName, model.orders[index].lastName,
style: TextStyle( style: TextStyle(
@ -97,7 +110,8 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
), ),
), ),
Text( Text(
model.deliverdOrders[index].mobileNumber, model
.deliverdOrders[index].mobileNumber,
style: TextStyle( style: TextStyle(
color: Color(0xff30B7B9), color: Color(0xff30B7B9),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -123,16 +137,23 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
distanceInKilometers: model distanceInKilometers: model
.deliverdOrders[index].distanceInKilometers, .deliverdOrders[index].distanceInKilometers,
), ),
//
), ),
], ],
), ),
), ),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// InformationPage(model.orders[index])));
// },
), ),
); );
}, },
), ),
), ),
),
], ],
), ),
), ),

@ -17,8 +17,8 @@ class AppScaffold extends StatelessWidget {
final Color arrowColor; final Color arrowColor;
final Color appBarColor; final Color appBarColor;
AppScaffold( AppScaffold({
{@required this.body, @required this.body,
this.appBarTitle = '', this.appBarTitle = '',
this.isLoading = false, this.isLoading = false,
this.isShowAppBar = false, this.isShowAppBar = false,
@ -50,7 +50,9 @@ class AppScaffold extends StatelessWidget {
title: Text(appBarTitle.toUpperCase()), title: Text(appBarTitle.toUpperCase()),
leading: Builder( leading: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return ArrowBack(arrowColor: arrowColor,); return ArrowBack(
arrowColor: arrowColor,
);
}, },
), ),
centerTitle: true, centerTitle: true,
@ -70,7 +72,8 @@ class AppScaffold extends StatelessWidget {
child: buildBodyWidget(), child: buildBodyWidget(),
baseViewModel: baseViewModel, baseViewModel: baseViewModel,
) )
: buildBodyWidget(), bottomSheet: bottomSheet, : buildBodyWidget(),
bottomSheet: bottomSheet,
), ),
); );
} }

Loading…
Cancel
Save