From 6f0e83b95b10ef564469fce65a15714f0bfde1bc Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Wed, 23 Jul 2025 14:08:57 +0300 Subject: [PATCH] fix UI depend on the new design --- .../screens/booking_system_page.dart | 60 +++++++++---------- .../widgets/booking_appbar_widget.dart | 5 +- .../widgets/past_booking_widget.dart | 2 +- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/lib/features/booking_system/presentation/screens/booking_system_page.dart b/lib/features/booking_system/presentation/screens/booking_system_page.dart index d4dbe26..57a668b 100644 --- a/lib/features/booking_system/presentation/screens/booking_system_page.dart +++ b/lib/features/booking_system/presentation/screens/booking_system_page.dart @@ -26,41 +26,35 @@ class BookingSystemPage extends StatelessWidget { ..add(GetPastBookingsEvent()), ) ], - child: DefaultScaffold( - appBar: BookingAppBar(), - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 20, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 10), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + flex: 2, + child: CurrentBalanceWidget( + userBalance: HomeCubit.user!.points == null + ? '0' + : HomeCubit.user!.points.toString(), ), - Expanded( - flex: 2, - child: CurrentBalanceWidget( - userBalance: HomeCubit.user!.points == null - ? '0' - : HomeCubit.user!.points.toString(), - ), + ), + SizedBox( + height: 20, + ), + Expanded( + flex: 8, + child: Column( + children: [ + UpcomingBookingsWidget(), + SizedBox( + height: 10, + ), + PastBookingsWidget(), + ], ), - SizedBox( - height: 20, - ), - Expanded( - flex: 8, - child: Column( - children: [ - UpcomingBookingsWidget(), - SizedBox( - height: 10, - ), - PastBookingsWidget(), - ], - ), - ) - ], - ), + ) + ], ), )); } diff --git a/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart b/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart index 7b8632e..679f535 100644 --- a/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart +++ b/lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart @@ -10,10 +10,7 @@ class BookingAppBar extends StatelessWidget implements PreferredSizeWidget { return AppBar( backgroundColor: Colors.transparent, centerTitle: true, - leading: IconButton( - onPressed: () => Navigator.pop(context), - icon: Icon(Icons.arrow_back_ios_new)), - title: Text( + leading: Text( 'Booking', style: TextStyle( color: ColorsManager.blueColor1, diff --git a/lib/features/booking_system/presentation/widgets/past_booking_widget.dart b/lib/features/booking_system/presentation/widgets/past_booking_widget.dart index dd13aa0..ab81974 100644 --- a/lib/features/booking_system/presentation/widgets/past_booking_widget.dart +++ b/lib/features/booking_system/presentation/widgets/past_booking_widget.dart @@ -39,7 +39,7 @@ class PastBookingsWidget extends StatelessWidget { ); } else if (state is PastBookingLoadedState) { return SizedBox( - height: deviceHeight(context) * 0.3, + height: deviceHeight(context) * 0.22, child: state.pastBookings.isEmpty ? Text('You Dont Have past Bookings') : ListView.separated(