From ef318464f1416d133aebf588fbe50c3195cf3956 Mon Sep 17 00:00:00 2001 From: MhdZiadHirati Date: Tue, 24 Oct 2023 15:40:53 +0300 Subject: [PATCH] ui fixes --- .../presentation_layer/screens/account.dart | 18 +++++++++++++++ .../screens/card_details.dart | 23 +++++++------------ .../widgets/appointment_widget.dart | 2 +- .../widgets/card_service.dart | 2 +- .../chat/presentation_layer/screens/chat.dart | 6 ++++- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/lib/features/account/presentation_layer/screens/account.dart b/lib/features/account/presentation_layer/screens/account.dart index a57c8b8..d0e39c4 100644 --- a/lib/features/account/presentation_layer/screens/account.dart +++ b/lib/features/account/presentation_layer/screens/account.dart @@ -190,6 +190,24 @@ class AccountScreen extends StatelessWidget { icon: "privacy.svg", title: "go_to_support".tr, ).onTap(() async { + if (authController.isGuest.value) { + Get.defaultDialog( + title: '', + content: Column( + children: [ + BoldTextWidget('you_have_to_sign_in'.tr), + const SizedBox( + height: 20, + ), + ButtonWidget( + onTap: () { + RoutingManager.off(RouteName.login); + }, + title: 'sign_in'.tr) + ], + )); + return; + } await chatController.checkSupportRoomStatus(onSuccess: (room) { room?.type = RoomType.support; RoutingManager.to(RouteName.chatDetails, arguments: room); diff --git a/lib/features/card/presentation_layer/screens/card_details.dart b/lib/features/card/presentation_layer/screens/card_details.dart index e1db407..8615e0d 100644 --- a/lib/features/card/presentation_layer/screens/card_details.dart +++ b/lib/features/card/presentation_layer/screens/card_details.dart @@ -64,12 +64,13 @@ class CardDetailsScreen extends StatelessWidget { ), SizedBox( height: 280, - child: ListView.separated( + child: ListView.builder( physics: const BouncingScrollPhysics(), itemCount: 12, itemBuilder: (context, index) { DateTime dateTime = Utils.generateRandomDateTime(); return AppointmentWidget(dateTime: dateTime) + .paddingOnly(bottom: 16) .onTap(() { homeController.scheduleAnAppointment( Appointment( @@ -83,9 +84,6 @@ class CardDetailsScreen extends StatelessWidget { }); }); }, - separatorBuilder: (context, index) { - return const Divider(); - }, ).paddingOnly(left: 8, right: 8, top: 8, bottom: 8), ), const SizedBox( @@ -108,14 +106,11 @@ class CardDetailsScreen extends StatelessWidget { borderRadius: BorderRadius.circular(20)), contentPadding: EdgeInsets.zero, actionsPadding: EdgeInsets.zero, - title: RegularTextWidget( - "appointment".tr, - textAlign: TextAlign.center, - fontSize: 14, + title: HeaderScreen( + ' ${"appointment".tr}', ), content: AppointmentDetails( - dateTime: - homeController.currentCardAppointment.value!.dateTime), + appointment: homeController.currentCardAppointment.value!), ); }); } @@ -161,9 +156,6 @@ class CardDetailsScreen extends StatelessWidget { CardInformation(cardModel: cardModel) .paddingSymmetric( horizontal: Responsive.isTablet() ? 0 : 5, vertical: 5) - // .paddingOnly( - // left: Responsive.isTablet() ? 8 : 0, - // ) .paddingOnly( left: homeController.isArabic.value ? 0 : 3, right: homeController.isArabic.value ? 3 : 0, @@ -347,8 +339,9 @@ class CardDetailsScreen extends StatelessWidget { } }, title: "start_conversation".tr, + fontSize: 13, child: SvgPicture.asset("assets/icons/message.svg"), - ).expanded(2); + ).expanded(Responsive.isTablet() ? 1 : 5); }), ), if (Responsive.isTablet()) @@ -361,7 +354,7 @@ class CardDetailsScreen extends StatelessWidget { onTap: () { appointmentDialog(context); }, - fontSize: 12, + fontSize: 13, color: AppColors.secondaryColor, title: 'you_have_an_appointment'.tr, child: const Icon( diff --git a/lib/features/card/presentation_layer/widgets/appointment_widget.dart b/lib/features/card/presentation_layer/widgets/appointment_widget.dart index 3faf2be..87cac5a 100644 --- a/lib/features/card/presentation_layer/widgets/appointment_widget.dart +++ b/lib/features/card/presentation_layer/widgets/appointment_widget.dart @@ -22,7 +22,7 @@ class AppointmentWidget extends StatelessWidget { ), child: SizedBox( width: 100, - height: 40, + height: 50, child: Row( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/features/card/presentation_layer/widgets/card_service.dart b/lib/features/card/presentation_layer/widgets/card_service.dart index 2a5d8c8..b1f9730 100644 --- a/lib/features/card/presentation_layer/widgets/card_service.dart +++ b/lib/features/card/presentation_layer/widgets/card_service.dart @@ -25,7 +25,7 @@ class CardServiceWidget extends StatelessWidget { //width: Responsive.isTablet() ? Get.width * 0.3 : null, SizedBox( width: width ?? - (Responsive.isTablet() ? Get.width * 0.334 : Get.width * 0.669), + (Responsive.isTablet() ? Get.width * 0.3 : Get.width * 0.669), child: RegularTextWidget( cardModel.services, maxLines: maxLines, diff --git a/lib/features/chat/presentation_layer/screens/chat.dart b/lib/features/chat/presentation_layer/screens/chat.dart index 1d6c8ab..80a5284 100644 --- a/lib/features/chat/presentation_layer/screens/chat.dart +++ b/lib/features/chat/presentation_layer/screens/chat.dart @@ -18,9 +18,10 @@ class ChatScreen extends StatelessWidget { Timer? debouncer; TextEditingController searchFieldController = TextEditingController(); ScrollController scrollController = ScrollController(); - String lastDate = 'today'.tr; + @override Widget build(BuildContext context) { + String lastDate = 'today'.tr; if (chatController.rooms.result.data.isEmpty) { chatController.getRooms(); } @@ -56,6 +57,9 @@ class ChatScreen extends StatelessWidget { SearchBarWidget( controller: searchFieldController, onChanged: (value) { + if (value == '') { + lastDate = 'today'.tr; + } if (debouncer?.isActive ?? false) { debouncer!.cancel(); }