diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f9869e3a..2100a65d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -388,7 +388,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -538,7 +538,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -576,7 +576,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = VL68C36HYS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 8abff7a5..c23a16a5 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 19 + 20 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart index 3c522edb..d35fec90 100644 --- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart +++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart @@ -94,13 +94,10 @@ class ChatRoomCubit extends Cubit { ), ); - if (chatRoom.chosenPlan?.consultantId == chatRoom.users.receiver.id) { + if (chosenPlan?.consultantId == chatRoom.users.sender.id) { await checkCards(); } - if (sendInitialMessage) { - await chatRepository.sendMessage(chatId: chatId, data: 'Здравствуйте, хочу заказать у вас: ${chosenPlan?.plan.name ?? 'план'}'); - } } catch (e) { log(e.toString()); typingSubscription?.cancel(); diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart index 537aa9e9..72c97a6d 100644 --- a/lib/features/chat/presentation/pages/chat_screen.dart +++ b/lib/features/chat/presentation/pages/chat_screen.dart @@ -105,7 +105,7 @@ class _ChatScreenState extends State { } else if (!amIConsultant && (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateStartDateHasBeenSet || chosenPlan.chosenPlanState == ChosenPlanStateEnum.statePendingPayment)) { bannerType = BannerType.payment; - } else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone) { + } else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone && amIConsultant) { bannerType = BannerType.collectCharge; } else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateLastDayFinished && !amIConsultant) { bannerType = BannerType.finishPlan; @@ -303,17 +303,17 @@ class _ChatScreenState extends State { }, ), ), - if (bannerType != null) - Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), - child: NotificationBanner( - bannerType: bannerType, - chosenPlanId: chosenPlan?.id, - planName: chosenPlan?.plan.name, - planPrice: chosenOption?.price.toDouble(), - ), - ), ], + if (bannerType != null) + Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: NotificationBanner( + bannerType: bannerType, + chosenPlanId: chosenPlan?.id, + planName: chosenPlan?.plan.name, + planPrice: chosenOption?.price.toDouble(), + ), + ), ], ), ), diff --git a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart index 834f0e58..0752847b 100644 --- a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart +++ b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart @@ -1,4 +1,5 @@ import 'package:collection/collection.dart'; +import 'package:eatvio_app/core/const.dart'; import 'package:eatvio_app/core/theme/custom_text_style.dart'; import 'package:eatvio_app/core/theme/theme_helper.dart'; import 'package:eatvio_app/core/widgets/custom_divider.dart'; @@ -73,7 +74,7 @@ class _ConsultationCardWidgetState extends State { children: [ CircleAvatar( radius: 30, - backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl), + backgroundImage: NetworkImage(baseUrl + widget.consultationsModel.userProfilePhotoUrl), ), const SizedBox(width: 12), Column( diff --git a/lib/features/consultations/services/consultation_service.dart b/lib/features/consultations/services/consultation_service.dart index e80f96fc..e670d54a 100644 --- a/lib/features/consultations/services/consultation_service.dart +++ b/lib/features/consultations/services/consultation_service.dart @@ -9,9 +9,17 @@ class ConsultationService { Future getConsultations() async { try { - final response = await dio.get( - '/api/consultations', - ); + final response = await dio.get('/api/consultations', queryParameters: { + 'filters[last_state][\$notIn][]': const [ + 'initied', + 'in_coordination', + 'start_date_has_been_set', + 'pending_payment', + 'canceled_by_the_initiator', + 'charge_was_collected', + ], + 'sort[]': 'created_at:desc' + }); return ConsultationPaginationModel.fromJson(response.data); } catch (e) { rethrow; diff --git a/lib/features/diary/presentation/widgets/calendar_widget.dart b/lib/features/diary/presentation/widgets/calendar_widget.dart index bc55d33a..2d584eb2 100644 --- a/lib/features/diary/presentation/widgets/calendar_widget.dart +++ b/lib/features/diary/presentation/widgets/calendar_widget.dart @@ -89,7 +89,9 @@ class _CalendarWidgetState extends State { return isSameDay(_selectedDay, day); }, onPageChanged: (focusedDay) { - _focusedDay = focusedDay; + setState(() { + _focusedDay = focusedDay; + }); }, onFormatChanged: (format) { if (_calendarFormat != format) { diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index 64c7dda7..9f9ba779 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -964,7 +964,7 @@ class _ProfileScreenState extends State { context.pushTransparentRoute( rootNavigator: true, PhotoViewScreen( - imageUrls: [state.profile.profilePhotoUrl], + imageUrls: [baseUrl + state.profile.profilePhotoUrl], index: 0, ), ); diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart index 5956f579..e3113e78 100644 --- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart +++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart @@ -59,7 +59,7 @@ class RegistrationCubit extends Cubit { ); await TokenStorage.saveTokenInStorage(token); AppRouter.navigatorKey.currentContext?.go('/feed-screen'); - AppRouter.navigatorKey.currentContext?.goNamed('verifyEmailScreen'); + AppRouter.navigatorKey.currentContext?.pushNamed('verifyEmailScreen'); } catch (e) { log(e.toString()); }