diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/delivery_confirmed_page.dart index 8fab34f..e56656c 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/delivery_confirmed_page.dart @@ -1,3 +1,4 @@ +import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,7 +16,7 @@ class DeliveryConfirmedPage extends StatelessWidget { return AppScaffold( body: SafeArea( child: Container( - color: Color(0xff41bdbb), + color: Theme.of(context).primaryColor, child: ListView( children: [ Column( @@ -39,21 +40,11 @@ class DeliveryConfirmedPage extends StatelessWidget { child: Column( children: [ Container( - width: MediaQuery - .of(context) - .size - .width, - //300, - height: MediaQuery - .of(context) - .size - .width * 0.7, - //300, + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.width * 0.7, padding: EdgeInsets.only( - top: MediaQuery - .of(context) - .size - .width * 0.2, //60, + top: MediaQuery.of(context).size.width * + 0.2, ), decoration: BoxDecoration( color: Colors.white10, @@ -66,17 +57,14 @@ class DeliveryConfirmedPage extends StatelessWidget { size: 60, ), Text( - TranslationBase - .of(context) - .deliveryInfo, + TranslationBase.of(context).deliveryInfo, style: TextStyle( color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold), ), Text( - TranslationBase - .of(context) + TranslationBase.of(context) .confirmationSent, style: TextStyle( color: Colors.white, @@ -94,25 +82,13 @@ class DeliveryConfirmedPage extends StatelessWidget { Stack( children: [ Container( - width: MediaQuery - .of(context) - .size - .width, //400, - height: MediaQuery - .of(context) - .size - .width, //500, + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.width, ), Container( - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, //800, - height: MediaQuery - .of(context) - .size - .width * 1.2, + height: MediaQuery.of(context).size.width * 1.2, //440, margin: EdgeInsets.only(top: 60), decoration: BoxDecoration( @@ -127,10 +103,8 @@ class DeliveryConfirmedPage extends StatelessWidget { children: [ Container( margin: EdgeInsets.only( - bottom: MediaQuery - .of(context) - .size - .width * 0.15, //50 + bottom: MediaQuery.of(context).size.width * + 0.15, //50 ), child: Column( children: [ @@ -139,52 +113,29 @@ class DeliveryConfirmedPage extends StatelessWidget { color: Colors.orangeAccent, shape: RoundedRectangleBorder( borderRadius: - new BorderRadius.circular(10.0), + new BorderRadius.circular(10.0), + ), + label: Text( + TranslationBase.of(context).addNoteBtn, + style: TextStyle(color: Colors.white), ), icon: Icon( Icons.mode_edit, color: Colors.white, ), - label: Text( - TranslationBase - .of(context) - .addNoteBtn, - style: TextStyle(color: Colors.white), - ), onPressed: () {}, ), SizedBox( - height: MediaQuery - .of(context) - .size - .width * 0.1, //20, + height: MediaQuery.of(context).size.width * + 0.1, //20, ), - FlatButton( - color: Color(0xff41bdbb), - padding: - EdgeInsets.only( - right: MediaQuery - .of(context) - .size - .width * 0.25, //100, - left: MediaQuery - .of(context) - .size - .width * 0.25, //100 - ), - shape: RoundedRectangleBorder( - borderRadius: - new BorderRadius.circular(18.0), - side: - BorderSide(color: Color(0xff41bdbb)), - ), - child: Text( - TranslationBase - .of(context) + Container( + margin: EdgeInsets.all(10), + child: SecondaryButton( + label: TranslationBase.of(context) .nextDelivery, - style: TextStyle(color: Colors.white), + onTap: () {}, ), - onPressed: () {}, ), ], ), @@ -192,14 +143,13 @@ class DeliveryConfirmedPage extends StatelessWidget { ], ), ), - CustomerBrief( + CustomerBriefCard( itemId: item.patientID, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, totalPayment: item.amount, - deliveryTime: item.orderCreatedOn - ), + deliveryTime: item.orderCreatedOn), ], ), ], diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/information_page.dart index 73d8e91..e64287b 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/information_page.dart @@ -1 +1 @@ -import 'package:driverapp/app-icons/driver_app_icons.dart'; import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/model/orders/pending_orders_res_model.dart'; import 'package:driverapp/core/model/orders/update_order_status_request_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/pages/base/base_view.dart'; import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/bottom_sheet/action_sheet_button.dart'; import 'package:driverapp/widgets/bottom_sheet/custom_bottom_sheet.dart'; import 'package:driverapp/widgets/data_display/dialog/custom_dialog.dart'; import 'package:driverapp/widgets/data_display/text.dart'; import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:driverapp/widgets/delivery/delivery_action_button.dart'; import 'package:driverapp/widgets/delivery/package_content.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import '../../uitl/translations_delegate_base.dart'; import '../../widgets/others/app_scaffold_widget.dart'; class InformationPage extends StatelessWidget { final PendingOrdersRes item; int orderStatus; InformationPage(this.item); @override Widget build(BuildContext context) { return BaseView( builder: (BuildContext context, OrdersViewModel model, Widget child) => AppScaffold( body: Container( color: Color(0xff41bdbb), child: Container( color: Color(0xff41bdbb), child: ListView( children: [ Column( children: [ Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( margin: EdgeInsets.only( right: MediaQuery.of(context).size.width * 0.15, //50 ), child: IconButton( color: Colors.white, iconSize: 50, icon: Icon(Icons.arrow_back), onPressed: () { Navigator.pop(context); }, ), ), Container( child: Text( TranslationBase.of(context).deliveryInfo, style: TextStyle( color: Colors.white, fontSize: 20, ), ), ), ], ), Stack( children: [ Container( width: MediaQuery.of(context).size.width, //400, height: MediaQuery.of(context).size.width, //500, ), Container( width: MediaQuery.of(context).size.width * 1, //800, height: MediaQuery.of(context).size.width * 1.5, //700, margin: EdgeInsets.only( top: MediaQuery.of(context).size.width * 0.3, //100 ), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( topLeft: Radius.circular(45), topRight: Radius.circular(45)), ), child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox( height: MediaQuery.of(context).size.width * 0.2, //170, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ delivery_info_button( btnColor: Color(0xfff44336), btnIcon: Icon( Icons.near_me, size: 30, color: Colors.white, ), btnName: TranslationBase.of(context).location, btnFunction: () {}, ), delivery_info_button( btnColor: Colors.green, btnIcon: Icon( Icons.whatshot, size: 30, color: Colors.white, ), btnName: 'Whatsapp', btnFunction: () {}, ), delivery_info_button( btnColor: Colors.orangeAccent, btnIcon: Icon( Icons.mail_outline, size: 30, color: Colors.white, ), btnName: TranslationBase.of(context).sms, btnFunction: () {}, ), delivery_info_button( btnColor: Color(0xff41bdbb), btnIcon: Icon( Icons.phone, size: 30, color: Colors.white, ), btnName: TranslationBase.of(context).call, btnFunction: () {}, ), ], ), SizedBox( height: MediaQuery.of(context).size.width * 0.1, //30, ), Container( margin: EdgeInsets.only( left: MediaQuery.of(context).size.width * 0.05, //15, right: MediaQuery.of(context).size.width * 0.02, //15 ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( TranslationBase.of(context) .packageContent, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 20), ), SizedBox( height: MediaQuery.of(context).size.width * 0.05, //20, ), Column( children: List.generate( item.itemsQuantitiesList.length, (index) { return package_content( packageName: item .itemsQuantitiesList[index] .itemName .toString(), //'Panadol Extra 50 tablet', packageCount: item .itemsQuantitiesList[index] .quantity .toString(), ); }), ), SizedBox( height: MediaQuery.of(context).size.width * 0.01, //10, ), ], ), ), SizedBox( height: MediaQuery.of(context).size.width * 0.1, //30, ), FlatButton( color: Color(0xff41bdbb), padding: EdgeInsets.only( right: MediaQuery.of(context).size.width * 0.3, //100, left: MediaQuery.of(context).size.width * 0.3, //100, bottom: MediaQuery.of(context).size.width * 0.035, //15, top: MediaQuery.of(context).size.width * 0.035, //15 ), shape: RoundedRectangleBorder( borderRadius: new BorderRadius.circular(30.0), side: BorderSide(color: Color(0xff41bdbb)), ), child: Text( TranslationBase.of(context).clientReached, style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, fontSize: 16), ), onPressed: () { model.showBottomSheet(); }, ), ], ), ), CustomerBrief( itemId: item.patientID, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, totalPayment: item.amount, deliveryTime: item.orderCreatedOn), ], ), ], ), ], ), ), ), bottomSheet: !model.isBottomSheetAppear ? Container( width: 0, height: 0, ) : CustomBottomSheet( children: [ SizedBox( height: 10, ), Center( child: Texts( 'Select Action', color: Colors.black, fontSize: 22, ), ), SizedBox( height: 10, ), FractionallySizedBox( widthFactor: 0.9, child: Column( children: [ SizedBox( height: 3, child: Container( color: Hexcolor("#D5D5D5"), ), ), SizedBox( height: 6, ), ActionSheetButton( label: "Delivered", icon: DriverApp.deliverd_icon, onTap: () { selectAction(context, 1, model); }, ), SizedBox( height: 6, ), ActionSheetButton( label: "Not Available", icon: DriverApp.not_available, onTap: () { selectAction(context, 2, model); }, ), SizedBox( height: 6, ), ActionSheetButton( label: "Rejected", icon: DriverApp.rejected_icon, onTap: () { selectAction(context, 3, model); }, ), SizedBox( height: 6, ), ActionSheetButton( label: "Not Reachable", icon: DriverApp.not_reachable_icon, onTap: () { selectAction(context, 4, model); }, ), ], ), ), ], ), ), ); } selectAction(BuildContext context, orderStatus, OrdersViewModel model) { String orderStatusText; this.orderStatus = orderStatus; switch (orderStatus) { case 1: orderStatusText = "Delivered"; break; case 2: orderStatusText = "Not Available"; break; case 3: orderStatusText = "Rejected"; break; case 4: orderStatusText = "Not Reachable"; break; } showDialog( context: context, builder: (BuildContext context) { return CustomDialog( orderStatusText: orderStatusText, callService: () { updateOrderStatus(context, model); }, model: model,); }); } updateOrderStatus(BuildContext context, OrdersViewModel model) async { UpdateOrderStatusRequestModel updateOrderStatusRequestModel = UpdateOrderStatusRequestModel(deliveryOrderID: item.orderID, deliveryOrderStatus: orderStatus, rejectionReason: "NO Reason", cancleReason: ""); await model.updateOrderStatus(updateOrderStatusRequestModel); if (model.state == ViewState.ErrorLocal) { Utils.showErrorToast(model.error); Navigator.of(context).pop(); model.hideBottomSheet(); } else { Navigator.of(context).pop(); model.hideBottomSheet(); Navigator.push( context, MaterialPageRoute( builder: (context) => DeliveryConfirmedPage(item), ), ); } } } \ No newline at end of file +import 'package:driverapp/app-icons/driver_app_icons.dart'; import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/model/orders/pending_orders_res_model.dart'; import 'package:driverapp/core/model/orders/update_order_status_request_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/pages/base/base_view.dart'; import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/bottom_sheet/action_sheet_button.dart'; import 'package:driverapp/widgets/bottom_sheet/custom_bottom_sheet.dart'; import 'package:driverapp/widgets/data_display/dialog/custom_dialog.dart'; import 'package:driverapp/widgets/data_display/text.dart'; import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; import 'package:driverapp/widgets/delivery/delivery_action_button.dart'; import 'package:driverapp/widgets/delivery/package_content.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import '../../uitl/translations_delegate_base.dart'; import '../../widgets/others/app_scaffold_widget.dart'; class InformationPage extends StatelessWidget { final PendingOrdersRes item; int orderStatus; InformationPage(this.item); @override Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, appBarColor: Theme.of(context).primaryColor, arrowColor: Colors.white, titleColor: Colors.white, appBarTitle: TranslationBase.of(context).deliveryInfo, body: Container( color: Theme.of(context).primaryColor, child: Container( color: Theme.of(context).primaryColor, child: ListView( children: [ Column( children: [ Stack( children: [ Container( width: MediaQuery .of(context) .size .width, height: MediaQuery .of(context) .size .width, ), Container( width: MediaQuery .of(context) .size .width * 1, height: MediaQuery .of(context) .size .width * 1.5, margin: EdgeInsets.only( top: MediaQuery .of(context) .size .width * 0.23, ), decoration: BoxDecoration( color: Theme.of(context).scaffoldBackgroundColor, borderRadius: BorderRadius.only( topLeft: Radius.circular(45), topRight: Radius.circular(45)), ), child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox( height: MediaQuery .of(context) .size .width * 0.53, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ DeliveryInfoButton( btnColor: Color(0xffED1C24), btnIcon: Icon( Icons.near_me, size: 30, color: Colors.white, ), btnName: TranslationBase .of(context) .location, btnFunction: () {}, ), DeliveryInfoButton( btnColor: Color(0xFF61B260), btnIcon: Icon( Icons.whatshot, size: 30, color: Colors.white, ), btnName: 'Whatsapp', btnFunction: () {}, ), DeliveryInfoButton( btnColor: Color(0xFFFCB657), btnIcon: Icon( Icons.mail_outline, size: 30, color: Colors.white, ), btnName: TranslationBase .of(context) .sms, btnFunction: () {}, ), DeliveryInfoButton( btnColor: Theme.of(context).primaryColor, btnIcon: Icon( Icons.phone, size: 30, color: Colors.white, ), btnName: TranslationBase .of(context) .call, btnFunction: () {}, ), ], ), SizedBox( height: MediaQuery .of(context) .size .width * 0.1, ), Container( margin: EdgeInsets.only( left: MediaQuery .of(context) .size .width * 0.05, right: MediaQuery .of(context) .size .width * 0.05, ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( padding: const EdgeInsets.only(left: 8), child: Text( TranslationBase .of(context) .packageContent, style: TextStyle( fontWeight: FontWeight.w900, fontSize: 20), ), ), SizedBox( height: MediaQuery .of(context) .size .width * 0.05, ), Padding( padding: const EdgeInsets.only(left: 10), child: Column( children: List.generate( item.itemsQuantitiesList.length, (index) { return packageContent( packageName: item .itemsQuantitiesList[index] .itemName .toString(), packageCount: item .itemsQuantitiesList[index] .quantity .toString(), ); }), ), ), SizedBox( height: MediaQuery .of(context) .size .width * 0.01, ), ], ), ), SizedBox( height: MediaQuery .of(context) .size .width * 0.1, ), Container( margin: EdgeInsets.all(10), child: SecondaryButton( label: TranslationBase.of(context).clientReached, onTap: () { Navigator.push( context, MaterialPageRoute( builder: (context) => DeliveryConfirmedPage(item))); }, ), ), ], ), ), CustomerBriefCard( itemId: item.patientID, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, totalPayment: item.amount, deliveryTime: item.orderCreatedOn), ], ), ], ), ], ), ), ), ); } selectAction(BuildContext context, orderStatus, OrdersViewModel model) { String orderStatusText; this.orderStatus = orderStatus; switch (orderStatus) { case 1: orderStatusText = "Delivered"; break; case 2: orderStatusText = "Not Available"; break; case 3: orderStatusText = "Rejected"; break; case 4: orderStatusText = "Not Reachable"; break; } showDialog( context: context, builder: (BuildContext context) { return CustomDialog( orderStatusText: orderStatusText, callService: () { updateOrderStatus(context, model); }, model: model,); }); } updateOrderStatus(BuildContext context, OrdersViewModel model) async { UpdateOrderStatusRequestModel updateOrderStatusRequestModel = UpdateOrderStatusRequestModel(deliveryOrderID: item.orderID, deliveryOrderStatus: orderStatus, rejectionReason: "NO Reason", cancleReason: ""); await model.updateOrderStatus(updateOrderStatusRequestModel); if (model.state == ViewState.ErrorLocal) { Utils.showErrorToast(model.error); Navigator.of(context).pop(); model.hideBottomSheet(); } else { Navigator.of(context).pop(); model.hideBottomSheet(); Navigator.push( context, MaterialPageRoute( builder: (context) => DeliveryConfirmedPage(item), ), ); } } } \ No newline at end of file diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index 8ba11ea..05bb430 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import '../../uitl/date_uitl.dart'; import '../../uitl/translations_delegate_base.dart'; -class CustomerBrief extends StatelessWidget { +class CustomerBriefCard extends StatelessWidget { final String itemId; final String time; final String customerFirstName; @@ -15,7 +15,7 @@ class CustomerBrief extends StatelessWidget { final double longitude; final double latitude; - CustomerBrief( + CustomerBriefCard( {this.itemId, this.time, this.customerFirstName, @@ -32,14 +32,14 @@ class CustomerBrief extends StatelessWidget { return Center( child: Container( width: 350, - height: 300, + height: 270, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( - topLeft: Radius.circular(45), - topRight: Radius.circular(45), - bottomRight: Radius.circular(45), - bottomLeft: Radius.circular(45)), + topLeft: Radius.circular(30), + topRight: Radius.circular(30), + bottomRight: Radius.circular(30), + bottomLeft: Radius.circular(30)), boxShadow: [ BoxShadow( color: Colors.grey.withOpacity(0.3), @@ -50,37 +50,35 @@ class CustomerBrief extends StatelessWidget { ], ), child: Container( - padding: EdgeInsets.only(left: 30, top: 10, right: 30), + padding: EdgeInsets.only(left: 30, top: 20, right: 30), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( children: [ Expanded( - child: Text('ID: ${itemId}'), + flex: 3, + child: Text( + 'ID: ${itemId}', + style: TextStyle(color: Color(0xFFADACAD)), + ), ), Expanded( - child: Container( - margin: EdgeInsets.only(left: 83), - width: 10, - height: 60, - decoration: BoxDecoration( - border: Border.all( - width: 2.0, - color: Color(0xff41bdbb), - ), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(45), - topRight: Radius.circular(45), - bottomRight: Radius.circular(45), - bottomLeft: Radius.circular(45), - ), - ), - child: Container( - margin: EdgeInsets.only(left: 12, top: 10), - child: Text( - '3 min away', - style: TextStyle(color: Color(0xff41bdbb)), + child: CircleAvatar( + backgroundColor: Colors.black45, + radius: 28.0, + child: CircleAvatar( + backgroundColor: Colors.white, + maxRadius: 25.1, + child: Padding( + padding: const EdgeInsets.only(left: 3), + child: Text( + '3 K.m \n away', + style: TextStyle( + color: Color(0xff30B7B9), + fontSize: 12.5, + fontWeight: FontWeight.w600), + ), ), ), ), @@ -89,24 +87,32 @@ class CustomerBrief extends StatelessWidget { ), Text( '${customerFirstName} ${customerLastName}', - style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + style: TextStyle(fontSize: 20, fontWeight: FontWeight.w900), ), Text( mobileNo, - style: TextStyle(color: Colors.lightBlue), + style: TextStyle(color: Color(0xFF50BDC5)), ), SizedBox( height: 10, ), Text( - 'Olaya street, behind KFC resturant, next to kingdom towers 2ND floor ofice 277', - style: TextStyle(fontWeight: FontWeight.w600), + 'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277', + style: TextStyle( + color: Color(0xFF464748), fontWeight: FontWeight.w600), ), SizedBox( height: 10, ), - Divider( - color: Colors.grey, + SizedBox( + height: 10.0, + child: Center( + child: Container( + margin: EdgeInsetsDirectional.only(start: 1.0, end: 1.0), + height: 1.0, + color: Colors.grey, + ), + ), ), SizedBox( height: 20, @@ -115,15 +121,22 @@ class CustomerBrief extends StatelessWidget { children: [ Row( children: [ - Text( - TranslationBase.of(context).payment, + Expanded( + flex: 2, + child: Text( + TranslationBase.of(context).payment, + textAlign: TextAlign.start, + ), ), SizedBox( width: 170, ), - Text( - totalPayment.toString(), //'SAR 70', - style: TextStyle(fontWeight: FontWeight.bold), + Expanded( + child: Text( + totalPayment.toString(), + textAlign: TextAlign.end, + style: TextStyle(fontWeight: FontWeight.w600), + ), ), ], ), @@ -132,19 +145,19 @@ class CustomerBrief extends StatelessWidget { ), Row( children: [ - Text( - TranslationBase.of(context).delivryTime, + Expanded( + flex: 1, + child: Text( + TranslationBase.of(context).delivryTime, + textAlign: TextAlign.start, + ), ), - SizedBox( - width: 50, + Expanded( + child: Text( + '${DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(deliveryTime))} ${(DateUtil.convertStringToHours(deliveryTime))}', + textAlign: TextAlign.end, + style: TextStyle(fontWeight: FontWeight.w600)), ), - Text( - '${DateUtil.getMonthDayYearDateFormatted( - DateUtil.convertStringToDate( - deliveryTime))} ${(DateUtil - .convertStringToHours(deliveryTime))}', - //'05 Aug 20 - 10:00 AM', - style: TextStyle(fontWeight: FontWeight.bold)), ], ) ], diff --git a/lib/widgets/delivery/delivery_action_button.dart b/lib/widgets/delivery/delivery_action_button.dart index 4e05314..3571218 100644 --- a/lib/widgets/delivery/delivery_action_button.dart +++ b/lib/widgets/delivery/delivery_action_button.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -class delivery_info_button extends StatelessWidget { +class DeliveryInfoButton extends StatelessWidget { final Color btnColor; final Icon btnIcon; final Function btnFunction; final String btnName; - delivery_info_button( + DeliveryInfoButton( {this.btnColor, this.btnIcon, this.btnFunction, this.btnName}); @override Widget build(BuildContext context) { @@ -16,8 +16,14 @@ class delivery_info_button extends StatelessWidget { child: Column( children: [ SizedBox( - height: 50, - width: 60, // specific value + height: MediaQuery + .of(context) + .size + .width * 0.14, + width: MediaQuery + .of(context) + .size + .width * 0.165, // specific value child: RaisedButton( padding: EdgeInsets.only(left: 2), color: btnColor, @@ -29,7 +35,10 @@ class delivery_info_button extends StatelessWidget { ), ), SizedBox( - height: 10, + height: MediaQuery + .of(context) + .size + .width * 0.05, ), Text( btnName, diff --git a/lib/widgets/delivery/package_content.dart b/lib/widgets/delivery/package_content.dart index 0958b98..46f93aa 100644 --- a/lib/widgets/delivery/package_content.dart +++ b/lib/widgets/delivery/package_content.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -class package_content extends StatelessWidget { +class packageContent extends StatelessWidget { final String packageName; final String packageCount; - package_content({this.packageName, this.packageCount}); + packageContent({this.packageName, this.packageCount}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index f4d69a0..98a990c 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -15,6 +15,7 @@ class AppScaffold extends StatelessWidget { final Widget bottomSheet; final Color titleColor; final Color arrowColor; + final Color appBarColor; AppScaffold( {@required this.body, @@ -24,14 +25,16 @@ class AppScaffold extends StatelessWidget { this.baseViewModel, this.bottomSheet, this.titleColor, - this.arrowColor}); + this.arrowColor, + this.appBarColor, + }); @override Widget build(BuildContext context) { AppGlobal.context = context; return SafeArea( child: Scaffold( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, + backgroundColor: appBarColor ?? Theme.of(context).scaffoldBackgroundColor, appBar: isShowAppBar ? AppBar( elevation: 0,