diff --git a/lib/pages/dashboard/dashboard_screen.dart b/lib/pages/dashboard/dashboard_screen.dart index 19d4ef3..f0fe1be 100644 --- a/lib/pages/dashboard/dashboard_screen.dart +++ b/lib/pages/dashboard/dashboard_screen.dart @@ -76,8 +76,9 @@ class _DashboardScreenState extends State { child: Text( _authenticationViewModel.user.userName, style: TextStyle( - fontWeight: FontWeight.w400, - fontSize: 25.0), + fontSize: 22.0, + color: Hexcolor("#343333"), + fontWeight: FontWeight.bold), ), ), ], @@ -465,12 +466,11 @@ class _DashboardScreenState extends State { Column( children: [ Text( - TranslationBase.of(context).nearestDropOffs, - style: TextStyle( - fontSize: 21.0, - fontWeight: FontWeight.w400, - ), - ), + TranslationBase.of(context).nearestDropOffs, + style: TextStyle( + fontSize: 18.0, + color: Hexcolor("#343333"), + fontWeight: FontWeight.bold)), ], ), if (model.state == ViewState.Idle) @@ -515,7 +515,7 @@ class _DashboardScreenState extends State { : model.orders.length < 3 ? model.orders.length : 3, itemBuilder: (BuildContext context, int index) { return Padding( - padding: EdgeInsets.symmetric(horizontal: 12.2), + padding: EdgeInsets.symmetric(horizontal: 0.2), child: InkWell( child: Container( child: RoundedContainer( @@ -626,7 +626,7 @@ class _DashboardScreenState extends State { Padding( padding: EdgeInsets.all(8.0), child: CircleContainer( - borderWidth: 0.9, + borderWidth: 1.5, child: Text( model.orders[index].distanceInKilometers .toString() + diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/information_page.dart index 84787c7..6860891 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/information_page.dart @@ -1,400 +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/buttons/secondary_button.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 'package:maps_launcher/maps_launcher.dart'; -import 'package:url_launcher/url_launcher.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) { - showDeliveryOptions(OrdersViewModel model) { - showModalBottomSheet( - backgroundColor: Colors.white, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(50.0), - topRight: Radius.circular(50.0), - ), - ), - context: context, - builder: (BuildContext bc) { - return ListView( - children: [ - Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(50.0), - topRight: Radius.circular(50.0), - ), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - SizedBox( - height: 10, - ), - Center( - child: Texts( - TranslationBase.of(context).selectAction, - color: Colors.black, - fontSize: 22, - ), - ), - SizedBox( - height: 10, - ), - FractionallySizedBox( - widthFactor: MediaQuery.of(context).orientation == - Orientation.portrait - ? 0.9 - : 0.98, - child: Container( - height: MediaQuery.of(context).size.height * 0.45, - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(50.0), - topRight: Radius.circular(50.0), - ), - ), - width: double.infinity, - child: ListView( - children: [ - Column( - children: [ - SizedBox( - height: 3, - child: Container( - color: Hexcolor("#D5D5D5"), - ), - ), - SizedBox( - height: 15, - ), - ActionSheetButton( - label: - TranslationBase.of(context).delivered, - icon: DriverApp.deliverd_icon, - onTap: () { - selectAction(context, 3, model); - }, - ), - SizedBox(height: 15), - ActionSheetButton( - label: TranslationBase.of(context) - .deliveredAccepted, - icon: DriverApp.not_available, - onTap: () { - selectAction(context, 4, model); - }, - ), - SizedBox(height: 15), - ActionSheetButton( - label: TranslationBase.of(context) - .deliveredRejected, - icon: DriverApp.rejected_icon, - onTap: () { - selectAction(context, 5, model); - }, - ), - SizedBox(height: 15), - ActionSheetButton( - label: - TranslationBase.of(context).canceled, - icon: DriverApp.not_reachable_icon, - onTap: () { - selectAction(context, 6, model); - }, - ), - SizedBox(height: 15), - ], - ), - ], - ), - )) - ], - ), - ), - ], - ); - }); - } - - return BaseView( - builder: (_, model, w) => AppScaffold( - isShowAppBar: true, - appBarColor: Color(0xff45B7AE), - arrowColor: Colors.white, - titleColor: Colors.white, - appBarTitle: TranslationBase.of(context).deliveryInfo, - body: Container( - color: Colors.red, - child: Container( - color: Color(0xff45B7AE), - 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).orientation == - Orientation.portrait - ? MediaQuery.of(context).size.width * 1.9 - : MediaQuery.of(context).size.width * 1.1, - margin: EdgeInsets.only( - top: MediaQuery.of(context).orientation == - Orientation.portrait - ? MediaQuery.of(context).size.width * 0.23 - : MediaQuery.of(context).size.width * 0.13), - 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.4, - //MediaQuery.of(context).size.width * 0.005, - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - DeliveryInfoButton( - btnColor: Colors.white, //Color(0xffED1C24), - btnIcon: Icon(DriverApp.location_1, - size: MediaQuery.of(context) - .orientation == - Orientation.portrait - ? 50 - : 90, - color: Color(0xffED1C24)), - btnName: - TranslationBase.of(context).location, - btnFunction: () { - MapsLauncher.launchCoordinates( - item.latitude, item.longitude); - }, - ), - DeliveryInfoButton( - btnColor: Colors.white, //Color(0xFF61B260), - btnIcon: Icon( - DriverApp.whatsapp, - size: - MediaQuery.of(context).orientation == - Orientation.portrait - ? 50 - : 90, - color: Color(0xFF5EA34A), - ), - btnName: 'Whatsapp', - btnFunction: () {}, - ), - DeliveryInfoButton( - btnColor: Colors.white, //Color(0xFFFCB657), - btnIcon: Icon( - DriverApp.message, - size: - MediaQuery.of(context).orientation == - Orientation.portrait - ? 50 - : 90, - color: Color(0xffFFA540), - ), - btnName: TranslationBase.of(context).sms, - btnFunction: () {}, - ), - DeliveryInfoButton( - btnColor: Colors - .white, //Theme.of(context).primaryColor, - btnIcon: Icon( - DriverApp.call, - size: - MediaQuery.of(context).orientation == - Orientation.portrait - ? 50 - : 90, - color: Theme.of(context).primaryColor, - ), - btnName: TranslationBase.of(context).call, - btnFunction: () => - launch("tel://" + item.mobileNumber), - ), - ], - ), - SizedBox( - height: - MediaQuery.of(context).size.width * 0.08, - ), - 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 != null - ? item - .itemsQuantitiesList.length - : 0, (index) { - return packageContent( - packageName: item - .itemsQuantitiesList[index] - .itemName - .toString(), - packageCount: item - .itemsQuantitiesList[index] - .quantity - .toString(), - ); - }), - ), - ), - ], - ), - ), - SizedBox( - height: MediaQuery.of(context).size.width * 0.1, - ), - Container( - child: SecondaryButton( - label: - TranslationBase.of(context).clientReached, - onTap: () { - showDeliveryOptions(model); - }, - ), - ), - ], - ), - ), - CustomerBriefCard( - itemId: item.orderID, - customerFirstName: item.firstName, - customerLastName: item.lastName, - mobileNo: item.mobileNumber, - totalPayment: item.amount, - deliveryTime: item.orderCreatedOn, - longitude: item.longitude, - latitude: item.latitude, - ), - ], - ), - ], - ), - ], - ), - ), - ), - ), - ); - } - - selectAction(BuildContext context, orderStatus, OrdersViewModel model) { - String orderStatusText; - this.orderStatus = orderStatus; - switch (orderStatus) { - case 3: - orderStatusText = TranslationBase.of(context).delivered; - break; - case 4: - orderStatusText = TranslationBase.of(context).deliveredAccepted; - break; - case 5: - orderStatusText = TranslationBase.of(context).deliveredRejected; - break; - case 6: - orderStatusText = TranslationBase.of(context).canceled; - 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.pushReplacement( - context, - MaterialPageRoute( - builder: (context) => DeliveryConfirmedPage(item), - ), - ); - } - } -} +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/buttons/secondary_button.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 'package:maps_launcher/maps_launcher.dart'; import 'package:url_launcher/url_launcher.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) { showDeliveryOptions(OrdersViewModel model) { showModalBottomSheet( backgroundColor: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.only( topLeft: Radius.circular(50.0), topRight: Radius.circular(50.0), ), ), context: context, builder: (BuildContext bc) { return ListView( children: [ Container( decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( topLeft: Radius.circular(50.0), topRight: Radius.circular(50.0), ), ), child: Column( mainAxisSize: MainAxisSize.min, children: [ SizedBox( height: 10, ), Center( child: Texts( TranslationBase.of(context).selectAction, color: Colors.black, fontSize: 22, ), ), SizedBox( height: 10, ), FractionallySizedBox( widthFactor: MediaQuery.of(context).orientation == Orientation.portrait ? 0.9 : 0.98, child: Container( height: MediaQuery.of(context).size.height * 0.45, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.only( topLeft: Radius.circular(50.0), topRight: Radius.circular(50.0), ), ), width: double.infinity, child: ListView( children: [ Column( children: [ SizedBox( height: 3, child: Container( color: Hexcolor("#D5D5D5"), ), ), SizedBox( height: 15, ), ActionSheetButton( label: TranslationBase.of(context).delivered, icon: DriverApp.deliverd_icon, onTap: () { selectAction(context, 3, model); }, ), SizedBox(height: 15), ActionSheetButton( label: TranslationBase.of(context) .deliveredAccepted, icon: DriverApp.not_available, onTap: () { selectAction(context, 4, model); }, ), SizedBox(height: 15), ActionSheetButton( label: TranslationBase.of(context) .deliveredRejected, icon: DriverApp.rejected_icon, onTap: () { selectAction(context, 5, model); }, ), SizedBox(height: 15), ActionSheetButton( label: TranslationBase.of(context).canceled, icon: DriverApp.not_reachable_icon, onTap: () { selectAction(context, 6, model); }, ), SizedBox(height: 15), ], ), ], ), )) ], ), ), ], ); }); } return BaseView( builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBarColor: Color(0xff45B7AE), arrowColor: Colors.white, titleColor: Colors.white, appBarTitle: TranslationBase.of(context).deliveryInfo, body: Container( color: Colors.red, child: Container( color: Color(0xff45B7AE), 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).orientation == Orientation.portrait ? MediaQuery.of(context).size.width * 1.9 : MediaQuery.of(context).size.width * 1.1, margin: EdgeInsets.only( top: MediaQuery.of(context).orientation == Orientation.portrait ? MediaQuery.of(context).size.width * 0.23 : MediaQuery.of(context).size.width * 0.13), 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.4, //MediaQuery.of(context).size.width * 0.005, ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ DeliveryInfoButton( btnColor: Colors.white, //Color(0xffED1C24), btnIcon: Icon(DriverApp.location_1, size: MediaQuery.of(context) .orientation == Orientation.portrait ? 50 : 90, color: Color(0xffED1C24)), btnName: TranslationBase.of(context).location, btnFunction: () { MapsLauncher.launchCoordinates( item.latitude, item.longitude); }, ), DeliveryInfoButton( btnColor: Colors.white, //Color(0xFF61B260), btnIcon: Icon( DriverApp.whatsapp, size: MediaQuery.of(context).orientation == Orientation.portrait ? 50 : 90, color: Color(0xFF5EA34A), ), btnName: 'Whatsapp', btnFunction: () {}, ), DeliveryInfoButton( btnColor: Colors.white, //Color(0xFFFCB657), btnIcon: Icon( DriverApp.message, size: MediaQuery.of(context).orientation == Orientation.portrait ? 50 : 90, color: Color(0xffFFA540), ), btnName: TranslationBase.of(context).sms, btnFunction: () {}, ), DeliveryInfoButton( btnColor: Colors .white, //Theme.of(context).primaryColor, btnIcon: Icon( DriverApp.call, size: MediaQuery.of(context).orientation == Orientation.portrait ? 50 : 90, color: Theme.of(context).primaryColor, ), btnName: TranslationBase.of(context).call, btnFunction: () => launch("tel://" + item.mobileNumber), ), ], ), SizedBox( height: MediaQuery.of(context).size.width * 0.08, ), 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 != null ? item .itemsQuantitiesList.length : 0, (index) { return packageContent( packageName: item .itemsQuantitiesList[index] .itemName .toString(), packageCount: item .itemsQuantitiesList[index] .quantity .toString(), ); }), ), ), ], ), ), SizedBox( height: MediaQuery.of(context).size.width * 0.1, ), Container( child: SecondaryButton( label: TranslationBase.of(context).clientReached, onTap: () { showDeliveryOptions(model); }, ), ), ], ), ), CustomerBriefCard( itemId: item.orderID, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, totalPayment: item.amount, deliveryTime: item.orderCreatedOn, longitude: item.longitude, latitude: item.latitude, ), ], ), ], ), ], ), ), ), ), ); } selectAction(BuildContext context, orderStatus, OrdersViewModel model) { String orderStatusText; this.orderStatus = orderStatus; switch (orderStatus) { case 3: orderStatusText = TranslationBase.of(context).delivered; break; case 4: orderStatusText = TranslationBase.of(context).deliveredAccepted; break; case 5: orderStatusText = TranslationBase.of(context).deliveredRejected; break; case 6: orderStatusText = TranslationBase.of(context).canceled; 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.pushReplacement( context, MaterialPageRoute( builder: (context) => DeliveryConfirmedPage(item), ), ); } } } \ No newline at end of file diff --git a/lib/pages/orders/deliverd_orders_page.dart b/lib/pages/orders/deliverd_orders_page.dart index 7ea5dd3..6b652fc 100644 --- a/lib/pages/orders/deliverd_orders_page.dart +++ b/lib/pages/orders/deliverd_orders_page.dart @@ -1,6 +1,5 @@ import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/pages/delivery/information_page.dart'; -import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/widgets/data_display/circle-container.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:driverapp/widgets/others/rounded_container.dart'; @@ -23,10 +22,14 @@ class _DeliverdOrdersPageState extends State { builder: (BuildContext context, OrdersViewModel model, Widget child) => AppScaffold( isShowAppBar: true, - appBarTitle: TranslationBase.of(context).yourDeliveryQue, + appBarTitle: + "UnDelivered Packages " /*TranslationBase.of(context).yourDeliveryQue*/, titleColor: Colors.black, body: Column( children: [ + SizedBox( + height: 20, + ), Expanded( child: ListView.builder( shrinkWrap: true, @@ -116,7 +119,6 @@ class _DeliverdOrdersPageState extends State { Padding( padding: EdgeInsets.all(8.0), child: CircleContainer( - borderWidth: 0.8, child: Text( model.orders[index].distanceInKilometers .toString() + diff --git a/lib/pages/orders/pending_orders_page.dart b/lib/pages/orders/pending_orders_page.dart index 423a543..20d7d31 100644 --- a/lib/pages/orders/pending_orders_page.dart +++ b/lib/pages/orders/pending_orders_page.dart @@ -27,6 +27,9 @@ class _OrdersListScreenState extends State { titleColor: Colors.black, body: Column( children: [ + SizedBox( + height: 20, + ), Expanded( child: ListView.builder( shrinkWrap: true, @@ -116,7 +119,6 @@ class _OrdersListScreenState extends State { Padding( padding: EdgeInsets.all(8.0), child: CircleContainer( - borderWidth: 0.8, child: Text( model.orders[index].distanceInKilometers .toString() + diff --git a/lib/widgets/data_display/circle-container.dart b/lib/widgets/data_display/circle-container.dart index 02efbdf..071de37 100644 --- a/lib/widgets/data_display/circle-container.dart +++ b/lib/widgets/data_display/circle-container.dart @@ -6,7 +6,7 @@ class CircleContainer extends StatelessWidget { {this.child, this.color = Colors.white, this.borderColor, - this.borderWidth = 2.0, + this.borderWidth = 1.5, this.onTap}); final Widget child; diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index a55bc3f..af08d68 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -76,7 +76,6 @@ class CustomerBriefCard extends StatelessWidget { child: Padding( padding: EdgeInsets.all(8.0), child: CircleContainer( - borderWidth: 0.9, child: Text( '0 K.m\naway', style: TextStyle( diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index b4cdec7..de00fca 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -33,7 +33,8 @@ class AppScaffold extends StatelessWidget { Widget build(BuildContext context) { AppGlobal.context = context; return SafeArea( - bottom: false, +// top: false, +// bottom: false, child: Scaffold( backgroundColor: appBarColor ?? Theme.of(context).scaffoldBackgroundColor, @@ -43,8 +44,8 @@ class AppScaffold extends StatelessWidget { backgroundColor: Theme.of(context).appBarTheme.color, textTheme: TextTheme( headline6: TextStyle( - color: titleColor ?? Colors.white, - fontWeight: FontWeight.bold), + color: titleColor ?? Colors.white, + fontWeight: FontWeight.bold), ), title: Text(appBarTitle.toUpperCase()), leading: Builder(