Merge branch 'design_changes' into 'development'

delivery confirmed

See merge request Cloud_Solution/driver-app!106
updates_new
Elham 6 years ago
commit be2df369eb

@ -1,3 +1,4 @@
import 'package:driverapp/config/config.dart';
import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/model/orders/next_order_request_model.dart'; import 'package:driverapp/core/model/orders/next_order_request_model.dart';
import 'package:driverapp/core/model/orders/pending_orders_res_model.dart'; import 'package:driverapp/core/model/orders/pending_orders_res_model.dart';
@ -23,13 +24,14 @@ class DeliveryConfirmedPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<OrdersViewModel>( return BaseView<OrdersViewModel>(
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isAppBarGradient: true,
isShowAppBar: true, isShowAppBar: true,
appBarColor: Theme.of(context).primaryColor, appBarColor: Theme.of(context).primaryColor,
arrowColor: Colors.white, arrowColor: Colors.white,
titleColor: Colors.white, titleColor: Colors.white,
body: SafeArea( body: SafeArea(
child: Container( child: Container(
color: Theme.of(context).primaryColor, decoration: BoxDecoration(gradient: LINEAR_GRADIENT),
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Stack( Stack(
@ -41,9 +43,12 @@ class DeliveryConfirmedPage extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.width * 0.7, height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.width * 0.7
: MediaQuery.of(context).size.width * 0.5,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: MediaQuery.of(context).size.width * 0.12, top: MediaQuery.of(context).size.width * 0.14,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white10, color: Colors.white10,
@ -61,7 +66,7 @@ class DeliveryConfirmedPage extends StatelessWidget {
0.03, 0.03,
), ),
Text( Text(
TranslationBase.of(context).deliveryInfo, 'Delivery Confirmed',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 20, fontSize: 20,
@ -94,9 +99,15 @@ class DeliveryConfirmedPage extends StatelessWidget {
// ), // ),
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).orientation ==
Orientation.landscape
? MediaQuery.of(context).size.width * 0.6
: MediaQuery.of(context).size.width * 1.0,
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: MediaQuery.of(context).size.width * 0.75, top: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.width * 0.70
: MediaQuery.of(context).size.width * 0.60,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -115,41 +126,51 @@ class DeliveryConfirmedPage extends StatelessWidget {
margin: EdgeInsets.only( margin: EdgeInsets.only(
bottom: MediaQuery.of(context).size.width * 0.00, bottom: MediaQuery.of(context).size.width * 0.00,
), ),
child: Column( child: Padding(
children: <Widget>[ padding: MediaQuery.of(context).orientation ==
FlatButton.icon( Orientation.landscape
padding: EdgeInsets.all(8), ? EdgeInsets.only(top: 60.0)
color: Colors.orangeAccent, : EdgeInsets.only(top: 30.0),
shape: RoundedRectangleBorder( child: Column(
borderRadius: children: <Widget>[
new BorderRadius.circular(10.0), FlatButton.icon(
), padding: EdgeInsets.all(14.0),
label: Text( color: Colors.orangeAccent,
TranslationBase.of(context).addNoteBtn, shape: RoundedRectangleBorder(
style: TextStyle(color: Colors.white), borderRadius: BorderRadius.circular(10.0),
),
label: Text(
TranslationBase.of(context).addNoteBtn,
style: TextStyle(
color: Colors.white, fontSize: 20.0),
),
icon: Icon(
Icons.mode_edit,
color: Colors.white,
),
onPressed: () {},
), ),
icon: Icon( SizedBox(
Icons.mode_edit, height: MediaQuery.of(context).size.width *
color: Colors.white, 0.00, //20,
), ),
onPressed: () {}, Padding(
), padding: const EdgeInsets.only(top: 30.0),
SizedBox( child: Container(
height: MediaQuery.of(context).size.width * margin: EdgeInsets.all(10),
0.02, //20, child: SecondaryButton(
), label: TranslationBase.of(context)
Container( .nextDelivery,
margin: EdgeInsets.all(10), loading:
child: SecondaryButton( model.state == ViewState.BusyLocal,
label: TranslationBase.of(context) onTap: () {
.nextDelivery, getNextOrder(context, model);
loading: model.state == ViewState.BusyLocal, },
onTap: () { ),
getNextOrder(context, model); ),
},
), ),
), ],
], ),
), ),
), ),
], ],
@ -157,7 +178,10 @@ class DeliveryConfirmedPage extends StatelessWidget {
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: MediaQuery.of(context).size.width * 0.6, top: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.width * 0.6
: MediaQuery.of(context).size.width * 0.4,
), ),
child: CustomerBriefCard( child: CustomerBriefCard(
itemId: item.orderID, itemId: item.orderID,

Loading…
Cancel
Save