Merge branch 'merge_design_canges_into_dev' into 'development'

Merge design canges into dev

See merge request Cloud_Solution/driver-app!89
merge-requests/90/head
Elham 5 years ago
commit 51a1e311f1

@ -93,23 +93,27 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
child:CircleAvatar(
radius: 25.5,
backgroundColor: Color(0xff30B7B9),
child: CircleAvatar( child: CircleAvatar(
radius: 25.5,
backgroundColor: Color(0xff30B7B9), backgroundColor: Color(0xff30B7B9),
maxRadius: 26.0, child: CircleAvatar(
child: Image.asset( backgroundColor: Color(0xff30B7B9),
'assets/images/driver.png', maxRadius: 26.0,
fit: BoxFit.contain, child: Image.asset(
),), 'assets/images/driver.png',
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.portrait
.orientation == ? MediaQuery.of(context).size.height * 0.18
Orientation.portrait : MediaQuery.of(context).size.height * 0.30,
? MediaQuery width: MediaQuery.of(context).size.width * 0.50,
.of(context)
.size
.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(
@ -396,32 +389,29 @@ class _DashboardScreenState extends State<DashboardScreen> {
width: MediaQuery.of(context).size.width * width: MediaQuery.of(context).size.width *
0.26, 0.26,
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.14 0.14
: MediaQuery.of(context).size.height * : MediaQuery.of(context).size.height *
0.28, 0.28,
fit: BoxFit.contain, fit: BoxFit.contain,
) )
], ],
), ),
Column( Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceEvenly, MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
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
: SizeConfig.textMultiplier * 4.0, : SizeConfig.textMultiplier * 4.0,
color: Colors.white, color: Colors.white,
@ -432,14 +422,12 @@ 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
: SizeConfig.textMultiplier * 2.0, : SizeConfig.textMultiplier * 2.0,
color: Colors.white, color: Colors.white,
@ -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,12 +479,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
], ],
), ),
onTap: () => onTap: () => Navigator.push(
Navigator.push( context,
context, MaterialPageRoute(
MaterialPageRoute( builder: (context) => OrdersListScreen()),
builder: (context) => OrdersListScreen()), ),
),
), ),
], ],
), ),
@ -521,63 +507,49 @@ 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.portrait
.orientation == ? MediaQuery.of(context).size.height * 0.120
Orientation.portrait : MediaQuery.of(context).size.height * 0.209,
? MediaQuery
.of(context)
.size
.height * 0.120
: MediaQuery
.of(context)
.size
.height * 0.209,
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
flex: 1, flex: 1,
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding: 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 height: MediaQuery.of(context)
.of(context) .orientation ==
.orientation == Orientation.portrait
Orientation.portrait ? MediaQuery.of(context)
? MediaQuery .size
.of(context) .height *
.size 0.06
.height * : MediaQuery.of(context)
0.06 .size
: MediaQuery .height *
.of(context) 0.11,
.size width: MediaQuery.of(context)
.height * .orientation ==
0.11, Orientation.portrait
width: MediaQuery ? MediaQuery.of(context)
.of(context) .size
.orientation == .width *
Orientation.portrait 0.05
? MediaQuery : MediaQuery.of(context)
.of(context) .size
.size .width *
.width * 0.09,
0.05
: MediaQuery
.of(context)
.size
.width *
0.09,
), ),
) )
], ],
@ -588,7 +560,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 5, flex: 5,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 20.0), padding: EdgeInsets.only(top: 20.0),
@ -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,109 +29,129 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Expanded( NetworkBaseView(
child: ListView.builder( baseViewModel: model,
shrinkWrap: true, child: Expanded(
scrollDirection: Axis.vertical, child: ListView.builder(
itemCount: model.deliverdOrders == null shrinkWrap: true,
? 0 scrollDirection: Axis.vertical,
: model.deliverdOrders.length, itemCount: model.deliverdOrders == null
itemBuilder: (BuildContext context, int index) { ? 0
return Padding( : model.deliverdOrders.length,
padding: EdgeInsets.symmetric(horizontal: 12.2), itemBuilder: (BuildContext context, int index) {
child: InkWell( return Padding(
child: RoundedContainer( padding: EdgeInsets.symmetric(horizontal: 12.2),
raduis: 25.0, child: InkWell(
height: MediaQuery.of(context).orientation == child: RoundedContainer(
Orientation.portrait raduis: 25.0,
? MediaQuery.of(context).size.height * 0.120 height: MediaQuery.of(context).orientation ==
: MediaQuery.of(context).size.height * 0.209, Orientation.portrait
child: Row( ? MediaQuery.of(context).size.height * 0.120
mainAxisAlignment: MainAxisAlignment.spaceBetween, : MediaQuery.of(context).size.height * 0.209,
children: <Widget>[ child: Row(
Expanded( mainAxisAlignment: MainAxisAlignment.spaceBetween,
flex: 1, children: <Widget>[
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding:
EdgeInsets.only(left: 15.0, top: 14.0),
child: Image.asset(
'assets/images/location.png',
height: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height *
0.06
: MediaQuery.of(context).size.height *
0.11,
width: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context).size.width *
0.05
: MediaQuery.of(context).size.width *
0.09,
),
)
],
),
),
if (model.orders.length != 0)
Expanded( Expanded(
flex: 5, flex: 1,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 20.0), padding: EdgeInsets.only(
child: Text( left: 15.0, top: 14.0),
model.deliverdOrders[index].firstName + child: Image.asset(
' ' + 'assets/images/location.png',
model.orders[index].lastName, height: MediaQuery.of(context)
style: TextStyle( .orientation ==
fontSize: 18.0, Orientation.portrait
color: Hexcolor("#343333"), ? MediaQuery.of(context)
fontWeight: FontWeight.bold), .size
.height *
0.06
: MediaQuery.of(context)
.size
.height *
0.11,
width: MediaQuery.of(context)
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.width *
0.05
: MediaQuery.of(context)
.size
.width *
0.09,
), ),
), )
Text( ],
model.deliverdOrders[index].mobileNumber, ),
style: TextStyle( ),
color: Color(0xff30B7B9), if (model.orders.length != 0)
fontWeight: FontWeight.w600, Expanded(
fontSize: 15.0, flex: 5,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(top: 20.0),
child: Text(
model.deliverdOrders[index]
.firstName +
' ' +
model.orders[index].lastName,
style: TextStyle(
fontSize: 18.0,
color: Hexcolor("#343333"),
fontWeight: FontWeight.bold),
),
), ),
), Text(
Expanded( model
child: Text( .deliverdOrders[index].mobileNumber,
model.deliverdOrders[index].orderID
.toString(),
style: TextStyle( style: TextStyle(
fontSize: 18.0, color: Color(0xff30B7B9),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w600,
letterSpacing: 8.0), fontSize: 15.0,
),
), ),
), Expanded(
], child: Text(
model.deliverdOrders[index].orderID
.toString(),
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w400,
letterSpacing: 8.0),
),
),
],
),
),
Padding(
padding: EdgeInsets.all(8.0),
child: DistanceInKilometers(
distanceInKilometers: model
.deliverdOrders[index].distanceInKilometers,
), ),
), ),
Padding( ],
padding: EdgeInsets.all(8.0), ),
child: DistanceInKilometers(
distanceInKilometers: model
.deliverdOrders[index].distanceInKilometers,
),
//
),
],
), ),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// InformationPage(model.orders[index])));
// },
), ),
), );
); },
}, ),
), ),
), ),
], ],

@ -27,4 +27,4 @@ class packageContent extends StatelessWidget {
], ],
); );
} }
} }

@ -17,17 +17,17 @@ 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,
this.baseViewModel, this.baseViewModel,
this.bottomSheet, this.bottomSheet,
this.titleColor, this.titleColor,
this.arrowColor, this.arrowColor,
this.appBarColor, this.appBarColor,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -46,14 +46,16 @@ class AppScaffold extends StatelessWidget {
headline6: TextStyle( headline6: TextStyle(
color: titleColor ?? Colors.white, color: titleColor ?? Colors.white,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
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,
// actions: <Widget>[ // actions: <Widget>[
// IconButton( // IconButton(
// icon: Icon(FontAwesomeIcons.home), // icon: Icon(FontAwesomeIcons.home),
@ -63,14 +65,15 @@ class AppScaffold extends StatelessWidget {
// }, // },
// ), // ),
// ], // ],
) )
: null, : null,
body: baseViewModel != null body: baseViewModel != null
? NetworkBaseView( ? NetworkBaseView(
child: buildBodyWidget(), child: buildBodyWidget(),
baseViewModel: baseViewModel, baseViewModel: baseViewModel,
) )
: buildBodyWidget(), bottomSheet: bottomSheet, : buildBodyWidget(),
bottomSheet: bottomSheet,
), ),
); );
} }

Loading…
Cancel
Save