diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/delivery_confirmed_page.dart index 894eb68..bf46ec7 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/delivery_confirmed_page.dart @@ -132,27 +132,28 @@ class DeliveryConfirmedPage extends StatelessWidget { : EdgeInsets.only(top: 30.0), child: Column( children: [ - FlatButton.icon( - padding: EdgeInsets.all(14.0), - color: Colors.orangeAccent, - shape: RoundedRectangleBorder( - 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: () {}, - ), - SizedBox( - height: MediaQuery.of(context).size.width * - 0.00, //20, - ), + // TODO return add note when its needed + // FlatButton.icon( + // padding: EdgeInsets.all(14.0), + // color: Colors.orangeAccent, + // shape: RoundedRectangleBorder( + // 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: () {}, + // ), + // SizedBox( + // height: MediaQuery.of(context).size.width * + // 0.00, //20, + // ), Padding( padding: const EdgeInsets.only(top: 30.0), child: Container( diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index b3d4406..4a51523 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -3,9 +3,6 @@ import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart'; import 'package:flutter/material.dart'; -import '../../uitl/date_uitl.dart'; -import '../../uitl/translations_delegate_base.dart'; - class CustomerBriefCard extends StatelessWidget { final int itemId; final String time; @@ -44,7 +41,7 @@ class CustomerBriefCard extends StatelessWidget { width: MediaQuery.of(context).orientation == Orientation.landscape ? MediaQuery.of(context).size.width * 0.9 : MediaQuery.of(context).size.width * 0.9, - height: SizeConfig.heightMultiplier * 33.0, // TODO make it responsive + height: SizeConfig.heightMultiplier * 30.0, // TODO make it responsive decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( @@ -125,64 +122,6 @@ class CustomerBriefCard extends StatelessWidget { SizedBox( height: 10, ), - 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, - ), - Column( - children: [ - Row( - children: [ - Expanded( - flex: 2, - child: Text( - TranslationBase.of(context).payment, - textAlign: TextAlign.start, - ), - ), - SizedBox( - width: 170, - ), - Expanded( - child: Text( - totalPayment.toString(), - textAlign: TextAlign.end, - style: TextStyle(fontWeight: FontWeight.w400), - ), - ), - ], - ), - SizedBox( - height: MediaQuery.of(context).size.width * 0.03, - ), - Row( - children: [ - Expanded( - flex: 1, - child: Text( - TranslationBase.of(context).delivryTime, - textAlign: TextAlign.start, - ), - ), - Expanded( - child: Text( - '${DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(deliveryTime))} ${(DateUtil.convertStringToHours(deliveryTime))}', - textAlign: TextAlign.end, - style: TextStyle(fontWeight: FontWeight.w400)), - ), - ], - ) - ], - ), ], ), ),