diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 3ca2e86..2e3a4c5 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -1,7 +1,7 @@ import 'package:barcode_scan/platform_wrapper.dart'; import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart'; -import 'package:driverapp/pages/delivery/information_page.dart'; +import 'package:driverapp/pages/delivery/InformationPage.dart'; import 'package:driverapp/pages/orders/pending_orders_page.dart'; import 'package:driverapp/uitl/app_toast.dart'; import 'package:driverapp/uitl/utils.dart'; diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/DeliveryConfirmedPage.dart similarity index 74% rename from lib/pages/delivery/delivery_confirmed_page.dart rename to lib/pages/delivery/DeliveryConfirmedPage.dart index 1f5919c..9332477 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/DeliveryConfirmedPage.dart @@ -1,5 +1,5 @@ import 'package:driverapp/widgets/buttons/secondary_button.dart'; -import 'package:driverapp/widgets/delivery/customer_brief_card.dart'; +import 'package:driverapp/widgets/delivery/CustomerBriefCard.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,7 +16,7 @@ class DeliveryConfirmedPage extends StatelessWidget { return AppScaffold( body: SafeArea( child: Container( - color: Color(0xff41bdbb), + color: Theme.of(context).disabledColor, child: ListView( children: [ Column( @@ -41,12 +41,10 @@ class DeliveryConfirmedPage extends StatelessWidget { children: [ Container( width: MediaQuery.of(context).size.width, - //300, height: MediaQuery.of(context).size.width * 0.7, - //300, padding: EdgeInsets.only( top: MediaQuery.of(context).size.width * - 0.2, //60, + 0.2, ), decoration: BoxDecoration( color: Colors.white10, @@ -84,8 +82,8 @@ 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, @@ -110,16 +108,6 @@ class DeliveryConfirmedPage extends StatelessWidget { ), child: Column( children: [ -// Container( -// margin: EdgeInsets.all(10), -// child: SecondaryButton( -// color: Colors.orangeAccent, -// label: TranslationBase.of(context).addNoteBtn, -// icon: Icon(Icons.mode_edit), -// small: true, -// onTap: () {}, -// ), -// ), FlatButton.icon( padding: EdgeInsets.all(8), color: Colors.orangeAccent, @@ -143,39 +131,11 @@ class DeliveryConfirmedPage extends StatelessWidget { ), Container( margin: EdgeInsets.all(10), -// height: MediaQuery.of(context).size.height *0.08, child: SecondaryButton( label: TranslationBase.of(context) .nextDelivery, onTap: () {}, ), -// 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) -// .nextDelivery, -// style: TextStyle(color: Colors.white), -// ), -// onPressed: () {}, -// ), ), ], ), diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/InformationPage.dart similarity index 88% rename from lib/pages/delivery/information_page.dart rename to lib/pages/delivery/InformationPage.dart index 3d55ab0..db84f70 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/InformationPage.dart @@ -1,8 +1,8 @@ -import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; +import 'package:driverapp/pages/delivery/DeliveryConfirmedPage.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:driverapp/widgets/delivery/CustomerBriefCard.dart'; +import 'package:driverapp/widgets/delivery/DeliveryActionButton.dart'; +import 'package:driverapp/widgets/delivery/PackageContent.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -18,14 +18,14 @@ class InformationPage extends StatelessWidget { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, - appBarColor: Color(0xff3ABBBA), + appBarColor: Theme.of(context).disabledColor, arrowColor: Colors.white, titleColor: Colors.white, appBarTitle: TranslationBase.of(context).deliveryInfo, body: Container( - color: Color(0xff3ABBBA), + color: Theme.of(context).disabledColor, child: Container( - color: Color(0xff3ABBBA), + color: Theme.of(context).disabledColor, child: ListView( children: [ Column( @@ -36,28 +36,26 @@ class InformationPage extends StatelessWidget { width: MediaQuery .of(context) .size - .width, //400, + .width, height: MediaQuery .of(context) .size - .width, //500, + .width, ), 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.23, //100 + .width * 0.23, ), decoration: BoxDecoration( color: Theme.of(context).scaffoldBackgroundColor, @@ -72,7 +70,7 @@ class InformationPage extends StatelessWidget { height: MediaQuery .of(context) .size - .width * 0.53, //170, + .width * 0.53, ), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -112,7 +110,7 @@ class InformationPage extends StatelessWidget { btnFunction: () {}, ), deliveryInfoButton( - btnColor: Color(0xff41bdbb), + btnColor: Theme.of(context).disabledColor, btnIcon: Icon( Icons.phone, size: 30, @@ -129,18 +127,18 @@ class InformationPage extends StatelessWidget { height: MediaQuery .of(context) .size - .width * 0.1, //30, + .width * 0.1, ), Container( margin: EdgeInsets.only( left: MediaQuery .of(context) .size - .width * 0.05, //15, + .width * 0.05, right: MediaQuery .of(context) .size - .width * 0.05, //15 + .width * 0.05, ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -160,7 +158,7 @@ class InformationPage extends StatelessWidget { height: MediaQuery .of(context) .size - .width * 0.05, //20, + .width * 0.05, ), Padding( padding: const EdgeInsets.only(left: 10), @@ -168,12 +166,11 @@ class InformationPage extends StatelessWidget { children: List.generate( item.itemsQuantitiesList.length, (index) { - return package_content( + return packageContent( packageName: item .itemsQuantitiesList[index] .itemName .toString(), - //'Panadol Extra 50 tablet', packageCount: item .itemsQuantitiesList[index] .quantity @@ -186,7 +183,7 @@ class InformationPage extends StatelessWidget { height: MediaQuery .of(context) .size - .width * 0.01, //10, + .width * 0.01, ), ], ), @@ -195,11 +192,10 @@ class InformationPage extends StatelessWidget { height: MediaQuery .of(context) .size - .width * 0.1, //30, + .width * 0.1, ), Container( margin: EdgeInsets.all(10), -// height: MediaQuery.of(context).size.height *0.08, child: SecondaryButton( label: TranslationBase.of(context).clientReached, onTap: () { diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 7d42558..3d41564 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -1,5 +1,5 @@ -import 'package:driverapp/pages/delivery/delivery_confirmed_page.dart'; -import 'package:driverapp/pages/delivery/information_page.dart'; +import 'package:driverapp/pages/delivery/DeliveryConfirmedPage.dart'; +import 'package:driverapp/pages/delivery/InformationPage.dart'; import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:driverapp/widgets/drawer/app_drawer_widget.dart'; diff --git a/lib/pages/orders/pending_orders_page.dart b/lib/pages/orders/pending_orders_page.dart index b01d301..3b8d39d 100644 --- a/lib/pages/orders/pending_orders_page.dart +++ b/lib/pages/orders/pending_orders_page.dart @@ -1,5 +1,5 @@ import 'package:driverapp/core/viewModels/orders_view_model.dart'; -import 'package:driverapp/pages/delivery/information_page.dart'; +import 'package:driverapp/pages/delivery/InformationPage.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:driverapp/widgets/others/rounded_container.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/CustomerBriefCard.dart similarity index 84% rename from lib/widgets/delivery/customer_brief_card.dart rename to lib/widgets/delivery/CustomerBriefCard.dart index 23c1530..a92c775 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/CustomerBriefCard.dart @@ -58,9 +58,10 @@ class CustomerBrief extends StatelessWidget { children: [ Expanded( flex: 3, - child: Text('ID: ${itemId}', style: TextStyle( - color: Color(0xFFADACAD) - ),), + child: Text( + 'ID: ${itemId}', + style: TextStyle(color: Color(0xFFADACAD)), + ), ), Expanded( child: CircleAvatar( @@ -97,7 +98,8 @@ class CustomerBrief extends StatelessWidget { ), Text( 'Olaya street, behind KFC resturant, next to kingdom towers 2nd floor ofice 277', - style: TextStyle(color: Color(0xFF464748),fontWeight: FontWeight.w600), + style: TextStyle( + color: Color(0xFF464748), fontWeight: FontWeight.w600), ), SizedBox( height: 10, @@ -122,9 +124,7 @@ class CustomerBrief extends StatelessWidget { Expanded( flex: 2, child: Text( - TranslationBase - .of(context) - .payment, + TranslationBase.of(context).payment, textAlign: TextAlign.start, ), ), @@ -133,7 +133,7 @@ class CustomerBrief extends StatelessWidget { ), Expanded( child: Text( - totalPayment.toString(), //'SAR 70', + totalPayment.toString(), textAlign: TextAlign.end, style: TextStyle(fontWeight: FontWeight.w600), ), @@ -148,22 +148,13 @@ class CustomerBrief extends StatelessWidget { Expanded( flex: 1, child: Text( - TranslationBase - .of(context) - .delivryTime, + TranslationBase.of(context).delivryTime, textAlign: TextAlign.start, ), ), -// SizedBox( -// width: 50, -// ), Expanded( child: Text( - '${DateUtil.getMonthDayYearDateFormatted( - DateUtil.convertStringToDate( - deliveryTime))} ${(DateUtil - .convertStringToHours(deliveryTime))}', - //'05 Aug 20 - 10:00 AM', + '${DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(deliveryTime))} ${(DateUtil.convertStringToHours(deliveryTime))}', textAlign: TextAlign.end, style: TextStyle(fontWeight: FontWeight.w600)), ), diff --git a/lib/widgets/delivery/delivery_action_button.dart b/lib/widgets/delivery/DeliveryActionButton.dart similarity index 74% rename from lib/widgets/delivery/delivery_action_button.dart rename to lib/widgets/delivery/DeliveryActionButton.dart index adea467..aaeeb32 100644 --- a/lib/widgets/delivery/delivery_action_button.dart +++ b/lib/widgets/delivery/DeliveryActionButton.dart @@ -16,8 +16,14 @@ class deliveryInfoButton 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 deliveryInfoButton 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/PackageContent.dart similarity index 85% rename from lib/widgets/delivery/package_content.dart rename to lib/widgets/delivery/PackageContent.dart index 0958b98..46f93aa 100644 --- a/lib/widgets/delivery/package_content.dart +++ b/lib/widgets/delivery/PackageContent.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) {