diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index d41230f4..0921f560 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -3,7 +3,7 @@ name: Eatvio App Android Test
on: [ pull_request ]
env:
- flutter_version: "3.38.1"
+ flutter_version: "3.38.5"
java_version: "21.x"
flutter_channel: "stable"
my_local_cache_dir: "/opt/hostedtoolcache/"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index e06b26ab..ad156380 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 = 87;
+ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -539,7 +539,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 87;
+ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -578,7 +578,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 87;
+ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 94c063d6..182a74af 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 87
+ $(FLUTTER_BUILD_NUMBER)
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 3a74adf3..52aa7ae8 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -48,8 +48,33 @@ platform :ios do
UI.message "Configuring Flutter for release mode..."
sh("cd .. && flutter build ios --config-only --release")
+ # Read build number from Flutter Generated.xcconfig
+ generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
+ flutter_build_number = nil
+
+ if File.exist?(generated_xcconfig_path)
+ File.foreach(generated_xcconfig_path) do |line|
+ matches = line.match(/FLUTTER_BUILD_NUMBER=(.*)/)
+ if matches
+ flutter_build_number = matches[1].strip
+ break
+ end
+ end
+ end
+
+ if flutter_build_number.nil?
+ UI.user_error!("Could not find FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
+ end
+
+ UI.message "Flutter build number: #{flutter_build_number}"
+
match(type: "appstore", readonly: true)
- increment_build_number(xcodeproj: "Runner.xcodeproj")
+
+ # Set build number explicitly instead of incrementing
+ increment_build_number(
+ xcodeproj: "Runner.xcodeproj",
+ build_number: flutter_build_number
+ )
build_app(
workspace: "Runner.xcworkspace",
@@ -74,7 +99,7 @@ platform :ios do
skip_submission: true,
distribute_external: false,
notify_external_testers: false,
- changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
+ changelog: "TestFlight build #{flutter_build_number}",
verbose: true
)
rescue => ex
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index 47f25430..776aea35 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -1,3 +1,4 @@
+import 'dart:developer' as developer;
import 'package:eatvio_app/core/routing/auth_routes.dart';
import 'package:eatvio_app/core/routing/content_routes.dart';
import 'package:eatvio_app/core/routing/main_navigation_routes.dart';
@@ -13,6 +14,9 @@ import 'package:go_router/go_router.dart';
class AppRouter {
static GlobalKey navigatorKey = GlobalKey();
+ // Домены для deep links
+ static const List _deepLinkHosts = ['eatvio.ru', 'www.eatvio.ru'];
+
static GoRouter appRouter = GoRouter(
initialLocation: RouteConstants.updateScreen,
navigatorKey: navigatorKey,
@@ -27,51 +31,128 @@ class AppRouter {
);
/// Обработка редиректов для deep links
+ /// Возвращает null для обычной навигации, чтобы не мешать внутренним переходам
static String? _handleRedirect(BuildContext context, GoRouterState state) {
- final segments = state.uri.pathSegments;
- if (segments.length == 4) {
- final type = segments[1];
- switch (type) {
- case 'diary':
- FlutterNativeSplash.remove();
- return '/diary-screen';
- }
+ final uri = state.uri;
+ final host = uri.host.toLowerCase();
+ final segments = uri.pathSegments;
+
+ // Проверяем, является ли это deep link по домену
+ final isDeepLink = _deepLinkHosts.contains(host);
+
+ // Если это не deep link, не мешаем обычной навигации
+ if (!isDeepLink) {
+ return null;
}
- if (segments.length == 3) {
+
+ // Логирование для отладки
+ developer.log(
+ 'Deep link detected: host=$host, path=${uri.path}, segments=$segments',
+ name: 'AppRouter',
+ );
+
+ // Проверка на пустой путь или некорректный формат
+ if (segments.isEmpty) {
+ developer.log('Empty segments in deep link, redirecting to feed', name: 'AppRouter');
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
+ }
+
+ // Проверка языка (первый сегмент должен быть ru или en)
+ if (segments[0] != 'ru' && segments[0] != 'en') {
+ developer.log(
+ 'Invalid language segment: ${segments[0]}, redirecting to feed',
+ name: 'AppRouter',
+ );
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
+ }
+
+ // Обработка deep links с учетом языка
+ // Формат: /{lang}/{type}/{identifier?}
+ if (segments.length == 4) {
+ // Формат: /{lang}/diary/{...}
+ final type = segments[1];
+
+ if (type == 'diary') {
+ developer.log('Deep link: diary, redirecting to diary-screen', name: 'AppRouter');
+ FlutterNativeSplash.remove();
+ return RouteConstants.diaryScreen;
+ }
+
+ developer.log(
+ 'Unknown deep link type for 4 segments: $type, redirecting to feed',
+ name: 'AppRouter',
+ );
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
+ } else if (segments.length == 3) {
+ // Формат: /{lang}/{type}/{identifier}
final type = segments[1];
final contentIdentifier = segments[2];
switch (type) {
case 'recipe':
+ developer.log('Deep link: recipe/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
return '/about-recipes-screen?slug=$contentIdentifier';
case 'blog_post':
+ developer.log('Deep link: blog_post/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
return '/blog-post-screen?id=$contentIdentifier';
case 'plan':
+ developer.log('Deep link: plan/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
return '/about-plan-screen?slug=$contentIdentifier';
case 'diet':
+ developer.log('Deep link: diet/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
return '/about-diet-screen?slug=$contentIdentifier';
case 'chat':
+ developer.log('Deep link: chat/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
- return '/chat-select-screen';
+ return RouteConstants.chatSelectScreen;
case 'profile':
+ developer.log('Deep link: profile/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
return '/profile-screen?slug=$contentIdentifier';
- }
- }
- if (segments.length == 2) {
- final type = segments[1];
- switch (type) {
- case 'chat':
+ case 'diary':
+ developer.log('Deep link: diary/$contentIdentifier', name: 'AppRouter');
FlutterNativeSplash.remove();
- return '/chat-select-screen';
+ return RouteConstants.diaryScreen;
+ default:
+ developer.log(
+ 'Unknown deep link type: $type, redirecting to feed',
+ name: 'AppRouter',
+ );
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
}
+ } else if (segments.length == 2) {
+ // Формат: /{lang}/{type} - только для chat
+ final type = segments[1];
+
+ if (type == 'chat') {
+ developer.log('Deep link: chat', name: 'AppRouter');
+ FlutterNativeSplash.remove();
+ return RouteConstants.chatSelectScreen;
+ } else {
+ developer.log(
+ 'Unknown deep link type for 2 segments: $type, redirecting to feed',
+ name: 'AppRouter',
+ );
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
+ }
+ } else {
+ // Неизвестный формат deep link
+ developer.log(
+ 'Unknown deep link format: ${segments.length} segments, redirecting to feed',
+ name: 'AppRouter',
+ );
+ FlutterNativeSplash.remove();
+ return RouteConstants.feedScreen;
}
-
- return null;
}
static void navigateToRegisterViaSocial({required AuthResultEntity authResult, required String provider}) {
diff --git a/lib/core/di/cubit_registrations.dart b/lib/core/di/cubit_registrations.dart
index e01596f8..d5b109e4 100644
--- a/lib/core/di/cubit_registrations.dart
+++ b/lib/core/di/cubit_registrations.dart
@@ -76,7 +76,7 @@ class CubitRegistrations {
/// Регистрация Cubit'ов как фабрик
static void _registerFactoryCubits() {
// Auth related cubits
- sl.registerFactory(() => AuthCubit(authRepository: sl()));
+ sl.registerFactory(() => AuthCubit(authRepository: sl(), firebaseApi: sl(), prefs: sl(), profileRepository: sl()));
sl.registerFactory(() => RegistrationCubit(registrationRepository: sl(), prefs: sl()));
sl.registerFactory(() => ResetPasswordCubit(resetPasswordRepository: sl()));
sl.registerFactory(() => VerifyEmailCubit(profileRepository: sl()));
diff --git a/lib/core/di/repository_registrations.dart b/lib/core/di/repository_registrations.dart
index fbbb4498..341691a5 100644
--- a/lib/core/di/repository_registrations.dart
+++ b/lib/core/di/repository_registrations.dart
@@ -17,6 +17,7 @@ import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
+import 'package:eatvio_app/features/barcode/repositories/barcode_repository.dart';
import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart';
import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart';
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
@@ -55,6 +56,7 @@ class RepositoryRegistrations {
sl.registerLazySingleton(() => ConsultantRepository(consultantService: sl()));
sl.registerLazySingleton(() => DiaryRepository(diaryService: sl()));
sl.registerLazySingleton(() => GlossaryRepository(glossaryService: sl()));
+ sl.registerLazySingleton(() => BarcodeRepository(barcodeService: sl(), dio: sl()));
sl.registerLazySingleton(() => DietRepository(dietsService: sl()));
sl.registerLazySingleton(() => PlansRepository(plansService: sl()));
sl.registerLazySingleton(() => PlanRepository(planService: sl()));
diff --git a/lib/core/di/service_registrations.dart b/lib/core/di/service_registrations.dart
index f70e28ce..62439f4a 100644
--- a/lib/core/di/service_registrations.dart
+++ b/lib/core/di/service_registrations.dart
@@ -19,6 +19,7 @@ import 'package:eatvio_app/features/diary/services/diary_service.dart';
import 'package:eatvio_app/features/diets/services/diet_service.dart';
import 'package:eatvio_app/features/feed/services/feed_service.dart';
import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
+import 'package:eatvio_app/features/barcode/services/barcode_service.dart';
import 'package:eatvio_app/features/menu/services/blocked_users_service.dart';
import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
@@ -56,6 +57,7 @@ class ServiceRegistrations {
sl.registerLazySingleton(() => ConsultantService(sl()));
sl.registerLazySingleton(() => DiaryService(sl()));
sl.registerLazySingleton(() => GlossaryService(sl()));
+ sl.registerLazySingleton(() => BarcodeService(sl()));
sl.registerLazySingleton(() => DietService(sl()));
sl.registerLazySingleton(() => PlansService(sl()));
sl.registerLazySingleton(() => PlanService(sl()));
diff --git a/lib/core/routing/other_routes.dart b/lib/core/routing/other_routes.dart
index 1110f88a..28d85d36 100644
--- a/lib/core/routing/other_routes.dart
+++ b/lib/core/routing/other_routes.dart
@@ -1,11 +1,9 @@
import 'package:dio/dio.dart';
import 'package:eatvio_app/core/app_config.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/prefs_keys.dart';
import 'package:eatvio_app/core/routing/route_constants.dart';
-import 'package:eatvio_app/core/token_storage.dart';
import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
@@ -59,23 +57,14 @@ class OtherRoutes {
redirect: (context, state) async {
try {
final prefs = sl();
- final firebaseApi = sl();
- final welcomeScreenWasShowed = prefs.getBool(PrefsKeys.welcomeScreenWasShowed) ?? false;
- await firebaseApi.registerPushToken();
+ final welcomeScreenWasShowed = prefs.getBool(PrefsKeys.welcomeScreenWasShowed) ?? false;
if (!welcomeScreenWasShowed) {
return null;
- } else if (await TokenStorage.haveTokenInStorage()) {
- return '/feed-screen';
} else {
- final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
- if (!hasAnonymousTokenBeenSent) {
- await firebaseApi.registerAnonymousPushToken();
- prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
- }
return '/auth-screen';
}
} catch (e) {
- return '/feed-screen';
+ return '/auth-screen';
}
},
),
@@ -247,7 +236,7 @@ class OtherRoutes {
GoRoute(
path: PersonalDietSuggestionScreen.path,
name: PersonalDietSuggestionScreen.name,
- builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int,),
+ builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int),
),
];
}
diff --git a/lib/features/auth/models/oauth_verification_confirm_request.dart b/lib/features/auth/models/oauth_verification_confirm_request.dart
new file mode 100644
index 00000000..88101ab2
--- /dev/null
+++ b/lib/features/auth/models/oauth_verification_confirm_request.dart
@@ -0,0 +1,27 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'oauth_verification_confirm_request.freezed.dart';
+part 'oauth_verification_confirm_request.g.dart';
+
+@freezed
+abstract class OAuthVerificationConfirmRequest with _$OAuthVerificationConfirmRequest {
+ const factory OAuthVerificationConfirmRequest({
+ @JsonKey(name: 'access_token') required String accessToken,
+ @JsonKey(name: 'refresh_token') required String refreshToken,
+ @JsonKey(name: 'client_id') required String clientId,
+ required String provider,
+ required String id,
+ String? email,
+ String? phone,
+ required String code,
+ @JsonKey(name: 'verification_type') required String verificationType,
+ @JsonKey(name: 'first_name') required String firstName,
+ @JsonKey(name: 'last_name') required String lastName,
+ @JsonKey(name: 'date_of_birth') required String dateOfBirth,
+ required String gender,
+ required int weight,
+ required int height,
+ }) = _OAuthVerificationConfirmRequest;
+
+ factory OAuthVerificationConfirmRequest.fromJson(Map json) => _$OAuthVerificationConfirmRequestFromJson(json);
+}
diff --git a/lib/features/auth/models/oauth_verification_confirm_response.dart b/lib/features/auth/models/oauth_verification_confirm_response.dart
new file mode 100644
index 00000000..85badaed
--- /dev/null
+++ b/lib/features/auth/models/oauth_verification_confirm_response.dart
@@ -0,0 +1,36 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'oauth_verification_confirm_response.freezed.dart';
+part 'oauth_verification_confirm_response.g.dart';
+
+@freezed
+abstract class OAuthVerificationConfirmResponse with _$OAuthVerificationConfirmResponse {
+ const factory OAuthVerificationConfirmResponse({
+ required bool success,
+ required String message,
+ required String token,
+ required Map user,
+ @JsonKey(name: 'is_new_user') required bool isNewUser,
+ }) = _OAuthVerificationConfirmResponse;
+
+ factory OAuthVerificationConfirmResponse.fromJson(Map json) => _$OAuthVerificationConfirmResponseFromJson(json);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/features/auth/models/oauth_verification_request_response.dart b/lib/features/auth/models/oauth_verification_request_response.dart
new file mode 100644
index 00000000..3525051e
--- /dev/null
+++ b/lib/features/auth/models/oauth_verification_request_response.dart
@@ -0,0 +1,30 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'oauth_verification_request_response.freezed.dart';
+part 'oauth_verification_request_response.g.dart';
+
+@freezed
+abstract class OAuthVerificationRequestResponse with _$OAuthVerificationRequestResponse {
+ const factory OAuthVerificationRequestResponse({required String email, required String status}) = _OAuthVerificationRequestResponse;
+
+ factory OAuthVerificationRequestResponse.fromJson(Map json) => _$OAuthVerificationRequestResponseFromJson(json);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart b/lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart
index 6f1a59f5..4e3c7db9 100644
--- a/lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart
+++ b/lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart
@@ -1,15 +1,26 @@
import 'dart:developer';
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
import 'package:eatvio_app/core/token_storage.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_state.dart';
import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
+import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:go_router/go_router.dart';
class AuthCubit extends Cubit {
final AuthRepository authRepository;
+ final ProfileRepository profileRepository;
+ final FirebaseApi firebaseApi;
+ final Prefs prefs;
- AuthCubit({required this.authRepository}) : super(const AuthState());
+ AuthCubit({required this.authRepository, required this.prefs, required this.profileRepository, required this.firebaseApi}) : super(const AuthState());
Future getTokenByCredentials(String email, String password) async {
emit(const AuthState.loading());
@@ -25,4 +36,32 @@ class AuthCubit extends Cubit {
return false;
}
}
+
+ Future initializeUser() async {
+ await registerAnonymousPushToken();
+ if (await TokenStorage.haveTokenInStorage()) {
+ final profile = await profileRepository.getMyProfile();
+ if (profile.emailVerifiedAt != null) {
+ await registerPushToken();
+ AppRouter.navigatorKey.currentContext?.go(RouteConstants.feedScreen);
+ return;
+ }
+ AppRouter.navigatorKey.currentContext?.go(RouteConstants.verifyEmailScreen);
+ } else {
+ await registerAnonymousPushToken();
+ FlutterNativeSplash.remove();
+ }
+ }
+
+ Future registerAnonymousPushToken() async {
+ final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
+ if (!hasAnonymousTokenBeenSent) {
+ await firebaseApi.registerAnonymousPushToken();
+ prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
+ }
+ }
+
+ Future registerPushToken() async {
+ await firebaseApi.registerPushToken();
+ }
}
diff --git a/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart b/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart
index b4f78b4a..daf156a8 100644
--- a/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart
+++ b/lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart
@@ -3,6 +3,7 @@ import 'package:dio/dio.dart';
import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart';
import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -28,6 +29,19 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin {
log('OAuthCubit: Got token model: ${tokenModel.token}');
TokenStorage.saveTokenInStorage(tokenModel.token);
emit(OAuthState.loaded(token: tokenModel.token));
+ } on DioException catch (e) {
+ log('OAuthCubit: Error occurred: $e');
+ // Проверяем, является ли ошибка ошибкой валидации email/phone
+ final errors = e.response?.data['errors'] as Map?;
+ final emailErrors = errors?['email'] as List?;
+ final phoneErrors = errors?['phone'] as List?;
+
+ if ((emailErrors != null && emailErrors.isNotEmpty) || (phoneErrors != null && phoneErrors.isNotEmpty)) {
+ // Это ошибка валидации - нужно показать экран подтверждения
+ emit(const OAuthState.error(errorMessage: 'validation_error'));
+ } else {
+ emit(OAuthState.error(errorMessage: e.toString()));
+ }
} catch (e) {
log('OAuthCubit: Error occurred: $e');
emit(OAuthState.error(errorMessage: e.toString()));
@@ -77,16 +91,22 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin {
final dateOfBirth = errors?['date_of_birth'] as List?;
final errorsList = [];
if (emailErrors != null && emailErrors.isNotEmpty) {
- if (emailErrors.contains('Некорректный формат email')) {
- errorsList.add(RegistrationValidationErrors.incorrectEmailFormat);
- }
- if (emailErrors.contains('Такой Эл. почта уже существует.')) {
- errorsList.add(RegistrationValidationErrors.emailExist);
+ for (final error in emailErrors) {
+ final errorStr = error.toString();
+ if (errorStr.contains('Некорректный формат email')) {
+ errorsList.add(RegistrationValidationErrors.incorrectEmailFormat);
+ }
+ if (errorStr.contains('почта уже существует') || errorStr.contains('Эл. почта уже существует')) {
+ errorsList.add(RegistrationValidationErrors.emailExist);
+ }
}
}
if (phoneErrors != null && phoneErrors.isNotEmpty) {
- if (phoneErrors.contains('Такой phone уже существует.')) {
- errorsList.add(RegistrationValidationErrors.phoneExist);
+ for (final error in phoneErrors) {
+ final errorStr = error.toString();
+ if (errorStr.contains('phone уже существует') || errorStr.contains('телефон уже существует')) {
+ errorsList.add(RegistrationValidationErrors.phoneExist);
+ }
}
}
if (dateOfBirth != null && dateOfBirth.isNotEmpty) {
@@ -101,6 +121,71 @@ class OAuthCubit extends Cubit with RegistrationDateCacheMixin {
return null;
}
+
+ Future requestOAuthVerification({String? email, String? phone}) async {
+ try {
+ emit(const OAuthState.loading());
+ log('OAuthCubit: Requesting verification code for email: $email, phone: $phone');
+ final response = await authRepository.requestOAuthVerification(email: null, phone: phone);
+ if (response != null) {
+ log('OAuthCubit: Verification code requested successfully, masked email: ${response.email}');
+ }
+ // Сбрасываем состояние после успешного запроса кода
+ emit(const OAuthState());
+ return response;
+ } catch (e) {
+ log('OAuthCubit: Error requesting verification code: $e');
+ emit(OAuthState.error(errorMessage: e.toString()));
+ return null;
+ }
+ }
+
+ Future confirmOAuthVerification({
+ required String provider,
+ required String accessToken,
+ required String refreshToken,
+ required String clientId,
+ required String id,
+ String? email,
+ String? phone,
+ required String code,
+ required String verificationType,
+ required String firstName,
+ required String lastName,
+ required String dateOfBirth,
+ required String gender,
+ required int weight,
+ required int height,
+ }) async {
+ try {
+ emit(const OAuthState.loading());
+ log('OAuthCubit: Confirming OAuth verification - provider: $provider, verificationType: $verificationType, code: $code');
+ final response = await authRepository.confirmOAuthVerification(
+ provider: provider,
+ accessToken: accessToken,
+ refreshToken: refreshToken,
+ clientId: clientId,
+ id: id,
+ email: email,
+ phone: phone,
+ code: code,
+ verificationType: verificationType,
+ firstName: firstName,
+ lastName: lastName,
+ dateOfBirth: dateOfBirth,
+ gender: gender,
+ weight: weight,
+ height: height,
+ );
+ log('OAuthCubit: OAuth verification confirmed successfully, token received');
+ TokenStorage.saveTokenInStorage(response.token);
+ emit(OAuthState.loaded(token: response.token));
+ } catch (e) {
+ log('OAuthCubit: Error confirming OAuth verification: $e');
+ emit(OAuthState.error(errorMessage: e.toString()));
+ rethrow; // Пробрасываем ошибку дальше, чтобы UI мог её обработать
+ }
+ }
}
enum RegistrationValidationErrors { incorrectEmailFormat, emailExist, phoneExist, incorrectDateOfBirthFormat }
diff --git a/lib/features/auth/presentation/pages/auth_screen.dart b/lib/features/auth/presentation/pages/auth_screen.dart
index 0220c9fb..bf9074d9 100644
--- a/lib/features/auth/presentation/pages/auth_screen.dart
+++ b/lib/features/auth/presentation/pages/auth_screen.dart
@@ -28,7 +28,6 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -232,9 +231,8 @@ class _AuthScreenState extends State {
final bool useMobileLayout = shortestSide < 600;
if (!useMobileLayout) isFocused = true;
final s = S.of(context);
- FlutterNativeSplash.remove();
return BlocProvider(
- create: (BuildContext context) => authCubit,
+ create: (BuildContext context) => authCubit..initializeUser(),
child: BlocBuilder(
builder: (BuildContext context, AuthState state) {
return Scaffold(
diff --git a/lib/features/auth/presentation/pages/forget_password_screen.dart b/lib/features/auth/presentation/pages/forget_password_screen.dart
index d842fcfc..911805c8 100644
--- a/lib/features/auth/presentation/pages/forget_password_screen.dart
+++ b/lib/features/auth/presentation/pages/forget_password_screen.dart
@@ -1,166 +1,124 @@
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/core/utils/toasts.dart';
-import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
-import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-
-class ForgetPasswordScreen extends StatefulWidget {
- final bool isAuth;
- const ForgetPasswordScreen({super.key, required this.isAuth});
-
- @override
- State createState() => _ForgetPasswordScreenState();
-}
-
-class _ForgetPasswordScreenState extends State {
- final emailController = TextEditingController();
- final codeController = TextEditingController();
- final passwordController = TextEditingController();
- final passwordConfirmController = TextEditingController();
-
- @override
- Widget build(BuildContext context) {
- return BlocProvider(
- create: (BuildContext context) => sl(),
- child: BlocConsumer(
- builder: (BuildContext context, ResetPasswordState state) {
- return Scaffold(
- appBar: AppBar(
- title: widget.isAuth ? const Text('Смена пароля') : const Text('Восстановление пароля'),
- centerTitle: false,
- ),
- body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
- ? const Center(
- child: CircularProgressIndicator(),
- )
- : Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
- Text(
- '${widget.isAuth ? '' : 'Забыли пароль? '}Укажите свой email,\nи мы пришлём код для сброса.',
- style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w500,
- ),
- ),
- const SizedBox(height: 24),
- const Text(
- 'E-mail',
- style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w500,
- ),
- ),
- const SizedBox(height: 4),
- CustomTextFormField(
- controller: emailController,
- hintText: 'Введите e-mail',
- ),
- ],
- if (state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError) ...[
- const Text(
- 'Код',
- style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w500,
- ),
- ),
- const SizedBox(height: 4),
- CustomTextFormField(
- controller: codeController,
- hintText: 'Введите код',
- ),
- const SizedBox(height: 12),
- const Text(
- 'Пароль',
- style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w500,
- ),
- ),
- const SizedBox(height: 4),
- CustomTextFormField(
- controller: passwordController,
- hintText: 'Введите новый пароль',
- ),
- const SizedBox(height: 12),
- const Text(
- 'Подтвердите пароль',
- style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w500,
- ),
- ),
- const SizedBox(height: 4),
- CustomTextFormField(
- controller: passwordConfirmController,
- hintText: 'Введите новый пароль',
- ),
- ],
- const Spacer(),
- InkWell(
- onTap: () {
- if (state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError) {
- context.read().tryResetPassword(
- emailController.text,
- codeController.text,
- passwordController.text,
- passwordConfirmController.text,
- );
- } else {
- context.read().trySendEmailCode(emailController.text);
- }
- },
- borderRadius: BorderRadius.circular(20),
- child: Ink(
- width: MediaQuery.of(context).size.width - 32,
- padding: const EdgeInsets.all(16),
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(20),
- color: appTheme.blueA400,
- ),
- child: Center(
- child: Text(
- state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError
- ? 'Сменить пароль'
- : 'Сбросить пароль',
- style: const TextStyle(
- fontSize: 18,
- fontWeight: FontWeight.w600,
- color: Colors.white,
- ),
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- );
- },
- listener: (BuildContext context, ResetPasswordState state) {
- if (state is ResetPasswordStateCodeSendSuccess) {
- showSuccessToast('Код на почту успешно отправлен');
- }
- if (state is ResetPasswordStateCodeSendError) {
- showErrorToast('Ошибка отправки кода. Проверьте правильность ввёдной почты');
- }
- if (state is ResetPasswordStateResetPasswordError) {
- showErrorToast('Ошибка смены пароля. Проверьте правильность ввёднного кода и совпадение пароля');
- }
- if (state is ResetPasswordStateResetPassowrdSuccess) {
- GoRouter.of(context).pop();
- showSuccessToast('Пароль успешно сменён. ${widget.isAuth ? '' : 'Войдите в аккаунт'}');
- }
- },
- ),
- );
- }
-}
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
+import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+
+class ForgetPasswordScreen extends StatefulWidget {
+ final bool isAuth;
+ const ForgetPasswordScreen({super.key, required this.isAuth});
+
+ @override
+ State createState() => _ForgetPasswordScreenState();
+}
+
+class _ForgetPasswordScreenState extends State {
+ final emailController = TextEditingController();
+ final codeController = TextEditingController();
+ final passwordController = TextEditingController();
+ final passwordConfirmController = TextEditingController();
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocProvider(
+ create: (BuildContext context) => sl(),
+ child: BlocConsumer(
+ builder: (BuildContext context, ResetPasswordState state) {
+ return Scaffold(
+ appBar: AppBar(title: widget.isAuth ? const Text('Смена пароля') : const Text('Восстановление пароля'), centerTitle: false),
+ body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
+ ? const Center(child: CircularProgressIndicator())
+ : Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
+ Text(
+ '${widget.isAuth ? '' : 'Забыли пароль? '}Укажите свой email,\nи мы пришлём код для сброса.',
+ style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
+ ),
+ const SizedBox(height: 24),
+ const Text('E-mail', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
+ const SizedBox(height: 4),
+ CustomTextFormField(controller: emailController, hintText: 'Введите e-mail'),
+ ],
+ if (state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError) ...[
+ const Text('Код', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
+ const SizedBox(height: 4),
+ CustomTextFormField(controller: codeController, hintText: 'Введите код'),
+ const SizedBox(height: 12),
+ const Text('Пароль', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
+ const SizedBox(height: 4),
+ CustomTextFormField(
+ controller: passwordController,
+ hintText: 'Введите новый пароль',
+ inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s'))],
+ ),
+ const SizedBox(height: 12),
+ const Text('Подтвердите пароль', style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500)),
+ const SizedBox(height: 4),
+ CustomTextFormField(
+ controller: passwordConfirmController,
+ hintText: 'Введите новый пароль',
+ inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s'))],
+ ),
+ ],
+ const Spacer(),
+ InkWell(
+ onTap: () {
+ if (state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError) {
+ context.read().tryResetPassword(
+ emailController.text,
+ codeController.text,
+ passwordController.text,
+ passwordConfirmController.text,
+ );
+ } else {
+ context.read().trySendEmailCode(emailController.text);
+ }
+ },
+ borderRadius: BorderRadius.circular(20),
+ child: Ink(
+ width: MediaQuery.of(context).size.width - 32,
+ padding: const EdgeInsets.all(16),
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
+ child: Center(
+ child: Text(
+ state is ResetPasswordStateCodeSendSuccess || state is ResetPasswordStateResetPasswordError
+ ? 'Сменить пароль'
+ : 'Сбросить пароль',
+ style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ },
+ listener: (BuildContext context, ResetPasswordState state) {
+ if (state is ResetPasswordStateCodeSendSuccess) {
+ showSuccessToast('Код на почту успешно отправлен');
+ }
+ if (state is ResetPasswordStateCodeSendError) {
+ showErrorToast('Ошибка отправки кода. Проверьте правильность ввёдной почты');
+ }
+ if (state is ResetPasswordStateResetPasswordError) {
+ showErrorToast('Ошибка смены пароля. Проверьте правильность ввёднного кода и совпадение пароля');
+ }
+ if (state is ResetPasswordStateResetPassowrdSuccess) {
+ GoRouter.of(context).pop();
+ showSuccessToast('Пароль успешно сменён. ${widget.isAuth ? '' : 'Войдите в аккаунт'}');
+ }
+ },
+ ),
+ );
+ }
+}
diff --git a/lib/features/auth/presentation/pages/register_via_social_screen.dart b/lib/features/auth/presentation/pages/register_via_social_screen.dart
index 1791e24e..4967930e 100644
--- a/lib/features/auth/presentation/pages/register_via_social_screen.dart
+++ b/lib/features/auth/presentation/pages/register_via_social_screen.dart
@@ -1,3 +1,4 @@
+import 'dart:developer';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -49,6 +50,8 @@ class _RegisterViaSocialScreenState extends State {
bool weightError = false;
bool heightError = false;
bool incorrectEmailFormatError = false;
+ bool showVerificationButton = false;
+ String? verificationType; // 'email' or 'phone'
// Состояние для выбора пола
bool isMaleSelected = true;
@@ -221,7 +224,28 @@ class _RegisterViaSocialScreenState extends State {
hasError: emailExistError || incorrectEmailFormatError,
onChanged: (newValue) {},
),
- if (emailExistError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Такая почта уже существует.')],
+ if (emailExistError) ...[
+ const SizedBox(height: 4),
+ const ValidationErrorWidget(error: 'Такая почта уже существует.'),
+ if (showVerificationButton && verificationType == 'email') ...[
+ const SizedBox(height: 12),
+ InkWell(
+ borderRadius: BorderRadius.circular(20),
+ onTap: () => _handleVerificationRequest(context, 'email'),
+ child: Ink(
+ width: MediaQuery.of(context).size.width - 32,
+ height: 52,
+ decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(20)),
+ child: const Center(
+ child: Text(
+ 'Да, это мой аккаунт, подтвердить',
+ style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ],
if (incorrectEmailFormatError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Некорректный формат email')],
const SizedBox(height: 12),
const Text('Номер телефона'),
@@ -235,7 +259,28 @@ class _RegisterViaSocialScreenState extends State {
hasError: phoneExistError,
onChanged: (newValue) {},
),
- if (phoneExistError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Такой номер телефона уже существует.')],
+ if (phoneExistError) ...[
+ const SizedBox(height: 4),
+ const ValidationErrorWidget(error: 'Такой номер телефона уже существует.'),
+ if (showVerificationButton && verificationType == 'phone') ...[
+ const SizedBox(height: 12),
+ InkWell(
+ borderRadius: BorderRadius.circular(20),
+ onTap: () => _handleVerificationRequest(context, 'phone'),
+ child: Ink(
+ width: MediaQuery.of(context).size.width - 32,
+ height: 52,
+ decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(20)),
+ child: const Center(
+ child: Text(
+ 'Да, это мой аккаунт, подтвердить',
+ style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ],
const SizedBox(height: 12),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -293,7 +338,13 @@ class _RegisterViaSocialScreenState extends State {
children: [
const Text('Вес'),
const SizedBox(height: 4),
- CustomTextFormField(controller: weightController, hintText: 'Введите вес', onChanged: (newValue) {}, hasError: weightError),
+ CustomTextFormField(
+ controller: weightController,
+ hintText: 'Введите вес',
+ keyboardType: TextInputType.number,
+ onChanged: (newValue) {},
+ hasError: weightError,
+ ),
if (weightError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Вес должен быть от 30 до 300 кг')],
],
),
@@ -306,7 +357,13 @@ class _RegisterViaSocialScreenState extends State {
children: [
const Text('Рост'),
const SizedBox(height: 4),
- CustomTextFormField(controller: heightController, hintText: 'Введите рост', onChanged: (newValue) {}, hasError: heightError),
+ CustomTextFormField(
+ controller: heightController,
+ hintText: 'Введите рост',
+ keyboardType: TextInputType.number,
+ onChanged: (newValue) {},
+ hasError: heightError,
+ ),
if (heightError) ...[const SizedBox(height: 4), const ValidationErrorWidget(error: 'Рост должен быть от 100 до 250 см')],
],
),
@@ -501,6 +558,10 @@ class _RegisterViaSocialScreenState extends State {
clientId: clientID,
);
if (errors != null) {
+ bool hasEmailExist = false;
+ bool hasPhoneExist = false;
+
+ // Сначала определяем, какие ошибки присутствуют
for (final error in errors) {
switch (error) {
case RegistrationValidationErrors.incorrectEmailFormat:
@@ -509,14 +570,10 @@ class _RegisterViaSocialScreenState extends State {
});
break;
case RegistrationValidationErrors.emailExist:
- setState(() {
- emailExistError = true;
- });
+ hasEmailExist = true;
break;
case RegistrationValidationErrors.phoneExist:
- setState(() {
- phoneExistError = true;
- });
+ hasPhoneExist = true;
break;
case RegistrationValidationErrors.incorrectDateOfBirthFormat:
setState(() {
@@ -525,8 +582,236 @@ class _RegisterViaSocialScreenState extends State {
break;
}
}
+
+ // Устанавливаем verificationType согласно правилам:
+ // - Если оба (email и phone) существуют -> 'email'
+ // - Если только email -> 'email'
+ // - Если только phone -> 'phone'
+ if (hasEmailExist || hasPhoneExist) {
+ setState(() {
+ emailExistError = hasEmailExist;
+ phoneExistError = hasPhoneExist;
+ showVerificationButton = true;
+ if (hasEmailExist && hasPhoneExist) {
+ verificationType = 'email'; // Если оба существуют, используем email
+ } else if (hasEmailExist) {
+ verificationType = 'email'; // Только email
+ } else {
+ verificationType = 'phone'; // Только phone
+ }
+ });
+ }
+
+ // Если есть ошибки, возвращаемся и не показываем toast об успехе
return;
}
+ // Регистрация успешна только если нет ошибок
showSuccessToast('Регистрация успешна');
}
+
+ Future _handleVerificationRequest(BuildContext context, String type) async {
+ try {
+ // Используем service locator для доступа к OAuthCubit
+ final oauthCubit = CubitRegistrations.sl();
+ // Всегда передаем и email и phone
+ final String email = emailController.text;
+ final String phone = phoneController.text.replaceAll(RegExp(r'[^\d+]'), '');
+
+ final response = await oauthCubit.requestOAuthVerification(email: email, phone: phone);
+
+ if (response != null && context.mounted) {
+ // Показываем диалог для ввода кода
+ final displayText = response.email;
+ _showVerificationCodeDialog(context, type, displayText);
+ } else if ((emailController.text.isEmpty || phoneController.text.isEmpty) && context.mounted) {
+ showErrorToast('Пожалуйста, заполните все поля');
+ } else if (context.mounted) {
+ showErrorToast('Не удалось отправить код верификации');
+ }
+ } catch (e) {
+ if (context.mounted) {
+ showErrorToast('Ошибка: ${e.toString()}');
+ }
+ }
+ }
+
+ void _showVerificationCodeDialog(BuildContext context, String verificationType, String displayText) {
+ final List focusNodes = List.generate(4, (_) => FocusNode());
+ final List controllers = List.generate(4, (_) => TextEditingController());
+
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (dialogContext) => AlertDialog(
+ title: const Text('Подтверждение аккаунта'),
+ content: SingleChildScrollView(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text('Код отправлен на $displayText'),
+ const SizedBox(height: 20),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ children: List.generate(4, (index) {
+ return SizedBox(
+ width: 50,
+ child: TextField(
+ controller: controllers[index],
+ focusNode: focusNodes[index],
+ textAlign: TextAlign.center,
+ keyboardType: TextInputType.number,
+ maxLength: 1,
+ decoration: const InputDecoration(counterText: '', border: OutlineInputBorder()),
+ onChanged: (value) {
+ if (value.isNotEmpty && index < 3) {
+ focusNodes[index + 1].requestFocus();
+ }
+ if (value.isEmpty && index > 0) {
+ focusNodes[index - 1].requestFocus();
+ }
+ // Проверяем, заполнен ли весь код
+ final code = controllers.map((c) => c.text).join();
+ if (code.length == 4) {
+ // Небольшая задержка перед отправкой, чтобы пользователь увидел последний символ
+ Future.delayed(const Duration(milliseconds: 100), () async {
+ if (dialogContext.mounted && context.mounted) {
+ await _handleVerificationConfirm(context, dialogContext, verificationType, code, controllers, focusNodes);
+ }
+ });
+ }
+ },
+ ),
+ );
+ }),
+ ),
+ ],
+ ),
+ ),
+ actions: [
+ TextButton(
+ onPressed: () {
+ for (var controller in controllers) {
+ controller.dispose();
+ }
+ for (var node in focusNodes) {
+ node.dispose();
+ }
+ Navigator.of(dialogContext).pop();
+ },
+ child: const Text('Отмена'),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Future _handleVerificationConfirm(
+ BuildContext widgetContext,
+ BuildContext dialogContext,
+ String verificationType,
+ String code,
+ List controllers,
+ List focusNodes,
+ ) async {
+ try {
+ // Используем service locator для доступа к OAuthCubit, так как контекст из диалога может не иметь доступа к провайдеру
+ final oauthCubit = CubitRegistrations.sl();
+ final authResult = widget.authResult;
+
+ if (authResult == null) {
+ showErrorToast('Ошибка: данные авторизации не найдены');
+ return;
+ }
+
+ // Всегда передаем и email и phone (полный набор данных от провайдера)
+ // Используем данные из формы, если они есть, иначе из authResult
+ final String email = emailController.text.isNotEmpty ? emailController.text : (authResult.email ?? '');
+ final String phone = phoneController.text.isNotEmpty ? phoneController.text.replaceAll(RegExp(r'[^\d+]'), '') : (authResult.phone ?? '');
+
+ // Проверяем, что данные есть
+ if (email.isEmpty && phone.isEmpty) {
+ log('OAuth Verification Confirm: Both email and phone are empty');
+ showErrorToast('Ошибка: не указан email или телефон');
+ return;
+ }
+
+ // Проверяем, что все необходимые данные от провайдера есть
+ if (authResult.accessToken.isEmpty || authResult.clientId.isEmpty || authResult.userId.isEmpty) {
+ log('OAuth Verification Confirm: Missing required OAuth data');
+ showErrorToast('Ошибка: неполные данные авторизации');
+ return;
+ }
+
+ // Проверяем, что код не пустой
+ if (code.isEmpty || code.length != 4) {
+ showErrorToast('Введите полный код');
+ return;
+ }
+
+ // Получаем данные профиля из формы
+ final String firstName = firstNameController.text.isNotEmpty ? firstNameController.text : (authResult.firstName ?? '');
+ final String lastName = lastNameController.text.isNotEmpty ? lastNameController.text : (authResult.lastName ?? '');
+ final String dateOfBirth = dateOfBirthController.text.isNotEmpty ? dateOfBirthController.text : (authResult.birthDate ?? '');
+ final String gender = isMaleSelected ? 'male' : 'female';
+ final int weight = weightController.text.isNotEmpty ? (int.tryParse(weightController.text) ?? 0) : 0;
+ final int height = heightController.text.isNotEmpty ? (int.tryParse(heightController.text) ?? 0) : 0;
+
+ // Проверяем, что все обязательные поля заполнены
+ if (firstName.isEmpty || lastName.isEmpty || dateOfBirth.isEmpty || weight == 0 || height == 0) {
+ log('OAuth Verification Confirm: Missing required profile data');
+ showErrorToast('Ошибка: заполните все обязательные поля');
+ return;
+ }
+
+ // Логируем перед отправкой запроса
+ log('OAuth Verification Confirm: provider=${widget.provider}, verificationType=$verificationType, code=$code, email=$email, phone=$phone');
+
+ // Отправляем запрос на подтверждение с полным набором данных от провайдера
+ await oauthCubit.confirmOAuthVerification(
+ provider: widget.provider ?? 'social',
+ accessToken: authResult.accessToken,
+ refreshToken: authResult.refreshToken ?? '',
+ clientId: authResult.clientId,
+ id: authResult.userId,
+ email: email,
+ phone: phone,
+ code: code,
+ verificationType: verificationType,
+ firstName: firstName,
+ lastName: lastName,
+ dateOfBirth: dateOfBirth,
+ gender: gender,
+ weight: weight,
+ height: height,
+ );
+
+ // Закрываем диалог
+ for (var controller in controllers) {
+ controller.dispose();
+ }
+ for (var node in focusNodes) {
+ node.dispose();
+ }
+ if (dialogContext.mounted) {
+ Navigator.of(dialogContext).pop();
+ }
+
+ // Перезагружаем веб-сокет и переходим на главный экран
+ if (widgetContext.mounted) {
+ _reconnectWebSocket(widgetContext);
+ }
+ } catch (e, stackTrace) {
+ log('OAuth Verification Confirm Error: $e', error: e, stackTrace: stackTrace);
+ if (widgetContext.mounted) {
+ showErrorToast('Неверный код. Попробуйте снова.');
+ }
+ // Очищаем поля
+ for (var controller in controllers) {
+ controller.clear();
+ }
+ if (focusNodes.isNotEmpty) {
+ focusNodes[0].requestFocus();
+ }
+ }
+ }
}
diff --git a/lib/features/auth/repositories/auth_repository.dart b/lib/features/auth/repositories/auth_repository.dart
index a65f309c..eedd295a 100644
--- a/lib/features/auth/repositories/auth_repository.dart
+++ b/lib/features/auth/repositories/auth_repository.dart
@@ -1,6 +1,10 @@
+import 'dart:developer';
import 'package:eatvio_app/features/auth/models/credentials_model.dart';
import 'package:eatvio_app/features/auth/models/oauth_model.dart';
import 'package:eatvio_app/features/auth/models/oauth_login_request.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_request.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_response.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
import 'package:eatvio_app/features/auth/models/token_model.dart';
import 'package:eatvio_app/features/auth/services/auth_service.dart';
@@ -19,7 +23,6 @@ class AuthRepository {
}
}
-
Future signInViaSocialMedia({
required String provider,
required String accessToken,
@@ -73,4 +76,67 @@ class AuthRepository {
rethrow;
}
}
+
+ Future requestOAuthVerification({String? email, String? phone}) async {
+ try {
+ Map? body;
+ if (email != null) {
+ body = {'email': email};
+ } else if (phone != null) {
+ body = {'phone': phone};
+ }
+ if (body != null) {
+ return await authService.requestOAuthVerification(body: body);
+ }
+ return null;
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ Future confirmOAuthVerification({
+ required String provider,
+ required String accessToken,
+ required String refreshToken,
+ required String clientId,
+ required String id,
+ String? email,
+ String? phone,
+ required String code,
+ required String verificationType,
+ required String firstName,
+ required String lastName,
+ required String dateOfBirth,
+ required String gender,
+ required int weight,
+ required int height,
+ }) async {
+ try {
+ final request = OAuthVerificationConfirmRequest(
+ provider: provider,
+ accessToken: accessToken,
+ refreshToken: refreshToken,
+ clientId: clientId,
+ id: id,
+ email: email,
+ phone: phone,
+ code: code,
+ verificationType: verificationType,
+ firstName: firstName,
+ lastName: lastName,
+ dateOfBirth: dateOfBirth,
+ gender: gender,
+ weight: weight,
+ height: height,
+ );
+ // Логируем запрос перед отправкой
+ log(
+ 'AuthRepository: Sending OAuth verification confirm request: provider=$provider, verificationType=$verificationType, code=$code, email=$email, phone=$phone',
+ );
+ return await authService.confirmOAuthVerification(body: request);
+ } catch (e) {
+ log('AuthRepository: Error in confirmOAuthVerification: $e');
+ rethrow;
+ }
+ }
}
diff --git a/lib/features/auth/services/auth_service.dart b/lib/features/auth/services/auth_service.dart
index 41d35da7..2c7c6249 100644
--- a/lib/features/auth/services/auth_service.dart
+++ b/lib/features/auth/services/auth_service.dart
@@ -2,6 +2,9 @@ import 'package:dio/dio.dart';
import 'package:eatvio_app/features/auth/models/credentials_model.dart';
import 'package:eatvio_app/features/auth/models/oauth_model.dart';
import 'package:eatvio_app/features/auth/models/oauth_login_request.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_request.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_confirm_response.dart';
+import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
import 'package:eatvio_app/features/auth/models/token_model.dart';
import 'package:retrofit/retrofit.dart';
@@ -19,4 +22,10 @@ abstract class AuthService {
@POST('/api/oauth/login')
Future signInViaSocialMedia({@Body() required OAuthLoginRequest body});
+
+ @POST('/api/oauth/verification/request')
+ Future requestOAuthVerification({@Body() required Map body});
+
+ @POST('/api/oauth/verification/confirm')
+ Future confirmOAuthVerification({@Body() required OAuthVerificationConfirmRequest body});
}
diff --git a/lib/features/barcode/models/barcode_product_model.dart b/lib/features/barcode/models/barcode_product_model.dart
new file mode 100644
index 00000000..99fd8cd7
--- /dev/null
+++ b/lib/features/barcode/models/barcode_product_model.dart
@@ -0,0 +1,29 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'barcode_product_model.freezed.dart';
+part 'barcode_product_model.g.dart';
+
+@freezed
+abstract class BarcodeProductModel with _$BarcodeProductModel {
+ const factory BarcodeProductModel({
+ // ignore: non_constant_identifier_names
+ required String GTIN,
+ @JsonKey(name: 'Товарный знак (ru)') String? brandName,
+ @JsonKey(name: 'Описание (ru)') String? description,
+ @JsonKey(name: 'Количество/вес') String? quantity,
+ @JsonKey(name: 'Рынок сбыта') String? market,
+ @JsonKey(name: 'Калорийность') double? calories,
+ @JsonKey(name: 'Белки') double? proteins,
+ @JsonKey(name: 'Жиры') double? fats,
+ @JsonKey(name: 'Углеводы') double? carbohydrates,
+ }) = _BarcodeProductModel;
+
+ factory BarcodeProductModel.fromJson(Map json) => _$BarcodeProductModelFromJson(json);
+}
+
+@freezed
+abstract class BarcodeTaskStatusModel with _$BarcodeTaskStatusModel {
+ const factory BarcodeTaskStatusModel({String? status, @JsonKey(name: 'task_id') String? taskId, BarcodeProductModel? data}) = _BarcodeTaskStatusModel;
+
+ factory BarcodeTaskStatusModel.fromJson(Map json) => _$BarcodeTaskStatusModelFromJson(json);
+}
diff --git a/lib/features/barcode/repositories/barcode_repository.dart b/lib/features/barcode/repositories/barcode_repository.dart
new file mode 100644
index 00000000..b83ace5c
--- /dev/null
+++ b/lib/features/barcode/repositories/barcode_repository.dart
@@ -0,0 +1,108 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/barcode/models/barcode_product_model.dart';
+import 'package:eatvio_app/features/barcode/services/barcode_service.dart';
+
+class BarcodeRepository {
+ final BarcodeService barcodeService;
+ final Dio dio;
+
+ BarcodeRepository({
+ required this.barcodeService,
+ required this.dio,
+ });
+
+ /// Получить информацию о продукте по штрихкоду
+ /// Возвращает либо данные продукта, либо статус задачи обработки
+ Future getProductByBarcode(String barcode) async {
+ try {
+ final response = await dio.get('/api/gsone/barcode/$barcode');
+
+ if (response.statusCode == 200) {
+ // Данные найдены в БД
+ final product = BarcodeProductModel.fromJson(response.data as Map);
+ return BarcodeResult.success(product);
+ } else if (response.statusCode == 202) {
+ // Запущена задача обработки
+ final taskStatus = BarcodeTaskStatusModel.fromJson(response.data as Map);
+ return BarcodeResult.processing(taskStatus.taskId ?? '');
+ }
+
+ throw Exception('Unexpected status code: ${response.statusCode}');
+ } on DioException catch (e) {
+ if (e.response?.statusCode == 202) {
+ // Если получен статус 202, значит запущена задача обработки
+ final taskStatus = BarcodeTaskStatusModel.fromJson(e.response!.data as Map);
+ return BarcodeResult.processing(taskStatus.taskId ?? '');
+ }
+ rethrow;
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ /// Получить статус задачи обработки
+ Future getTaskStatus(String taskId) async {
+ try {
+ final statusModel = await barcodeService.getTaskStatus(taskId: taskId);
+
+ if (statusModel.status == 'completed' && statusModel.data != null) {
+ return BarcodeTaskStatus.completed(statusModel.data!);
+ } else if (statusModel.status == 'failed') {
+ return BarcodeTaskStatus.failed();
+ } else {
+ return BarcodeTaskStatus.processing();
+ }
+ } catch (e) {
+ rethrow;
+ }
+ }
+}
+
+/// Результат запроса информации о продукте по штрихкоду
+class BarcodeResult {
+ final BarcodeResultType type;
+ final BarcodeProductModel? product;
+ final String? taskId;
+
+ BarcodeResult._({required this.type, this.product, this.taskId});
+
+ factory BarcodeResult.success(BarcodeProductModel product) {
+ return BarcodeResult._(type: BarcodeResultType.success, product: product);
+ }
+
+ factory BarcodeResult.processing(String taskId) {
+ return BarcodeResult._(type: BarcodeResultType.processing, taskId: taskId);
+ }
+}
+
+enum BarcodeResultType {
+ success,
+ processing,
+}
+
+/// Статус задачи обработки
+class BarcodeTaskStatus {
+ final BarcodeTaskStatusType type;
+ final BarcodeProductModel? product;
+
+ BarcodeTaskStatus._({required this.type, this.product});
+
+ factory BarcodeTaskStatus.completed(BarcodeProductModel product) {
+ return BarcodeTaskStatus._(type: BarcodeTaskStatusType.completed, product: product);
+ }
+
+ factory BarcodeTaskStatus.processing() {
+ return BarcodeTaskStatus._(type: BarcodeTaskStatusType.processing);
+ }
+
+ factory BarcodeTaskStatus.failed() {
+ return BarcodeTaskStatus._(type: BarcodeTaskStatusType.failed);
+ }
+}
+
+enum BarcodeTaskStatusType {
+ completed,
+ processing,
+ failed,
+}
+
diff --git a/lib/features/barcode/services/barcode_service.dart b/lib/features/barcode/services/barcode_service.dart
new file mode 100644
index 00000000..e64e2575
--- /dev/null
+++ b/lib/features/barcode/services/barcode_service.dart
@@ -0,0 +1,24 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/barcode/models/barcode_product_model.dart';
+import 'package:retrofit/retrofit.dart';
+
+part 'barcode_service.g.dart';
+
+@RestApi()
+abstract class BarcodeService {
+ factory BarcodeService(Dio dio, {String baseUrl}) = _BarcodeService;
+
+ @GET('/api/gsone/barcode/{barcode}')
+ Future getProductByBarcode({@Path('barcode') required String barcode});
+
+ @GET('/api/gsone/barcode/status/{task_id}')
+ Future getTaskStatus({@Path('task_id') required String taskId});
+}
+
+
+
+
+
+
+
+
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index 08312aeb..139f9d10 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -79,7 +78,10 @@ class _BlogPostScreenState extends State {
return Scaffold(
resizeToAvoidBottomInset: true,
bottomSheet: Container(
- padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
+ padding: EdgeInsets.only(
+ top: 12,
+ bottom: 12 + MediaQuery.of(context).padding.bottom + 56, // 56 - высота bottomNavigationBar
+ ),
decoration: BoxDecoration(
color: Colors.white,
border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1))),
@@ -195,7 +197,7 @@ class _BlogPostScreenState extends State {
],
),
body: SingleChildScrollView(
- padding: const EdgeInsets.only(bottom: 80),
+ padding: EdgeInsets.only(bottom: 160 + MediaQuery.of(context).padding.bottom), // поле комментария (52-200) + padding (12+12+56) + safe area
physics: const BouncingScrollPhysics(),
child: Column(
children: [
diff --git a/lib/features/chat/models/chat_message_model.dart b/lib/features/chat/models/chat_message_model.dart
index 8dd8545a..c50a68f8 100644
--- a/lib/features/chat/models/chat_message_model.dart
+++ b/lib/features/chat/models/chat_message_model.dart
@@ -4,17 +4,36 @@ import 'package:freezed_annotation/freezed_annotation.dart';
part 'chat_message_model.freezed.dart';
part 'chat_message_model.g.dart';
+int _parseAuthorId(dynamic json) {
+ if (json == null) return 0;
+ if (json is num) return json.toInt();
+ return 0;
+}
+
+DateTime _parseUpdatedAt(dynamic json) {
+ if (json == null) return DateTime.now();
+ if (json is String) return parseDate(json);
+ return DateTime.now();
+}
+
+String _parseData(dynamic json) {
+ if (json == null) return '';
+ return json.toString();
+}
+
@freezed
abstract class ChatMessageModel with _$ChatMessageModel {
const factory ChatMessageModel({
required int id,
- required String data,
+ @JsonKey(name: 'data', fromJson: _parseData) required String data,
@JsonKey(name: 'media_data') required List? mediaData,
- @JsonKey(name: 'author_id') required int authorId,
- @JsonKey(name: 'updated_at', fromJson: parseDate) required DateTime updatedAt,
+ @JsonKey(name: 'urls_media_info') List>? urlsMediaInfo,
+ @JsonKey(name: 'author_id', fromJson: _parseAuthorId) required int authorId,
+ @JsonKey(name: 'updated_at', fromJson: _parseUpdatedAt) required DateTime updatedAt,
@JsonKey(name: 'read_by_to_user', defaultValue: false) required bool isRead,
@JsonKey(name: 'is_author_message_auth_user') required bool? isCurrentUserAuthor,
@JsonKey(name: 'room_id') required String? roomId,
+ @JsonKey(name: 'type') String? type,
@Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
@Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
}) = _ChatMessageModel;
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 5206889b..d77eacc7 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
@@ -164,9 +164,15 @@ class ChatRoomCubit extends Cubit {
messagesSubscription = wsManager.directChatStream?.listen((event) {
AudioPlayer().play((AssetSource('audio/recive_message.wav')));
final message = ChatMessageModel.fromJson(jsonDecode(event.data));
- List messagesList = [message, ...(state as ChatRoomStateLoaded).chatMessages];
+ final currentState = state as ChatRoomStateLoaded;
+
+ // Сообщения от текущего пользователя не приходят через WebSocket,
+ // они обрабатываются через ответ API в sendMessage
+ // Здесь обрабатываем только входящие сообщения от других пользователей
+ List messagesList = [message, ...currentState.chatMessages];
+
chatRepository.emitNewMessageToChats(message);
- emit((state as ChatRoomStateLoaded).copyWith(chatMessages: messagesList, isLoading: isLoading));
+ emit(currentState.copyWith(chatMessages: messagesList, isLoading: isLoading));
EasyDebounce.debounce('searchChatRoom', const Duration(milliseconds: 300), () => sl().getChatRooms());
});
@@ -185,6 +191,8 @@ class ChatRoomCubit extends Cubit {
final messageUuid = uuid.v4();
final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List.from(files)) : null;
AudioPlayer().play((AssetSource('audio/send_message.wav')));
+
+ // Создаем временное сообщение с состоянием loading
emit(
(state as ChatRoomStateLoaded).copyWith(
chatMessages: [
@@ -206,12 +214,25 @@ class ChatRoomCubit extends Cubit {
);
try {
- await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
+ // Отправляем сообщение и получаем ответ от сервера с правильными данными
+ final serverMessage = await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
+
+ // Заменяем локальное сообщение данными с сервера (с правильными URL файлов)
emit(
(state as ChatRoomStateLoaded).copyWith(
chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
if (elem.uuid == messageUuid) {
- return elem.copyWith(messageState: MessageState.sent);
+ // Сохраняем UUID, состояние и обновляем данные из ответа сервера
+ // Используем значения из локального сообщения для полей, которые могут отсутствовать в ответе
+ return serverMessage.copyWith(
+ uuid: messageUuid,
+ messageState: MessageState.sent,
+ isCurrentUserAuthor: true,
+ isRead: elem.isRead,
+ roomId: elem.roomId ?? serverMessage.roomId,
+ authorId: serverMessage.authorId,
+ updatedAt: serverMessage.updatedAt,
+ );
}
return elem;
}).toList(),
@@ -320,6 +341,18 @@ class ChatRoomCubit extends Cubit {
if (message != null) {
try {
AudioPlayer().play((AssetSource('audio/send_message.wav')));
+
+ // Определяем, есть ли файлы для повторной отправки
+ List? filesToResend;
+ if (message.mediaData != null && message.mediaData!.isNotEmpty) {
+ // Если mediaData содержит File объекты, используем их
+ // Если это строки (URL), то файлы уже на сервере и повторная отправка не нужна
+ final firstItem = message.mediaData!.first;
+ if (firstItem is File) {
+ filesToResend = message.mediaData!.cast();
+ }
+ }
+
emit(
(state as ChatRoomStateLoaded).copyWith(
chatMessages: [
@@ -341,12 +374,27 @@ class ChatRoomCubit extends Cubit {
);
try {
- await chatRepository.sendMessage(data: message.data, files: message.mediaData as List?, slug: userSlug);
+ // Отправляем сообщение и получаем ответ от сервера
+ final serverMessage = await chatRepository.sendMessage(
+ data: message.data,
+ files: filesToResend,
+ slug: userSlug,
+ );
+
+ // Заменяем локальное сообщение данными с сервера
emit(
(state as ChatRoomStateLoaded).copyWith(
chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
if (elem.uuid == uuid) {
- return elem.copyWith(messageState: MessageState.sent);
+ return serverMessage.copyWith(
+ uuid: uuid,
+ messageState: MessageState.sent,
+ isCurrentUserAuthor: true,
+ isRead: elem.isRead,
+ roomId: elem.roomId ?? serverMessage.roomId,
+ authorId: serverMessage.authorId,
+ updatedAt: serverMessage.updatedAt,
+ );
}
return elem;
}).toList(),
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index b42bf76e..8f5e49d2 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -12,6 +12,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/plan_order_message_widget.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
@@ -221,14 +222,36 @@ class _ChatScreenState extends State {
state.chatMessages[index].updatedAt.day != state.chatMessages[index + 1].updatedAt.day) ||
index + 1 == state.chatMessages.length) {
final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
+ final message = state.chatMessages[index];
+ final isPlanOrderMessage = message.type == 'plan_order';
+
+ PacketOptions? messageOption;
+ if (isPlanOrderMessage && chosenPlan != null) {
+ if (chosenPlan.optionType == 'options1') {
+ messageOption = chosenPlan.plan.packet1Options;
+ } else if (chosenPlan.optionType == 'options2') {
+ messageOption = chosenPlan.plan.packet2Options;
+ } else if (chosenPlan.optionType == 'options3') {
+ messageOption = chosenPlan.plan.packet3Options;
+ }
+ }
+
return Column(
children: [
- _messageDate(state.chatMessages[index].updatedAt),
+ _messageDate(message.updatedAt),
+ if (isPlanOrderMessage && chosenPlan != null && messageOption != null)
+ PlanOrderMessageWidget(
+ planName: chosenPlan.plan.name,
+ planSlug: chosenPlan.plan.slug,
+ price: messageOption.price,
+ sendTime: message.updatedAt,
+ isCurrentUser: isCurrentUserAuthor,
+ ),
VisibilityDetector(
- key: Key(state.chatMessages[index].id.toString()),
+ key: Key(message.id.toString()),
onVisibilityChanged: (VisibilityInfo info) {
- if (!state.chatMessages[index].isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
- unreadMessagesIdsCopy.add((id: state.chatMessages[index].id, index: index));
+ if (!message.isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
+ unreadMessagesIdsCopy.add((id: message.id, index: index));
EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
final result = await context.read().markMessagesAsRead(state.chatRoom.id, unreadMessagesIdsCopy);
if (!result) return;
@@ -242,44 +265,76 @@ class _ChatScreenState extends State {
}
},
child: ChatBubbleWidget(
- isRead: state.chatMessages[index].isRead,
- sendTime: state.chatMessages[index].updatedAt,
- text: state.chatMessages[index].data.trim(),
+ isRead: message.isRead,
+ sendTime: message.updatedAt,
+ text: message.data.trim(),
isCurrentUser: isCurrentUserAuthor,
- mediaData: state.chatMessages[index].mediaData ?? [],
- messageState: state.chatMessages[index].messageState,
- messageUuid: state.chatMessages[index].uuid ?? '',
+ mediaData: message.mediaData ?? [],
+ messageState: message.messageState,
+ messageUuid: message.uuid ?? '',
userSlug: state.chatRoom.users.receiver.slug,
+ messageType: message.type,
+ isConsultant: amIConsultant,
+ urlsMediaInfo: message.urlsMediaInfo,
),
),
],
);
}
final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
- return VisibilityDetector(
- key: Key(state.chatMessages[index].id.toString()),
- onVisibilityChanged: (VisibilityInfo info) {
- if (!state.chatMessages[index].isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
- unreadMessagesIds.add((id: state.chatMessages[index].id, index: index));
- EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
- final result = await context.read().markMessagesAsRead(state.chatRoom.id, unreadMessagesIds);
- if (!result) return;
- if (!context.mounted) return;
- context.read().reduceUnreadMessagesCount(chatId: state.chatRoom.id, count: unreadMessagesIds.length);
- unreadMessagesIds.clear();
- });
- }
- },
- child: ChatBubbleWidget(
- isRead: state.chatMessages[index].isRead,
- sendTime: state.chatMessages[index].updatedAt,
- text: state.chatMessages[index].data.trim(),
- isCurrentUser: isCurrentUserAuthor,
- mediaData: state.chatMessages[index].mediaData ?? [],
- messageState: state.chatMessages[index].messageState,
- messageUuid: state.chatMessages[index].uuid ?? '',
- userSlug: state.chatRoom.users.receiver.slug,
- ),
+ final message = state.chatMessages[index];
+ final isPlanOrderMessage = message.type == 'plan_order';
+
+ PacketOptions? messageOption;
+ if (isPlanOrderMessage && chosenPlan != null) {
+ if (chosenPlan.optionType == 'options1') {
+ messageOption = chosenPlan.plan.packet1Options;
+ } else if (chosenPlan.optionType == 'options2') {
+ messageOption = chosenPlan.plan.packet2Options;
+ } else if (chosenPlan.optionType == 'options3') {
+ messageOption = chosenPlan.plan.packet3Options;
+ }
+ }
+
+ return Column(
+ children: [
+ if (isPlanOrderMessage && chosenPlan != null && messageOption != null)
+ PlanOrderMessageWidget(
+ planName: chosenPlan.plan.name,
+ planSlug: chosenPlan.plan.slug,
+ price: messageOption.price,
+ sendTime: message.updatedAt,
+ isCurrentUser: isCurrentUserAuthor,
+ ),
+ VisibilityDetector(
+ key: Key(message.id.toString()),
+ onVisibilityChanged: (VisibilityInfo info) {
+ if (!message.isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
+ unreadMessagesIds.add((id: message.id, index: index));
+ EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
+ final result = await context.read().markMessagesAsRead(state.chatRoom.id, unreadMessagesIds);
+ if (!result) return;
+ if (!context.mounted) return;
+ context.read().reduceUnreadMessagesCount(chatId: state.chatRoom.id, count: unreadMessagesIds.length);
+ unreadMessagesIds.clear();
+ });
+ }
+ },
+ child: ChatBubbleWidget(
+ isRead: message.isRead,
+ sendTime: message.updatedAt,
+ text: message.data.trim(),
+ isCurrentUser: isCurrentUserAuthor,
+ mediaData: message.mediaData ?? [],
+ messageState: message.messageState,
+ messageUuid: message.uuid ?? '',
+ userSlug: state.chatRoom.users.receiver.slug,
+ messageType: message.type,
+ isConsultant: amIConsultant,
+ urlsMediaInfo: message.urlsMediaInfo,
+ ),
+ ),
+ ],
);
},
itemCount: state.chatMessages.length + (state.isLoading ? 1 : 0),
@@ -407,34 +462,30 @@ class _ChatScreenState extends State {
),
const SizedBox(width: 8),
Expanded(
- child: SizedBox(
- height: 40,
- child: TextFormField(
- expands: true,
- textCapitalization: TextCapitalization.sentences,
- controller: textEditingController,
- maxLines: null,
- minLines: null,
- keyboardType: TextInputType.multiline,
- style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
- decoration: InputDecoration(
- isDense: true,
- contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
- hintText: 'Сообщение',
- hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
- filled: true,
- border: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
- enabledBorder: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
- focusedBorder: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
+ child: TextFormField(
+ textCapitalization: TextCapitalization.sentences,
+ controller: textEditingController,
+ maxLines: 3,
+ minLines: 1,
+ keyboardType: TextInputType.multiline,
+ style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
+ decoration: InputDecoration(
+ isDense: true,
+ contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+ hintText: 'Сообщение',
+ hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
+ filled: true,
+ border: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+ ),
+ enabledBorder: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+ ),
+ focusedBorder: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
),
),
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index cd37535f..a0ddf60a 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -79,34 +79,30 @@ class _EmptyChatScreenState extends State {
),
const SizedBox(width: 8),
Expanded(
- child: SizedBox(
- height: 40,
- child: TextFormField(
- expands: true,
- textCapitalization: TextCapitalization.sentences,
- controller: textEditingController,
- maxLines: null,
- minLines: null,
- keyboardType: TextInputType.multiline,
- style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
- decoration: InputDecoration(
- isDense: true,
- contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
- hintText: 'Сообщение',
- hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
- filled: true,
- border: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
- enabledBorder: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
- focusedBorder: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100),
- borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
- ),
+ child: TextFormField(
+ textCapitalization: TextCapitalization.sentences,
+ controller: textEditingController,
+ maxLines: 3,
+ minLines: 1,
+ keyboardType: TextInputType.multiline,
+ style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
+ decoration: InputDecoration(
+ isDense: true,
+ contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+ hintText: 'Сообщение',
+ hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
+ filled: true,
+ border: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+ ),
+ enabledBorder: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+ ),
+ focusedBorder: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
),
),
diff --git a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
index eb387691..5b634d9d 100644
--- a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
@@ -9,6 +9,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/message_action_bottom_sheet.dart';
+import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
@@ -24,7 +25,10 @@ class ChatBubbleWidget extends StatelessWidget {
required this.isRead,
required this.messageState,
required this.messageUuid,
- required this.userSlug
+ required this.userSlug,
+ this.messageType,
+ this.isConsultant,
+ this.urlsMediaInfo,
});
final DateTime sendTime;
@@ -35,6 +39,9 @@ class ChatBubbleWidget extends StatelessWidget {
final MessageState messageState;
final String messageUuid;
final String userSlug;
+ final String? messageType;
+ final bool? isConsultant;
+ final List>? urlsMediaInfo;
@override
Widget build(BuildContext context) {
final size = MediaQuery.sizeOf(context);
@@ -102,21 +109,104 @@ class ChatBubbleWidget extends StatelessWidget {
slivers: [
SliverList.separated(
itemBuilder: (BuildContext context, int index) {
- if (!mediaData[index].toString().contains('.png') &&
- !mediaData[index].toString().contains('.jpg') &&
- !mediaData[index].toString().contains('.jpeg')) {
+ final mediaItem = mediaData[index];
+ final isImage = mediaItem is File
+ ? (mediaItem.path.toLowerCase().endsWith('.png') ||
+ mediaItem.path.toLowerCase().endsWith('.jpg') ||
+ mediaItem.path.toLowerCase().endsWith('.jpeg') ||
+ mediaItem.path.toLowerCase().endsWith('.gif') ||
+ mediaItem.path.toLowerCase().endsWith('.webp'))
+ : (mediaItem.toString().toLowerCase().contains('.png') ||
+ mediaItem.toString().toLowerCase().contains('.jpg') ||
+ mediaItem.toString().toLowerCase().contains('.jpeg') ||
+ mediaItem.toString().toLowerCase().contains('.gif') ||
+ mediaItem.toString().toLowerCase().contains('.webp'));
+
+ if (!isImage) {
+ // Получаем имя файла
+ String fileName;
+ if (mediaItem is File) {
+ fileName = mediaItem.path.split('/').last;
+ } else {
+ final urlString = mediaItem.toString();
+ // Получаем расширение файла из URL
+ String? fileExtension;
+ final urlParts = urlString.split('/');
+ if (urlParts.isNotEmpty) {
+ final lastPart = urlParts.last.split('?').first;
+ final dotIndex = lastPart.lastIndexOf('.');
+ if (dotIndex != -1 && dotIndex < lastPart.length - 1) {
+ fileExtension = lastPart.substring(dotIndex);
+ }
+ }
+
+ // Пытаемся найти имя файла в urls_media_info
+ String? fileNameFromInfo;
+ final mediaInfo = urlsMediaInfo;
+ if (mediaInfo != null && mediaInfo.isNotEmpty) {
+ for (final mediaInfoMap in mediaInfo) {
+ // Каждый элемент urls_media_info - это Map, где ключ - это URL
+ if (mediaInfoMap.isNotEmpty) {
+ for (final entry in mediaInfoMap.entries) {
+ final infoUrl = entry.key.toString();
+ // Сравниваем полные URL или только имя файла
+ if (infoUrl == urlString ||
+ urlString.contains(infoUrl) ||
+ infoUrl.contains(urlString) ||
+ urlString.split('/').last == infoUrl.split('/').last) {
+ final fileInfo = entry.value;
+ if (fileInfo is Map && fileInfo.containsKey('name')) {
+ final nameValue = fileInfo['name'];
+ if (nameValue != null) {
+ fileNameFromInfo = nameValue.toString();
+ break;
+ }
+ }
+ }
+ }
+ if (fileNameFromInfo != null && fileNameFromInfo.isNotEmpty) break;
+ }
+ }
+ }
+
+ if (fileNameFromInfo != null && fileNameFromInfo.isNotEmpty) {
+ // Добавляем расширение к названию файла, если его там нет
+ if (fileExtension != null && !fileNameFromInfo.endsWith(fileExtension)) {
+ fileName = '$fileNameFromInfo$fileExtension';
+ } else {
+ fileName = fileNameFromInfo;
+ }
+ } else {
+ // Fallback к старой логике, если информации нет
+ fileName = urlString.contains('/') ? urlString.split('/').last.split('?').first : urlString.replaceAll('chat_files/', '');
+ }
+ }
+
return ListTile(
contentPadding: const EdgeInsets.all(4),
horizontalTitleGap: 8,
onTap: () async {
- if (!await launchUrl(Uri.parse('${mediaData[index]}'))) {
- throw Exception('Could not launch ${mediaData[index].toString()}');
+ if (mediaItem is File) {
+ // Для локальных файлов используем file:// URI
+ final fileUri = Uri.file(mediaItem.path);
+ if (await canLaunchUrl(fileUri)) {
+ await launchUrl(fileUri, mode: LaunchMode.externalApplication);
+ }
+ } else {
+ // Для URL файлов используем обычный launchUrl
+ final urlString = mediaItem.toString();
+ final uri = urlString.startsWith('http://') || urlString.startsWith('https://')
+ ? Uri.parse(urlString)
+ : Uri.parse('https://$urlString');
+ if (await canLaunchUrl(uri)) {
+ await launchUrl(uri, mode: LaunchMode.externalApplication);
+ }
}
},
leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
trailing: const Icon(Icons.download_outlined, color: Colors.black),
title: Text(
- mediaData[index].toString().replaceAll('chat_files/', ''),
+ fileName,
maxLines: 2,
style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
),
@@ -124,16 +214,16 @@ class ChatBubbleWidget extends StatelessWidget {
}
return GestureDetector(
onTap: () {
- context.pushTransparentRoute(
- PhotoViewScreen(imageUrls: mediaData, index: index, isLocal: mediaData[index] is File ? true : false),
- );
+ // Определяем, все ли изображения локальные
+ final allLocal = mediaData.every((item) => item is File);
+ context.pushTransparentRoute(PhotoViewScreen(imageUrls: mediaData, index: index, isLocal: allLocal));
},
child: Hero(
tag: '${mediaData[index]}',
transitionOnUserGestures: true,
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
- child: mediaData[index] is File ? Image.file(mediaData[index]) : CachedNetworkImage(imageUrl: '${mediaData[index]}'),
+ child: mediaItem is File ? Image.file(mediaItem) : CachedNetworkImage(imageUrl: '$mediaItem'),
),
),
);
@@ -144,8 +234,8 @@ class ChatBubbleWidget extends StatelessWidget {
],
),
),
- if (mediaData.isNotEmpty && text.isNotEmpty) const SizedBox(height: 8),
- if (text.isNotEmpty) Text(text, style: TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16)),
+ if (mediaData.isNotEmpty && _getDisplayText().isNotEmpty) const SizedBox(height: 8),
+ if (_getDisplayText().isNotEmpty) _buildLinkableText(_getDisplayText()),
],
),
),
@@ -163,4 +253,77 @@ class ChatBubbleWidget extends StatelessWidget {
),
);
}
+
+ String _getDisplayText() {
+ if (messageType == 'plan_order') {
+ if (isConsultant == true) {
+ // Текст для консультанта
+ return '1. Уточните у подопечного его цели и пожелания\n'
+ '2. Согласуйте и выберите дату старта плана\n'
+ '3. Ожидайте уведомления об успешной оплате\n'
+ '4. После оплаты предоставьте необходимые данные, согласно вашему плану питания';
+ } else {
+ // Текст для пользователя
+ return 'Укажите вашу цель в работе с консультантом\n'
+ 'Согласуйте удобную дату старта плана, после чего вам будет направлена ссылка на оплату.';
+ }
+ }
+ return text;
+ }
+
+ Widget _buildLinkableText(String text) {
+ final urlRegex = RegExp(
+ r'(?:(?:https?|ftp):\/\/)?(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)',
+ caseSensitive: false,
+ );
+
+ final textStyle = TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16);
+ final linkStyle = textStyle.copyWith(color: appTheme.blueA400, decoration: TextDecoration.underline);
+
+ final matches = urlRegex.allMatches(text);
+ if (matches.isEmpty) {
+ return Text(text, style: textStyle);
+ }
+
+ final spans = [];
+ int lastEnd = 0;
+
+ for (final match in matches) {
+ // Добавляем текст до ссылки
+ if (match.start > lastEnd) {
+ spans.add(TextSpan(text: text.substring(lastEnd, match.start), style: textStyle));
+ }
+
+ // Добавляем кликабельную ссылку
+ final url = match.group(0)!;
+ final fullUrl = url.startsWith('http://') || url.startsWith('https://') || url.startsWith('ftp://') ? url : 'https://$url';
+
+ spans.add(
+ TextSpan(
+ text: url,
+ style: linkStyle,
+ recognizer: TapGestureRecognizer()
+ ..onTap = () async {
+ try {
+ final uri = Uri.parse(fullUrl);
+ if (await canLaunchUrl(uri)) {
+ await launchUrl(uri, mode: LaunchMode.externalApplication);
+ }
+ } catch (e) {
+ // Игнорируем ошибки открытия ссылок
+ }
+ },
+ ),
+ );
+
+ lastEnd = match.end;
+ }
+
+ // Добавляем оставшийся текст после последней ссылки
+ if (lastEnd < text.length) {
+ spans.add(TextSpan(text: text.substring(lastEnd), style: textStyle));
+ }
+
+ return RichText(text: TextSpan(children: spans));
+ }
}
diff --git a/lib/features/chat/presentation/widgets/plan_order_message_widget.dart b/lib/features/chat/presentation/widgets/plan_order_message_widget.dart
new file mode 100644
index 00000000..73581f82
--- /dev/null
+++ b/lib/features/chat/presentation/widgets/plan_order_message_widget.dart
@@ -0,0 +1,127 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class PlanOrderMessageWidget extends StatelessWidget {
+ const PlanOrderMessageWidget({
+ super.key,
+ required this.planName,
+ required this.planSlug,
+ required this.price,
+ required this.sendTime,
+ required this.isCurrentUser,
+ });
+
+ final String planName;
+ final String planSlug;
+ final dynamic price;
+ final DateTime sendTime;
+ final bool isCurrentUser;
+
+ String _formatPrice(dynamic price) {
+ if (price == null) return '0₽';
+ if (price is num) {
+ return '${price.toStringAsFixed(0)}₽';
+ }
+ if (price is String) {
+ final numPrice = num.tryParse(price);
+ if (numPrice != null) {
+ return '${numPrice.toStringAsFixed(0)}₽';
+ }
+ return price.endsWith('₽') ? price : '$price₽';
+ }
+ return '0₽';
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final size = MediaQuery.sizeOf(context);
+ final formattedPrice = _formatPrice(price);
+ final textStyle = TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16);
+ final linkStyle = textStyle.copyWith(
+ color: appTheme.blueA400,
+ decoration: TextDecoration.underline,
+ );
+
+ return SizedBox(
+ width: size.width,
+ child: Padding(
+ padding: EdgeInsets.fromLTRB(isCurrentUser ? 64 : 16, 10, isCurrentUser ? 16 : 64, 4),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.end,
+ mainAxisAlignment: isCurrentUser ? MainAxisAlignment.end : MainAxisAlignment.start,
+ children: [
+ if (isCurrentUser)
+ Padding(
+ padding: const EdgeInsets.only(right: 4, bottom: 4),
+ child: Text(
+ sendTime.format('HH:mm', 'ru'),
+ style: const TextStyle(color: Color(0xFF7B8794), height: 1, fontSize: 10),
+ ),
+ ),
+ Container(
+ constraints: BoxConstraints(maxWidth: size.width * 0.7),
+ decoration: BoxDecoration(
+ color: isCurrentUser ? appTheme.gray50 : appTheme.gray60004,
+ borderRadius: BorderRadius.horizontal(
+ left: isCurrentUser ? const Radius.circular(32) : const Radius.circular(16),
+ right: isCurrentUser ? const Radius.circular(16) : const Radius.circular(24),
+ ),
+ ),
+ child: Padding(
+ padding: EdgeInsets.only(
+ top: 8,
+ bottom: 8,
+ left: isCurrentUser ? 16 : 8,
+ right: isCurrentUser ? 8 : 16,
+ ),
+ child: RichText(
+ text: TextSpan(
+ style: textStyle,
+ children: [
+ const TextSpan(text: 'Я хочу заказать '),
+ TextSpan(
+ text: planName,
+ style: linkStyle,
+ recognizer: TapGestureRecognizer()
+ ..onTap = () {
+ GoRouter.of(context).pushNamed(
+ 'aboutPlanScreen',
+ extra: {
+ 'slug': planSlug,
+ 'index': null,
+ 'navigateToComments': false,
+ },
+ );
+ },
+ ),
+ TextSpan(text: ' по цене $formattedPrice'),
+ ],
+ ),
+ ),
+ ),
+ ),
+ if (!isCurrentUser)
+ Padding(
+ padding: const EdgeInsets.only(left: 4, bottom: 4),
+ child: Text(
+ sendTime.format('HH:mm', 'ru'),
+ style: const TextStyle(
+ color: Color(0xFF7B8794),
+ height: 1,
+ fontSize: 10,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
+
diff --git a/lib/features/chat/repositories/chat_repository.dart b/lib/features/chat/repositories/chat_repository.dart
index b1961b2a..0a3e2960 100644
--- a/lib/features/chat/repositories/chat_repository.dart
+++ b/lib/features/chat/repositories/chat_repository.dart
@@ -28,7 +28,7 @@ class ChatRepository {
_newUserMessagesController.add(message);
}
- Future sendMessage({
+ Future sendMessage({
required String slug,
String? data,
List? files,
@@ -48,9 +48,13 @@ class ChatRepository {
}
}
- await chatService.sendMessage(
+ // Если data пустая строка или null, не передаем её вообще
+ // Сервер требует либо непустую строку, либо отсутствие поля
+ final dataToSend = (data == null || data.trim().isEmpty) ? null : data;
+
+ return await chatService.sendMessage(
slug: slug,
- data: data,
+ data: dataToSend,
mediaData: multipartFiles.isEmpty ? null : multipartFiles,
socketId: (await SocketIdStorage.getSocketIdFromStorage())!,
);
diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart
index 89d65749..a2bf52cf 100644
--- a/lib/features/chat/services/chat_service.dart
+++ b/lib/features/chat/services/chat_service.dart
@@ -1,4 +1,5 @@
import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
@@ -26,7 +27,7 @@ abstract class ChatService {
@POST('/api/v2/chat/message/send/{slug}')
@MultiPart()
- Future sendMessage({
+ Future sendMessage({
@Header('X-Socket-ID') required String socketId,
@Path() required String slug,
@Part() String? data,
diff --git a/lib/features/dev_tools/presentation/dev_tools_screen.dart b/lib/features/dev_tools/presentation/dev_tools_screen.dart
index 0be58bee..37c85b79 100644
--- a/lib/features/dev_tools/presentation/dev_tools_screen.dart
+++ b/lib/features/dev_tools/presentation/dev_tools_screen.dart
@@ -10,8 +10,12 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/dev_tools/test_cases.dart';
import 'package:eatvio_app/core/env_config.dart';
+import 'package:eatvio_app/features/diary/presentation/pages/barcode_scanner_screen.dart';
+import 'package:eatvio_app/features/barcode/repositories/barcode_repository.dart';
+import 'package:eatvio_app/features/barcode/models/barcode_product_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
+import 'dart:async';
class DevToolsScreen extends StatelessWidget {
const DevToolsScreen({super.key});
@@ -296,6 +300,20 @@ class _DevToolsScreenContentState extends State {
}
},
),
+ const SizedBox(height: 10),
+ CustomOutlinedButton(
+ text: 'Сканирование QR/штрихкода',
+ buttonStyle: const ButtonStyle(),
+ onPressed: () async {
+ if (!context.mounted) return;
+ final barcode = await Navigator.of(context).push(
+ MaterialPageRoute(builder: (context) => const BarcodeScannerScreen()),
+ );
+ if (barcode != null && barcode.isNotEmpty && context.mounted) {
+ await _handleBarcodeScanned(barcode, context);
+ }
+ },
+ ),
const SizedBox(height: 300),
],
),
@@ -303,6 +321,195 @@ class _DevToolsScreenContentState extends State {
),
);
}
+
+ Future _handleBarcodeScanned(String barcode, BuildContext context) async {
+ try {
+ final barcodeRepository = sl();
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (context) => const AlertDialog(
+ content: Row(
+ children: [
+ CircularProgressIndicator(),
+ SizedBox(width: 16),
+ Text('Загрузка данных...'),
+ ],
+ ),
+ ),
+ );
+
+ final result = await barcodeRepository.getProductByBarcode(barcode);
+
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки
+
+ if (result.type == BarcodeResultType.success && result.product != null) {
+ // Данные получены сразу
+ _showProductDialog(context, result.product!, barcode);
+ } else if (result.type == BarcodeResultType.processing && result.taskId != null) {
+ // Запущена задача обработки, нужно опрашивать статус
+ await _pollTaskStatus(context, result.taskId!, barcode);
+ }
+ } catch (e) {
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки если открыт
+ showErrorToast('Ошибка: $e');
+ _showBarcodeDialog(context, barcode, null);
+ }
+ }
+
+ Future _pollTaskStatus(BuildContext context, String taskId, String barcode) async {
+ final barcodeRepository = sl();
+
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (context) => AlertDialog(
+ content: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const CircularProgressIndicator(),
+ const SizedBox(height: 16),
+ const Text('Обработка штрихкода...'),
+ const SizedBox(height: 8),
+ Text('Это может занять некоторое время', style: TextStyle(fontSize: 12, color: Colors.grey[600])),
+ ],
+ ),
+ ),
+ );
+
+ final completer = Completer();
+ int attempts = 0;
+ const maxAttempts = 30; // Максимум 30 попыток (примерно 5 минут при интервале 10 секунд)
+
+ // ignore: unused_local_variable
+ final timer = Timer.periodic(const Duration(seconds: 10), (timer) async {
+ attempts++;
+ try {
+ final status = await barcodeRepository.getTaskStatus(taskId);
+
+ if (status.type == BarcodeTaskStatusType.completed && status.product != null) {
+ timer.cancel();
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки
+ _showProductDialog(context, status.product!, barcode);
+ completer.complete();
+ } else if (status.type == BarcodeTaskStatusType.failed) {
+ timer.cancel();
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки
+ showErrorToast('Не удалось получить данные о продукте');
+ _showBarcodeDialog(context, barcode, null);
+ completer.complete();
+ } else if (attempts >= maxAttempts) {
+ timer.cancel();
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки
+ showErrorToast('Превышено время ожидания');
+ _showBarcodeDialog(context, barcode, null);
+ completer.complete();
+ }
+ } catch (e) {
+ timer.cancel();
+ if (!context.mounted) return;
+ Navigator.of(context).pop(); // Закрываем индикатор загрузки
+ showErrorToast('Ошибка при проверке статуса: $e');
+ _showBarcodeDialog(context, barcode, null);
+ completer.complete();
+ }
+ });
+
+ await completer.future;
+ }
+
+ void _showProductDialog(BuildContext context, BarcodeProductModel product, String barcode) {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Информация о продукте'),
+ content: SingleChildScrollView(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ _buildInfoRow('Штрихкод:', barcode),
+ if (product.brandName != null) _buildInfoRow('Бренд:', product.brandName!),
+ if (product.description != null) _buildInfoRow('Описание:', product.description!),
+ if (product.quantity != null) _buildInfoRow('Количество:', product.quantity!),
+ if (product.market != null) _buildInfoRow('Рынок сбыта:', product.market!),
+ if (product.calories != null) _buildInfoRow('Калорийность:', '${product.calories} ккал'),
+ if (product.proteins != null) _buildInfoRow('Белки:', '${product.proteins} г'),
+ if (product.fats != null) _buildInfoRow('Жиры:', '${product.fats} г'),
+ if (product.carbohydrates != null) _buildInfoRow('Углеводы:', '${product.carbohydrates} г'),
+ ],
+ ),
+ ),
+ actions: [
+ TextButton(
+ onPressed: () {
+ Clipboard.setData(ClipboardData(text: barcode));
+ showInfoToast('Штрихкод скопирован в буфер обмена');
+ },
+ child: const Text('Скопировать код'),
+ ),
+ TextButton(
+ onPressed: () => Navigator.of(context).pop(),
+ child: const Text('Закрыть'),
+ ),
+ ],
+ ),
+ );
+ }
+
+ void _showBarcodeDialog(BuildContext context, String barcode, BarcodeProductModel? product) {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Отсканированный код'),
+ content: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(barcode),
+ if (product == null) ...[
+ const SizedBox(height: 16),
+ const Text('Данные о продукте не найдены', style: TextStyle(color: Colors.grey)),
+ ],
+ ],
+ ),
+ actions: [
+ TextButton(
+ onPressed: () {
+ Clipboard.setData(ClipboardData(text: barcode));
+ Navigator.of(context).pop();
+ showInfoToast('Код скопирован в буфер обмена');
+ },
+ child: const Text('Скопировать'),
+ ),
+ TextButton(
+ onPressed: () => Navigator.of(context).pop(),
+ child: const Text('Закрыть'),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Widget _buildInfoRow(String label, String value) {
+ return Padding(
+ padding: const EdgeInsets.only(bottom: 8),
+ child: RichText(
+ text: TextSpan(
+ style: const TextStyle(color: Colors.black, fontSize: 14),
+ children: [
+ TextSpan(text: '$label ', style: const TextStyle(fontWeight: FontWeight.bold)),
+ TextSpan(text: value),
+ ],
+ ),
+ ),
+ );
+ }
}
enum TestState { success, fail, notRun, loading }
diff --git a/lib/features/diary/presentation/pages/barcode_scanner_screen.dart b/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
index 19994568..dde46894 100644
--- a/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
+++ b/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
@@ -25,61 +25,63 @@ class _BarcodeScannerScreenState extends State {
title: const Text('Сканирование штрихкода'),
centerTitle: true,
),
- body: Column(
- children: [
- Expanded(
- child: MobileScanner(
- controller: _controller,
- onDetect: (capture) {
- final List barcodes = capture.barcodes;
- if (barcodes.isEmpty) return;
- final rawValue = barcodes.first.rawValue;
- if (rawValue == null || rawValue == _detectedBarcode) return;
- setState(() {
- _detectedBarcode = rawValue;
- });
- },
+ body: SafeArea(
+ child: Column(
+ children: [
+ Expanded(
+ child: MobileScanner(
+ controller: _controller,
+ onDetect: (capture) {
+ final List barcodes = capture.barcodes;
+ if (barcodes.isEmpty) return;
+ final rawValue = barcodes.first.rawValue;
+ if (rawValue == null || rawValue == _detectedBarcode) return;
+ setState(() {
+ _detectedBarcode = rawValue;
+ });
+ },
+ ),
),
- ),
- Container(
- width: double.infinity,
- padding: const EdgeInsets.all(16),
- decoration: const BoxDecoration(
- color: Color(0xFFF6F6F6),
- borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
- ),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- const Text(
- 'Найденный штрихкод',
- style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
- ),
- const SizedBox(height: 8),
- Text(
- _detectedBarcode ?? 'Наведите камеру на штрихкод',
- textAlign: TextAlign.center,
- style: TextStyle(
- fontSize: 18,
- fontWeight: FontWeight.w600,
- color: _detectedBarcode == null ? Colors.grey : Colors.black,
+ Container(
+ width: double.infinity,
+ padding: const EdgeInsets.all(16),
+ decoration: const BoxDecoration(
+ color: Color(0xFFF6F6F6),
+ borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
+ ),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Text(
+ 'Найденный штрихкод',
+ style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
),
- ),
- const SizedBox(height: 16),
- if (_detectedBarcode != null)
- SizedBox(
- width: double.infinity,
- child: ElevatedButton(
- onPressed: () {
- Navigator.of(context).pop(_detectedBarcode);
- },
- child: const Text('Использовать штрихкод'),
+ const SizedBox(height: 8),
+ Text(
+ _detectedBarcode ?? 'Наведите камеру на штрихкод',
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 18,
+ fontWeight: FontWeight.w600,
+ color: _detectedBarcode == null ? Colors.grey : Colors.black,
),
),
- ],
+ const SizedBox(height: 16),
+ if (_detectedBarcode != null)
+ SizedBox(
+ width: double.infinity,
+ child: ElevatedButton(
+ onPressed: () {
+ Navigator.of(context).pop(_detectedBarcode);
+ },
+ child: const Text('Использовать штрихкод'),
+ ),
+ ),
+ ],
+ ),
),
- ),
- ],
+ ],
+ ),
),
);
}
diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart
index 9d77249e..cf40281c 100644
--- a/lib/features/diary/presentation/widgets/add_product_modal.dart
+++ b/lib/features/diary/presentation/widgets/add_product_modal.dart
@@ -5,11 +5,9 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:eatvio_app/features/diary/presentation/pages/barcode_scanner_screen.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
import 'package:flutter/material.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
class AddProductModal extends StatefulWidget {
final PortionModel? portion;
@@ -27,7 +25,7 @@ class _AddProductModalState extends State {
final quantityController = TextEditingController();
GlossaryModel? selectedGlossary;
List glossariesList = [];
- late final String? _previousProductName;
+ String? _previousProductName;
@override
void initState() {
super.initState();
@@ -64,25 +62,9 @@ class _AddProductModalState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- const Text(
- 'Добавление блюда',
- style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xFF323F4B)),
- ),
- IconButton(
- onPressed: () async {
- final barcode = await Navigator.of(context).push(MaterialPageRoute(builder: (context) => const BarcodeScannerScreen()));
- if (barcode != null && barcode.isNotEmpty) {
- productNameController.text = barcode;
- setState(() {});
- }
- },
- splashRadius: 20,
- icon: const Icon(Symbols.barcode_scanner, color: Color(0xFF323F4B)),
- ),
- ],
+ const Text(
+ 'Добавление блюда',
+ style: TextStyle(fontSize: 20, fontWeight: FontWeight.w600, color: Color(0xFF323F4B)),
),
const SizedBox(height: 16),
Row(
diff --git a/lib/features/diary/presentation/widgets/meal_summary_widget.dart b/lib/features/diary/presentation/widgets/meal_summary_widget.dart
index f4537b79..934786bf 100644
--- a/lib/features/diary/presentation/widgets/meal_summary_widget.dart
+++ b/lib/features/diary/presentation/widgets/meal_summary_widget.dart
@@ -100,10 +100,10 @@ class MealSummaryWidget extends StatelessWidget {
fats = (caloriesInfo.fats * portion.quantity) / 100;
carbohydrates = (caloriesInfo.carbohydrates * portion.quantity) / 100;
} else {
- calories = caloriesInfo.energyOnPortion;
- proteins = caloriesInfo.proteinsOnPortion;
- fats = caloriesInfo.fatsOnPortion;
- carbohydrates = caloriesInfo.carbohydratesOnPortion;
+ calories = caloriesInfo.energyOnPortion * portion.quantity;
+ proteins = caloriesInfo.proteinsOnPortion * portion.quantity;
+ fats = caloriesInfo.fatsOnPortion * portion.quantity;
+ carbohydrates = caloriesInfo.carbohydratesOnPortion * portion.quantity;
}
totalCalories += calories;
diff --git a/lib/features/diets/presentation/pages/about_diet_screen.dart b/lib/features/diets/presentation/pages/about_diet_screen.dart
index 9057c59b..82ab3144 100644
--- a/lib/features/diets/presentation/pages/about_diet_screen.dart
+++ b/lib/features/diets/presentation/pages/about_diet_screen.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -70,9 +68,7 @@ class _AboutDietScreenState extends State {
void _scrollToBottom() {
_jumped = true;
- scrollController.jumpTo(
- scrollController.position.maxScrollExtent,
- );
+ scrollController.jumpTo(scrollController.position.maxScrollExtent);
}
@override
@@ -97,11 +93,7 @@ class _AboutDietScreenState extends State {
if (dietState is DietStateLoaded) {
if (_isFirstLaunch) {
context.read().viewDiet(dietState.diet.id);
- context.read().getComments(
- dietState.diet.id.toString(),
- CommentSourceType.diet,
- true,
- );
+ context.read().getComments(dietState.diet.id.toString(), CommentSourceType.diet, true);
_isFirstLaunch = false;
}
Future.delayed(const Duration(milliseconds: 500), () {
@@ -113,14 +105,13 @@ class _AboutDietScreenState extends State {
backgroundColor: appTheme.gray100,
resizeToAvoidBottomInset: true,
bottomSheet: Container(
- padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
+ padding: EdgeInsets.only(
+ top: 12,
+ bottom: 12 + MediaQuery.of(context).padding.bottom + 56, // 56 - высота bottomNavigationBar
+ ),
decoration: BoxDecoration(
color: Colors.white,
- border: Border(
- top: BorderSide(
- color: Colors.black.withValues(alpha: 0.1),
- ),
- ),
+ border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1))),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -136,9 +127,7 @@ class _AboutDietScreenState extends State {
highlightElevation: 0,
elevation: 0,
focusElevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(20),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
backgroundColor: dietState.isStarted ? appTheme.transparentRed : appTheme.greenA700,
onPressed: () {
final cubit = context.read();
@@ -146,10 +135,7 @@ class _AboutDietScreenState extends State {
if (dietState.isStarted) {
showModalBottomSheet(
context: context,
- builder: (context) => CancelDietBottomSheet(
- aboutDietCubit: cubit,
- dietName: dietState.diet.name,
- ),
+ builder: (context) => CancelDietBottomSheet(aboutDietCubit: cubit, dietName: dietState.diet.name),
);
} else if (dietState.hasStartedDiet) {
showModalBottomSheet(
@@ -162,9 +148,7 @@ class _AboutDietScreenState extends State {
} else {
showModalBottomSheet(
context: context,
- builder: (context) => StartDietBottomSheet(
- aboutDietCubit: cubit,
- ),
+ builder: (context) => StartDietBottomSheet(aboutDietCubit: cubit),
);
}
},
@@ -209,17 +193,10 @@ class _AboutDietScreenState extends State {
FocusManager.instance.primaryFocus?.unfocus();
},
child: Container(
- decoration: BoxDecoration(
- color: appTheme.blueA400,
- shape: BoxShape.circle,
- ),
+ decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
height: 32,
width: 32,
- child: const Icon(
- Icons.close_rounded,
- size: 18,
- color: Colors.white,
- ),
+ child: const Icon(Icons.close_rounded, size: 18, color: Colors.white),
),
),
if (replyId != null) const SizedBox(width: 8),
@@ -235,22 +212,12 @@ class _AboutDietScreenState extends State {
maxLines: 5,
minLines: 1,
keyboardType: TextInputType.multiline,
- style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- color: Colors.black,
- height: 1.2,
- ),
+ style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1.2),
decoration: InputDecoration(
isDense: false, // убираем true, чтобы padding учитывался корректно
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
hintText: 'Комментарий',
- hintStyle: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- height: 1.2,
- color: Color(0xFFAEAEB2),
- ),
+ hintStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, height: 1.2, color: Color(0xFFAEAEB2)),
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
@@ -312,14 +279,14 @@ class _AboutDietScreenState extends State {
appBar: AppBar(
centerTitle: true,
leading: BackButton(
- onPressed: () {
- if (context.canPop()) {
- GoRouter.of(context).pop();
- return;
- }
- GoRouter.of(context).go('/feed-screen');
- },
- ),
+ onPressed: () {
+ if (context.canPop()) {
+ GoRouter.of(context).pop();
+ return;
+ }
+ GoRouter.of(context).go('/feed-screen');
+ },
+ ),
title: Text(
dietState.diet.name,
maxLines: 2,
@@ -342,7 +309,9 @@ class _AboutDietScreenState extends State {
),
body: SingleChildScrollView(
controller: scrollController,
- padding: const EdgeInsets.only(bottom: 160),
+ padding: EdgeInsets.only(
+ bottom: 220 + MediaQuery.of(context).padding.bottom,
+ ), // кнопка (52) + отступ (8) + поле комментария (52-200) + padding (12+12+56) + safe area
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -371,10 +340,7 @@ class _AboutDietScreenState extends State {
children: [
SvgPicture.asset('assets/icons/eye.svg', width: 18, height: 12),
const SizedBox(width: 8),
- Text(
- dietState.diet.totalViews.toString(),
- style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
- ),
+ Text(dietState.diet.totalViews.toString(), style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
const SizedBox(width: 12),
@@ -392,10 +358,7 @@ class _AboutDietScreenState extends State {
colorFilter: dietState.diet.wasLikedByMe ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
),
const SizedBox(width: 8),
- Text(
- dietState.diet.totalLikes.toString(),
- style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
- ),
+ Text(dietState.diet.totalLikes.toString(), style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
),
@@ -405,10 +368,7 @@ class _AboutDietScreenState extends State {
children: [
SvgPicture.asset('assets/icons/comment2.svg', width: 13, height: 12),
const SizedBox(width: 8),
- Text(
- dietState.diet.totalComments.toString(),
- style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
- ),
+ Text(dietState.diet.totalComments.toString(), style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
],
@@ -419,26 +379,15 @@ class _AboutDietScreenState extends State {
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
- child: Text(
- s.about_diet,
- style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
- ),
+ child: Text(s.about_diet, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
),
const SizedBox(height: 12),
- InfoRow(
- diet: dietState.diet,
- type: ProductType.diet,
- ),
- ExpandableText(
- text: dietState.diet.details,
- ),
+ InfoRow(diet: dietState.diet, type: ProductType.diet),
+ ExpandableText(text: dietState.diet.details),
const SizedBox(height: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
- child: AuthorCard(
- author: dietState.diet.author,
- title: s.diet_author,
- ),
+ child: AuthorCard(author: dietState.diet.author, title: s.diet_author),
),
const SizedBox(height: 16),
],
@@ -451,9 +400,7 @@ class _AboutDietScreenState extends State {
child: Center(
child: Text(
'${s.diet_plan}(${dietState.diet.duration.toString()} ${getDayForm(dietState.diet.duration, s)})',
- style: TextStyles.headingXLSemibold.copyWith(
- color: appTheme.black,
- ),
+ style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
),
),
@@ -463,13 +410,7 @@ class _AboutDietScreenState extends State {
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
- return _dayOfPlan(
- dietState.diet.dailySchedule[index + 1] ?? {},
- index,
- s,
- dietState.selectedIndexes,
- dietState.diet,
- );
+ return _dayOfPlan(dietState.diet.dailySchedule[index + 1] ?? {}, index, s, dietState.selectedIndexes, dietState.diet);
},
itemCount: dietState.diet.dailySchedule.length,
),
@@ -482,9 +423,7 @@ class _AboutDietScreenState extends State {
alignment: Alignment.centerLeft,
child: Text(
'${dietState.diet.totalComments} ${getCommentForm(dietState.diet.totalComments, s)}',
- style: TextStyles.textMMedium.copyWith(
- color: appTheme.gray500,
- ),
+ style: TextStyles.textMMedium.copyWith(color: appTheme.gray500),
),
),
const SizedBox(height: 16),
@@ -509,14 +448,14 @@ class _AboutDietScreenState extends State {
appBar: AppBar(
centerTitle: true,
leading: BackButton(
- onPressed: () {
- if (context.canPop()) {
- GoRouter.of(context).pop();
- return;
- }
- GoRouter.of(context).go('/feed-screen');
- },
- ),
+ onPressed: () {
+ if (context.canPop()) {
+ GoRouter.of(context).pop();
+ return;
+ }
+ GoRouter.of(context).go('/feed-screen');
+ },
+ ),
title: Text(
'',
maxLines: 2,
@@ -569,18 +508,14 @@ class _AboutDietScreenState extends State {
pressElevation: 0,
showCheckmark: false,
side: BorderSide.none,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(16),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
label: Text((index + 1).toString()),
- labelStyle: TextStyles.textXSSemibold.copyWith(
- color: index == selectedIndexes[dayNumber] ? Colors.white : appTheme.gray600,
- ),
+ labelStyle: TextStyles.textXSSemibold.copyWith(color: index == selectedIndexes[dayNumber] ? Colors.white : appTheme.gray600),
selected: selectedIndexes[dayNumber] == index,
backgroundColor: appTheme.gray100,
onSelected: (bool selected) {
- dietsCubit.setSelectedIndex(dayNumber: dayNumber, index: index);
+ dietsCubit.setSelectedIndex(dayNumber: dayNumber, index: index);
},
);
}
@@ -588,9 +523,7 @@ class _AboutDietScreenState extends State {
return Padding(
padding: const EdgeInsets.only(bottom: 8),
child: MainBackgroundBouble(
- padding: const EdgeInsets.only(
- top: 16,
- ),
+ padding: const EdgeInsets.only(top: 16),
child: Column(
children: [
Padding(
@@ -598,31 +531,12 @@ class _AboutDietScreenState extends State {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Text(
- '${s.day} ${dayNumber + 1}',
- style: TextStyles.headingXLSemibold.copyWith(
- color: appTheme.black,
- ),
- ),
- const Padding(
- padding: EdgeInsets.symmetric(vertical: 12),
- child: CustomDivider(),
- ),
- Text(
- s.meal,
- style: TextStyles.textMMedium.copyWith(
- color: appTheme.black,
- ),
- ),
+ Text('${s.day} ${dayNumber + 1}', style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
+ const Padding(padding: EdgeInsets.symmetric(vertical: 12), child: CustomDivider()),
+ Text(s.meal, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- choiceChipWidget(0),
- choiceChipWidget(1),
- choiceChipWidget(2),
- choiceChipWidget(3),
- choiceChipWidget(4),
- ],
+ children: [choiceChipWidget(0), choiceChipWidget(1), choiceChipWidget(2), choiceChipWidget(3), choiceChipWidget(4)],
),
const SizedBox(height: 8),
ListView.builder(
@@ -655,20 +569,10 @@ class _AboutDietScreenState extends State {
children: [
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.6,
- child: Text(
- daily.name,
- style: TextStyles.textMMedium.copyWith(
- color: appTheme.black,
- ),
- ),
+ child: Text(daily.name, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
),
const Spacer(),
- Text(
- '${daily.quantity} ${getLocalizedMeasurementUnits(s, daily.portion)}',
- style: TextStyles.textMSemibold.copyWith(
- color: appTheme.black,
- ),
- ),
+ Text('${daily.quantity} ${getLocalizedMeasurementUnits(s, daily.portion)}', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
],
),
);
diff --git a/lib/features/plans/presentation/pages/about_plan_screen.dart b/lib/features/plans/presentation/pages/about_plan_screen.dart
index 4ab8dd24..1fc6dba2 100644
--- a/lib/features/plans/presentation/pages/about_plan_screen.dart
+++ b/lib/features/plans/presentation/pages/about_plan_screen.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -64,9 +62,7 @@ class _AboutPlanScreenState extends State {
void _scrollToBottom() {
_jumped = true;
- scrollController.jumpTo(
- scrollController.position.maxScrollExtent,
- );
+ scrollController.jumpTo(scrollController.position.maxScrollExtent);
}
@override
@@ -75,17 +71,8 @@ class _AboutPlanScreenState extends State {
return PopScope(
child: MultiBlocProvider(
providers: [
- BlocProvider(
- create: (context) => commentsCubit
- ..getComments(
- widget.slug,
- CommentSourceType.plan,
- true,
- ),
- ),
- BlocProvider(
- create: (context) => sl()..getPlanWithLoading(widget.slug),
- ),
+ BlocProvider(create: (context) => commentsCubit..getComments(widget.slug, CommentSourceType.plan, true)),
+ BlocProvider(create: (context) => sl()..getPlanWithLoading(widget.slug)),
],
child: BlocConsumer(
listener: (BuildContext context, CommentsState commentsState) {
@@ -166,14 +153,13 @@ class _AboutPlanScreenState extends State {
backgroundColor: appTheme.gray100,
resizeToAvoidBottomInset: true,
bottomSheet: Container(
- padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
+ padding: EdgeInsets.only(
+ top: 12,
+ bottom: 12 + MediaQuery.of(context).padding.bottom + 56, // 56 - высота bottomNavigationBar
+ ),
decoration: BoxDecoration(
color: Colors.white,
- border: Border(
- top: BorderSide(
- color: Colors.black.withValues(alpha: 0.1),
- ),
- ),
+ border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1))),
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -189,9 +175,7 @@ class _AboutPlanScreenState extends State {
highlightElevation: 0,
elevation: 0,
focusElevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(16),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
backgroundColor: appTheme.greenA700,
onPressed: () async {
final (chosenPlan, error) = await context.read().chosePlan();
@@ -205,18 +189,9 @@ class _AboutPlanScreenState extends State {
return;
}
if (!context.mounted) return;
- GoRouter.of(context).pushReplacementNamed(
- 'chatScreen',
- extra: {
- 'uuid': chosenPlan.chatId,
- 'sendInitialMessage': true,
- },
- );
+ GoRouter.of(context).pushReplacementNamed('chatScreen', extra: {'uuid': chosenPlan.chatId, 'sendInitialMessage': true});
},
- label: Text(
- s.to_order,
- style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
- ),
+ label: Text(s.to_order, style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700)),
),
),
),
@@ -255,17 +230,10 @@ class _AboutPlanScreenState extends State {
FocusManager.instance.primaryFocus?.unfocus();
},
child: Container(
- decoration: BoxDecoration(
- color: appTheme.blueA400,
- shape: BoxShape.circle,
- ),
+ decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
height: 32,
width: 32,
- child: const Icon(
- Icons.close_rounded,
- size: 18,
- color: Colors.white,
- ),
+ child: const Icon(Icons.close_rounded, size: 18, color: Colors.white),
),
),
if (replyId != null) const SizedBox(width: 8),
@@ -281,22 +249,12 @@ class _AboutPlanScreenState extends State {
maxLines: 5,
minLines: 1,
keyboardType: TextInputType.multiline,
- style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- color: Colors.black,
- height: 1.2,
- ),
+ style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1.2),
decoration: InputDecoration(
isDense: false, // убираем true, чтобы padding учитывался корректно
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
hintText: 'Комментарий',
- hintStyle: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- height: 1.2,
- color: Color(0xFFAEAEB2),
- ),
+ hintStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, height: 1.2, color: Color(0xFFAEAEB2)),
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
@@ -345,11 +303,7 @@ class _AboutPlanScreenState extends State {
),
height: 32,
width: 32,
- child: Icon(
- Icons.send_rounded,
- size: 18,
- color: textEditingController.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
- ),
+ child: Icon(Icons.send_rounded, size: 18, color: textEditingController.text.length > 2 ? appTheme.whiteA700 : appTheme.black),
),
),
],
@@ -389,7 +343,9 @@ class _AboutPlanScreenState extends State {
),
body: SingleChildScrollView(
controller: scrollController,
- padding: const EdgeInsets.only(bottom: 160),
+ padding: EdgeInsets.only(
+ bottom: 220 + MediaQuery.of(context).padding.bottom,
+ ), // кнопка (52) + отступ (8) + поле комментария (52-200) + padding (12+12+56) + safe area
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -436,8 +392,9 @@ class _AboutPlanScreenState extends State {
'assets/icons/heart.svg',
width: 14,
height: 12,
- colorFilter:
- state.planModel?.wasLikedByMe == true ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
+ colorFilter: state.planModel?.wasLikedByMe == true
+ ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn)
+ : null,
),
const SizedBox(width: 8),
Text(
@@ -467,24 +424,16 @@ class _AboutPlanScreenState extends State {
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
- child: Text(
- s.about_plan,
- style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
- ),
+ child: Text(s.about_plan, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
),
const SizedBox(height: 12),
InfoRow(plan: state.planModel, type: ProductType.plan),
- ExpandableText(
- text: state.planModel?.details ?? '',
- ),
+ ExpandableText(text: state.planModel?.details ?? ''),
if (state.planModel != null) ...[
const SizedBox(height: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
- child: AuthorCard(
- author: (state.planModel?.author)!,
- title: s.plan_author,
- ),
+ child: AuthorCard(author: (state.planModel?.author)!, title: s.plan_author),
),
],
const SizedBox(height: 16),
@@ -503,22 +452,11 @@ class _AboutPlanScreenState extends State {
const SizedBox(height: 12),
],
switch (state.chosenOptionIndex) {
- 1 => OptionWidget(
- option: state.planModel?.packet2Options,
- duration: state.planModel?.duration ?? 0,
- ),
- 2 => OptionWidget(
- option: state.planModel?.packet3Options,
- duration: state.planModel?.duration ?? 0,
- ),
- _ => OptionWidget(
- option: state.planModel?.packet1Options,
- duration: state.planModel?.duration ?? 0,
- ),
+ 1 => OptionWidget(option: state.planModel?.packet2Options, duration: state.planModel?.duration ?? 0),
+ 2 => OptionWidget(option: state.planModel?.packet3Options, duration: state.planModel?.duration ?? 0),
+ _ => OptionWidget(option: state.planModel?.packet1Options, duration: state.planModel?.duration ?? 0),
},
- const SizedBox(
- height: 16,
- ),
+ const SizedBox(height: 16),
MainBackgroundBouble(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(
@@ -528,9 +466,7 @@ class _AboutPlanScreenState extends State {
alignment: Alignment.centerLeft,
child: Text(
'${state.planModel?.totalComments ?? 0} ${getCommentForm(state.planModel?.totalComments ?? 0, s)}',
- style: TextStyles.textMMedium.copyWith(
- color: appTheme.gray500,
- ),
+ style: TextStyles.textMMedium.copyWith(color: appTheme.gray500),
),
),
const SizedBox(height: 16),
diff --git a/lib/features/recipe/presentation/pages/about_recipe_screen.dart b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
index efc19a12..209cb873 100644
--- a/lib/features/recipe/presentation/pages/about_recipe_screen.dart
+++ b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
@@ -1,6 +1,4 @@
import 'dart:developer';
-import 'dart:io';
-
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -100,8 +98,14 @@ class _AboutRecipeScreenState extends State {
backgroundColor: appTheme.gray100,
resizeToAvoidBottomInset: true,
bottomSheet: Container(
- padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
- decoration: BoxDecoration(color: Colors.white, border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1)))),
+ padding: EdgeInsets.only(
+ top: 12,
+ bottom: 12 + MediaQuery.of(context).padding.bottom + 56, // 56 - высота bottomNavigationBar
+ ),
+ decoration: BoxDecoration(
+ color: Colors.white,
+ border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1))),
+ ),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
@@ -235,7 +239,9 @@ class _AboutRecipeScreenState extends State {
),
body: SingleChildScrollView(
controller: scrollController,
- padding: const EdgeInsets.only(bottom: 160),
+ padding: EdgeInsets.only(
+ bottom: 220 + MediaQuery.of(context).padding.bottom,
+ ), // кнопка (52) + отступ (8) + поле комментария (52-200) + padding (12+12+56) + safe area
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -387,7 +393,11 @@ class _AboutRecipeScreenState extends State {
if (state is CommentsStateLoading) const Loader(),
if (state is CommentsStateLoaded)
CommentsWidget(
- id: recipeState.recipe.slug, commentSourceType: CommentSourceType.recipe, comment: state.comment, replyId: replyId),
+ id: recipeState.recipe.slug,
+ commentSourceType: CommentSourceType.recipe,
+ comment: state.comment,
+ replyId: replyId,
+ ),
],
),
),
diff --git a/lib/features/registration/presentation/pages/registration_screen.dart b/lib/features/registration/presentation/pages/registration_screen.dart
index b00df3ea..759df201 100644
--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -1,378 +1,388 @@
-import 'package:eatvio_app/core/utils/image_constant.dart';
-import 'package:eatvio_app/core/widgets/loader.dart';
-import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/additional_information_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/allergies_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/blood_pressure_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/body_circumferences_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/city_of_living_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/credentials_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/date_of_birth_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/favorite_foods_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/favorite_sports_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/gender_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/height_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/medicine_intake_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/name_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/phone_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/weight_screen.dart';
-import 'package:eatvio_app/features/registration/services/registration_analytics_service.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:go_router/go_router.dart';
-import 'package:validators/validators.dart';
-
-class RegistrationScreen extends StatefulWidget {
- const RegistrationScreen({super.key});
-
- @override
- State createState() => _RegistrationScreenState();
-}
-
-class _RegistrationScreenState extends State {
- double progressValue = 1 / 15;
- int step = 1;
- final pageController = PageController();
- final RegistrationCubit registrationCubit = sl();
-
- @override
- void initState() {
- super.initState();
- RegistrationAnalyticsService.reportRegistrationStep(step);
- }
-
- @override
- Widget build(BuildContext context) {
- return BlocProvider(
- create: (BuildContext context) => registrationCubit,
- child: BlocListener(
- listener: (context, state) {
- if (state.error != null && state.error!.isNotEmpty) {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка при регистрации'),
- content: Text(state.error!),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- }
- },
- child: BlocBuilder(
- builder: (BuildContext context, RegistrationState state) {
- return Scaffold(
- floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
- floatingActionButton: Row(
- children: [
- Container(
- height: 48,
- width: MediaQuery.of(context).size.width * 0.2,
- padding: const EdgeInsets.only(left: 16, right: 4),
- child: FloatingActionButton.extended(
- heroTag: 'backButtonRegistration',
- highlightElevation: 0,
- focusElevation: 0,
- elevation: 0,
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
- backgroundColor: const Color(0xFFEAF2FD),
- onPressed: () async {
- setState(() {
- pageController.previousPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
- });
- },
- label: Icon(Icons.arrow_back_ios_new_rounded, color: appTheme.blueA400),
- ),
- ),
- Container(
- height: 48,
- width: MediaQuery.of(context).size.width * 0.8,
- padding: const EdgeInsets.only(left: 4, right: 16),
- child: FloatingActionButton.extended(
- heroTag: 'nextButtonRegistration',
- highlightElevation: 0,
- elevation: 0,
- focusElevation: 0,
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
- backgroundColor: appTheme.blueA400,
- onPressed: () async {
- if (await canGoNext(state, context)) {
- setState(() {
- pageController.nextPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
- });
- }
- },
- label: Text('Продолжить', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
- ),
- ),
- ],
- ),
- appBar: AppBar(
- automaticallyImplyLeading: false,
- leading: Builder(
- builder: (context) => IconButton(icon: const Icon(Icons.close_rounded), onPressed: () => GoRouter.of(context).pop()),
- ),
- centerTitle: true,
- title: SvgPicture.asset(ImageConstant.imgLogoEatvio, height: 48, fit: BoxFit.contain),
- actions: [Padding(padding: const EdgeInsets.only(right: 16), child: Text('шаг $step из 15'))],
- bottom: PreferredSize(
- preferredSize: Size(MediaQuery.of(context).size.width, 32),
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: TweenAnimationBuilder(
- duration: const Duration(milliseconds: 350),
- curve: Curves.easeInOut,
- tween: Tween(begin: 1 / 15, end: progressValue),
- builder: (context, value, _) => LinearProgressIndicator(
- value: value,
- borderRadius: BorderRadius.circular(16),
- minHeight: 8,
- backgroundColor: Colors.grey.shade100,
- valueColor: AlwaysStoppedAnimation(appTheme.blueA400),
- ),
- ),
- ),
- ),
- ),
- body: PageView(
- physics: const NeverScrollableScrollPhysics(),
- controller: pageController,
- onPageChanged: (index) {
- setState(() {
- step = index + 1;
- progressValue = step / 15;
- });
- // Report analytics for step completion
- RegistrationAnalyticsService.reportRegistrationStep(step);
- },
- children: [
- // LanguageSelectScreen(sheet: state.sheet),
- PhoneScreen(sheet: state.sheet),
- CredentialsScreen(sheet: state.sheet),
- NameScreen(sheet: state.sheet),
- GenderScreen(sheet: state.sheet),
- DateOfBirthScreen(sheet: state.sheet),
- CityOfLivingScreen(sheet: state.sheet),
- BodyCircumferencesScreen(sheet: state.sheet),
- WeightScreen(sheet: state.sheet),
- HeightScreen(sheet: state.sheet),
- BloodPressureScreen(sheet: state.sheet),
- AllergiesScreen(sheet: state.sheet),
- MedicineIntakeScreen(sheet: state.sheet),
- FavoriteSportsScreen(sheet: state.sheet),
- FavoriteFoodsScreen(sheet: state.sheet),
- AdditionalInformationScreen(sheet: state.sheet),
- ],
- ),
- );
- },
- ),
- ),
- );
- }
-
- Future canGoNext(RegistrationState state, BuildContext context) async {
- switch (step) {
- case 1:
- if (state.sheet.phone.length != 18) {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: const Text('Введите корректный номер телефона'),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- } else {
- return true;
- }
- case 2:
- List errors = validateCredentialsFields(state.sheet.email, state.sheet.password, state.sheet.passwordConfirmation, context);
- if (errors.isEmpty) {
- return true;
- } else {
- String errorMessage = '';
-
- for (var error in errors) {
- errorMessage += '$error\n\n';
- }
-
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: Text(errorMessage),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- }
- case 3:
- List errors = validateNameFields(state.sheet.firstName.toString(), state.sheet.lastName.toString(), context);
- if (errors.isEmpty) {
- return true;
- } else {
- String errorMessage = '';
-
- for (var error in errors) {
- errorMessage += '$error\n\n';
- }
-
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: Text(errorMessage),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- }
- case 4:
- if (state.sheet.gender.isNotEmpty) {
- return true;
- } else {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: const Text('Выберете пол'),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- }
- case 6:
- if (state.sheet.location.isNotEmpty) {
- return true;
- } else {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: const Text('Заполните все поля'),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- }
- case 7:
- List errors = validateCircumferencesFields(
- state.sheet.chestCircumference.toString(),
- state.sheet.waistCircumference.toString(),
- state.sheet.hipCircumference.toString(),
- context,
- );
- if (errors.isEmpty) {
- return true;
- } else {
- String errorMessage = '';
-
- for (var error in errors) {
- errorMessage += '$error\n\n';
- }
-
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ошибка'),
- content: Text(errorMessage),
- actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
- ),
- );
- return false;
- }
- case 15:
- try {
- showDialog(
- barrierDismissible: false,
- useSafeArea: false,
- context: context,
- builder: (context) => const PopScope(canPop: false, child: Loader()),
- );
- await registrationCubit.tryRegistration();
- if (context.mounted) {
- Navigator.pop(context);
- }
- } catch (e) {
- if (context.mounted) {
- Navigator.pop(context);
- showDialog(
- context: context,
- builder: (context) => const AlertDialog(title: Text('Ошибка при попытке регистрации')),
- );
- }
- }
- return false;
- default:
- return true;
- }
- }
-
- List validateCircumferencesFields(String chestCircumference, String waistCircumference, String hipCircumference, BuildContext context) {
- final s = S.of(context);
-
- List errors = [];
-
- if (chestCircumference.isEmpty | waistCircumference.isEmpty | hipCircumference.isEmpty) {
- errors.add(s.circumference_empty);
- }
-
- if (![chestCircumference, waistCircumference, hipCircumference].every((circumference) => int.tryParse(circumference) != null)) {
- errors.add(s.circumference_is_not_a_number);
- }
-
- return errors;
- }
-
- List validateCredentialsFields(String email, String password, String passwordConfirmation, BuildContext context) {
- final s = S.of(context);
-
- List errors = [];
-
- if (!isEmail(email)) {
- errors.add(s.email_invalid);
- }
-
- if (email.isEmpty) {
- errors.add(s.email_empty);
- }
-
- if (password.length < 6) {
- errors.add(s.password_short);
- }
-
- if (password != passwordConfirmation) {
- errors.add(s.password_confirmation_mismatch);
- }
-
- return errors;
- }
-
- List validateNameFields(String firstName, String lastName, BuildContext context) {
- List errors = [];
-
- if (firstName.isEmpty) {
- errors.add('First name cannot be empty');
- }
-
- if (firstName.isEmpty) {
- errors.add('First name is too short');
- }
-
- if (lastName.isEmpty) {
- errors.add('Last name cannot be empty');
- }
-
- if (lastName.isEmpty) {
- errors.add('Last name is too short');
- }
-
- return errors;
- }
-}
+import 'package:eatvio_app/core/utils/image_constant.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
+import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/additional_information_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/allergies_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/blood_pressure_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/body_circumferences_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/city_of_living_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/credentials_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/date_of_birth_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/favorite_foods_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/favorite_sports_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/gender_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/height_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/medicine_intake_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/name_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/phone_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/weight_screen.dart';
+import 'package:eatvio_app/features/registration/services/registration_analytics_service.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:go_router/go_router.dart';
+import 'package:validators/validators.dart';
+
+class RegistrationScreen extends StatefulWidget {
+ const RegistrationScreen({super.key});
+
+ @override
+ State createState() => _RegistrationScreenState();
+}
+
+class _RegistrationScreenState extends State {
+ double progressValue = 1 / 15;
+ int step = 1;
+ final pageController = PageController();
+ final RegistrationCubit registrationCubit = sl();
+
+ @override
+ void initState() {
+ super.initState();
+ RegistrationAnalyticsService.reportRegistrationStep(step);
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocProvider(
+ create: (BuildContext context) => registrationCubit,
+ child: BlocListener(
+ listener: (context, state) {
+ if (state.error != null && state.error!.isNotEmpty) {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка при регистрации'),
+ content: Text(state.error!),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ }
+ },
+ child: BlocBuilder(
+ builder: (BuildContext context, RegistrationState state) {
+ return Scaffold(
+ floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+ floatingActionButton: Row(
+ children: [
+ Container(
+ height: 48,
+ width: MediaQuery.of(context).size.width * 0.2,
+ padding: const EdgeInsets.only(left: 16, right: 4),
+ child: FloatingActionButton.extended(
+ heroTag: 'backButtonRegistration',
+ highlightElevation: 0,
+ focusElevation: 0,
+ elevation: 0,
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+ backgroundColor: const Color(0xFFEAF2FD),
+ onPressed: () async {
+ setState(() {
+ pageController.previousPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+ });
+ },
+ label: Icon(Icons.arrow_back_ios_new_rounded, color: appTheme.blueA400),
+ ),
+ ),
+ Container(
+ height: 48,
+ width: MediaQuery.of(context).size.width * 0.8,
+ padding: const EdgeInsets.only(left: 4, right: 16),
+ child: FloatingActionButton.extended(
+ heroTag: 'nextButtonRegistration',
+ highlightElevation: 0,
+ elevation: 0,
+ focusElevation: 0,
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+ backgroundColor: appTheme.blueA400,
+ onPressed: () async {
+ if (await canGoNext(state, context)) {
+ setState(() {
+ pageController.nextPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+ });
+ }
+ },
+ label: Text('Продолжить', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
+ ),
+ ),
+ ],
+ ),
+ appBar: AppBar(
+ automaticallyImplyLeading: false,
+ leading: Builder(
+ builder: (context) => IconButton(icon: const Icon(Icons.close_rounded), onPressed: () => GoRouter.of(context).pop()),
+ ),
+ centerTitle: true,
+ title: SvgPicture.asset(ImageConstant.imgLogoEatvio, height: 48, fit: BoxFit.contain),
+ actions: [Padding(padding: const EdgeInsets.only(right: 16), child: Text('шаг $step из 15'))],
+ bottom: PreferredSize(
+ preferredSize: Size(MediaQuery.of(context).size.width, 32),
+ child: Padding(
+ padding: const EdgeInsets.all(16),
+ child: TweenAnimationBuilder(
+ duration: const Duration(milliseconds: 350),
+ curve: Curves.easeInOut,
+ tween: Tween(begin: 1 / 15, end: progressValue),
+ builder: (context, value, _) => LinearProgressIndicator(
+ value: value,
+ borderRadius: BorderRadius.circular(16),
+ minHeight: 8,
+ backgroundColor: Colors.grey.shade100,
+ valueColor: AlwaysStoppedAnimation(appTheme.blueA400),
+ ),
+ ),
+ ),
+ ),
+ ),
+ body: PageView(
+ physics: const NeverScrollableScrollPhysics(),
+ controller: pageController,
+ onPageChanged: (index) {
+ setState(() {
+ step = index + 1;
+ progressValue = step / 15;
+ });
+ // Report analytics for step completion
+ RegistrationAnalyticsService.reportRegistrationStep(step);
+ },
+ children: [
+ // LanguageSelectScreen(sheet: state.sheet),
+ PhoneScreen(sheet: state.sheet),
+ CredentialsScreen(sheet: state.sheet),
+ NameScreen(sheet: state.sheet),
+ GenderScreen(sheet: state.sheet),
+ DateOfBirthScreen(sheet: state.sheet),
+ CityOfLivingScreen(sheet: state.sheet),
+ BodyCircumferencesScreen(sheet: state.sheet),
+ WeightScreen(sheet: state.sheet),
+ HeightScreen(sheet: state.sheet),
+ BloodPressureScreen(sheet: state.sheet),
+ AllergiesScreen(sheet: state.sheet),
+ MedicineIntakeScreen(sheet: state.sheet),
+ FavoriteSportsScreen(sheet: state.sheet),
+ FavoriteFoodsScreen(sheet: state.sheet),
+ AdditionalInformationScreen(sheet: state.sheet),
+ ],
+ ),
+ );
+ },
+ ),
+ ),
+ );
+ }
+
+ Future canGoNext(RegistrationState state, BuildContext context) async {
+ switch (step) {
+ case 1:
+ if (state.sheet.phone.length != 18) {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: const Text('Введите корректный номер телефона'),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ } else {
+ return true;
+ }
+ case 2:
+ List errors = validateCredentialsFields(state.sheet.email, state.sheet.password, state.sheet.passwordConfirmation, context);
+ if (errors.isEmpty) {
+ return true;
+ } else {
+ String errorMessage = '';
+
+ for (var error in errors) {
+ errorMessage += '$error\n\n';
+ }
+
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: Text(errorMessage),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ }
+ case 3:
+ List errors = validateNameFields(state.sheet.firstName.toString(), state.sheet.lastName.toString(), context);
+ if (errors.isEmpty) {
+ return true;
+ } else {
+ String errorMessage = '';
+
+ for (var error in errors) {
+ errorMessage += '$error\n\n';
+ }
+
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: Text(errorMessage),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ }
+ case 4:
+ if (state.sheet.gender.isNotEmpty) {
+ return true;
+ } else {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: const Text('Выберете пол'),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ }
+ case 6:
+ if (state.sheet.location.isNotEmpty) {
+ return true;
+ } else {
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: const Text('Заполните все поля'),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ }
+ case 7:
+ List errors = validateCircumferencesFields(
+ state.sheet.chestCircumference.toString(),
+ state.sheet.waistCircumference.toString(),
+ state.sheet.hipCircumference.toString(),
+ context,
+ );
+ if (errors.isEmpty) {
+ return true;
+ } else {
+ String errorMessage = '';
+
+ for (var error in errors) {
+ errorMessage += '$error\n\n';
+ }
+
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка'),
+ content: Text(errorMessage),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ return false;
+ }
+ case 15:
+ try {
+ showDialog(
+ barrierDismissible: false,
+ useSafeArea: false,
+ context: context,
+ builder: (context) => const PopScope(canPop: false, child: Loader()),
+ );
+ await registrationCubit.tryRegistration();
+ if (context.mounted) {
+ Navigator.pop(context);
+ }
+ } catch (e) {
+ if (context.mounted) {
+ Navigator.pop(context);
+ String errorMessage = '';
+ if (e is String) {
+ errorMessage = e;
+ } else {
+ errorMessage = e.toString().replaceFirst('Exception: ', '').replaceFirst('Error: ', '');
+ }
+ showDialog(
+ context: context,
+ builder: (context) => AlertDialog(
+ title: const Text('Ошибка при регистрации'),
+ content: Text(errorMessage.isNotEmpty ? errorMessage : 'Регистрация не удалась'),
+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+ ),
+ );
+ }
+ }
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ List validateCircumferencesFields(String chestCircumference, String waistCircumference, String hipCircumference, BuildContext context) {
+ final s = S.of(context);
+
+ List errors = [];
+
+ if (chestCircumference.isEmpty | waistCircumference.isEmpty | hipCircumference.isEmpty) {
+ errors.add(s.circumference_empty);
+ }
+
+ if (![chestCircumference, waistCircumference, hipCircumference].every((circumference) => int.tryParse(circumference) != null)) {
+ errors.add(s.circumference_is_not_a_number);
+ }
+
+ return errors;
+ }
+
+ List validateCredentialsFields(String email, String password, String passwordConfirmation, BuildContext context) {
+ final s = S.of(context);
+
+ List errors = [];
+
+ if (!isEmail(email)) {
+ errors.add(s.email_invalid);
+ }
+
+ if (email.isEmpty) {
+ errors.add(s.email_empty);
+ }
+
+ if (password.length < 6) {
+ errors.add(s.password_short);
+ }
+
+ if (password != passwordConfirmation) {
+ errors.add(s.password_confirmation_mismatch);
+ }
+
+ return errors;
+ }
+
+ List validateNameFields(String firstName, String lastName, BuildContext context) {
+ List errors = [];
+
+ if (firstName.isEmpty) {
+ errors.add('First name cannot be empty');
+ }
+
+ if (firstName.isEmpty) {
+ errors.add('First name is too short');
+ }
+
+ if (lastName.isEmpty) {
+ errors.add('Last name cannot be empty');
+ }
+
+ if (lastName.isEmpty) {
+ errors.add('Last name is too short');
+ }
+
+ return errors;
+ }
+}
diff --git a/lib/features/registration/presentation/pages/verify_email_screen.dart b/lib/features/registration/presentation/pages/verify_email_screen.dart
index 4ade2581..12fd9287 100644
--- a/lib/features/registration/presentation/pages/verify_email_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_email_screen.dart
@@ -105,7 +105,7 @@ class _VerifyEmailScreenState extends State {
},
builder: (context, state) {
return Scaffold(
- appBar: AppBar(title: const Text("Подтвердите почту")),
+ appBar: AppBar(title: const Text("Подтвердите почту"), ),
body: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
diff --git a/lib/features/registration_v2/cubit/registration_cubit.dart b/lib/features/registration_v2/cubit/registration_cubit.dart
index 67cd5a0d..49d4eabc 100644
--- a/lib/features/registration_v2/cubit/registration_cubit.dart
+++ b/lib/features/registration_v2/cubit/registration_cubit.dart
@@ -1,238 +1,266 @@
-import 'dart:developer';
-
-import 'package:dio/dio.dart';
-import 'package:eatvio_app/core/token_storage.dart';
-import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
-import 'package:eatvio_app/features/registration_v2/models/registration_model.dart';
-import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:gpassword/gpassword.dart';
-
-class RegistrationCubitV2 extends Cubit {
- final RegistrationRepositoryV2 registrationRepository;
- RegistrationCubitV2({required this.registrationRepository}) : super(RegistrationStateV2());
-
- void setFirstName(String firstName) {
- emit(state.copyWith(firstName: firstName));
- validateFirstName();
- }
-
- void setLastName(String lastName) {
- emit(state.copyWith(lastName: lastName));
- validateLastName();
- }
-
- void setEmail(String email) {
- emit(state.copyWith(email: email));
- validateEmail();
- }
-
- void setPhone(String phone) {
- emit(state.copyWith(phone: phone));
- validatePhone();
- }
-
- void setBirthday(DateTime birthday) {
- emit(state.copyWith(birthday: birthday));
- validateBirthday();
- }
-
- void setGender(String gender) {
- emit(state.copyWith(gender: gender));
- validateGender();
- }
-
- void setWeight(int weight) {
- emit(state.copyWith(weight: weight));
- validateWeight();
- }
-
- void setHeight(int height) {
- emit(state.copyWith(height: height));
- validateHeight();
- }
-
- void setActivityCoefficient(double activityCoefficient) {
- emit(state.copyWith(activityCoefficient: activityCoefficient));
- validateActivityCoefficient();
- }
-
- void setPassword(String password) {
- emit(state.copyWith(password: password));
- }
-
- bool validateFirstName() {
- if (state.firstName.isEmpty) {
- emit(state.copyWith(isFirstNameValid: false));
- return false;
- }
- emit(state.copyWith(isFirstNameValid: true));
- return true;
- }
-
- bool validateLastName() {
- if (state.lastName.isEmpty) {
- emit(state.copyWith(isLastNameValid: false));
- return false;
- }
- emit(state.copyWith(isLastNameValid: true));
- return true;
- }
-
- bool validateEmail() {
- if (state.email.isEmpty) {
- emit(state.copyWith(isEmailValid: false));
- return false;
- }
- emit(state.copyWith(isEmailValid: true));
- return true;
- }
-
- bool validatePhone() {
- if (state.phone.isEmpty) {
- emit(state.copyWith(isPhoneValid: false));
- return false;
- }
- emit(state.copyWith(isPhoneValid: true));
- return true;
- }
-
- bool validateGender() {
- if (state.gender.isEmpty) {
- emit(state.copyWith(isGenderValid: false));
- return false;
- }
- emit(state.copyWith(isGenderValid: true));
- return true;
- }
-
- bool validateWeight() {
- if (state.weight == 0) {
- emit(state.copyWith(isWeightValid: false));
- return false;
- }
- emit(state.copyWith(isWeightValid: true));
- return true;
- }
-
- bool validateHeight() {
- if (state.height == 0) {
- emit(state.copyWith(isHeightValid: false));
- return false;
- }
- emit(state.copyWith(isHeightValid: true));
- return true;
- }
-
- bool validateActivityCoefficient() {
- if (state.activityCoefficient == 0) {
- emit(state.copyWith(isActivityCoefficientValid: false));
- return false;
- }
- emit(state.copyWith(isActivityCoefficientValid: true));
- return true;
- }
-
- bool validateBirthday() {
- if (state.birthday == null) {
- emit(state.copyWith(isBirthdayValid: false));
- return false;
- }
- emit(state.copyWith(isBirthdayValid: true));
- return true;
- }
-
- void nextStep() {
- emit(state.copyWith(step: 1));
- }
-
- void prevStep() {
- emit(state.copyWith(step: 0));
- }
-
- bool validateAllFields() {
- if (!validateFirstName() ||
- !validateLastName() ||
- !validateEmail() ||
- !validatePhone() ||
- !validateGender() ||
- !validateWeight() ||
- !validateHeight() ||
- !validateActivityCoefficient() ||
- !validateBirthday()) {
- return false;
- }
- return true;
- }
-
- Future<(bool, bool)> register() async {
- if (!validateAllFields()) {
- return (false, true);
- }
- final birthday = state.birthday?.format('yyyy-MM-dd');
- if (birthday == null) {
- validateBirthday();
- return (false, true);
- }
- final password = await _generatePassword();
- final registrationModel = RegistrationModel(
- firstName: state.firstName,
- lastName: state.lastName,
- email: state.email,
- phone: state.phone,
- gender: state.gender,
- password: password,
- confirmPassword: password,
- weight: state.weight,
- height: state.height,
- activityCoefficient: state.activityCoefficient,
- birthday: birthday,
- );
- bool didApiComplainOnValidation = false;
- try {
- final token = await registrationRepository.register(registrationModel: registrationModel);
- if (token != null) {
- TokenStorage.saveTokenInStorage(token);
- return (true, false);
- }
- } on DioException catch (e) {
- final errors = e.response?.data['errors'] as Map?;
- final emailErrors = errors?['email'] as List?;
- final phoneErrors = errors?['phone'] as List?;
- final dateOfBirth = errors?['date_of_birth'] as List?;
- if (emailErrors != null && emailErrors.isNotEmpty) {
- if (emailErrors.contains('Некорректный формат email')) {
- emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Некорректный формат email'));
- didApiComplainOnValidation = true;
- }
- if (emailErrors.contains('Такой Эл. почта уже существует.')) {
- emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Такая Эл. почта уже существует.'));
- didApiComplainOnValidation = true;
- }
- }
- if (phoneErrors != null && phoneErrors.isNotEmpty) {
- if (phoneErrors.contains('Такой phone уже существует.')) {
- emit(state.copyWith(isPhoneValid: false, phoneDisplayError: 'Такой номер телефона уже существует.'));
- didApiComplainOnValidation = true;
- }
- }
- if (dateOfBirth != null && dateOfBirth.isNotEmpty) {
- if (dateOfBirth.contains('Некорректный формат даты рождения')) {
- emit(state.copyWith(isBirthdayValid: false, emailDisplayError: 'Некорректный формат даты рождения'));
- didApiComplainOnValidation = true;
- }
- }
- } catch (e) {
- log(e.toString());
- }
- return (false, didApiComplainOnValidation);
- }
-
- Future _generatePassword() async {
- final generator = GPassword();
- final password = generator.generate(passwordLength: 10);
- emit(state.copyWith(password: password));
- return password;
- }
-}
+import 'dart:developer';
+
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
+import 'package:eatvio_app/features/registration_v2/models/registration_model.dart';
+import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:gpassword/gpassword.dart';
+
+class RegistrationCubitV2 extends Cubit {
+ final RegistrationRepositoryV2 registrationRepository;
+ RegistrationCubitV2({required this.registrationRepository}) : super(const RegistrationStateV2());
+
+ void setFirstName(String firstName) {
+ emit(state.copyWith(firstName: firstName));
+ validateFirstName();
+ }
+
+ void setLastName(String lastName) {
+ emit(state.copyWith(lastName: lastName));
+ validateLastName();
+ }
+
+ void setEmail(String email) {
+ emit(state.copyWith(email: email));
+ validateEmail();
+ }
+
+ void setPhone(String phone) {
+ emit(state.copyWith(phone: phone));
+ validatePhone();
+ }
+
+ void setBirthday(DateTime birthday) {
+ emit(state.copyWith(birthday: birthday));
+ validateBirthday();
+ }
+
+ void setGender(String gender) {
+ emit(state.copyWith(gender: gender));
+ validateGender();
+ }
+
+ void setWeight(int weight) {
+ emit(state.copyWith(weight: weight));
+ validateWeight();
+ }
+
+ void setHeight(int height) {
+ emit(state.copyWith(height: height));
+ validateHeight();
+ }
+
+ void setActivityCoefficient(double activityCoefficient) {
+ emit(state.copyWith(activityCoefficient: activityCoefficient));
+ validateActivityCoefficient();
+ }
+
+ void setPassword(String password) {
+ emit(state.copyWith(password: password));
+ }
+
+ bool validateFirstName() {
+ if (state.firstName.isEmpty) {
+ emit(state.copyWith(isFirstNameValid: false));
+ return false;
+ }
+ emit(state.copyWith(isFirstNameValid: true));
+ return true;
+ }
+
+ bool validateLastName() {
+ if (state.lastName.isEmpty) {
+ emit(state.copyWith(isLastNameValid: false));
+ return false;
+ }
+ emit(state.copyWith(isLastNameValid: true));
+ return true;
+ }
+
+ bool validateEmail() {
+ if (state.email.isEmpty) {
+ emit(state.copyWith(isEmailValid: false));
+ return false;
+ }
+ emit(state.copyWith(isEmailValid: true));
+ return true;
+ }
+
+ bool validatePhone() {
+ if (state.phone.isEmpty) {
+ emit(state.copyWith(isPhoneValid: false));
+ return false;
+ }
+ emit(state.copyWith(isPhoneValid: true));
+ return true;
+ }
+
+ bool validateGender() {
+ if (state.gender.isEmpty) {
+ emit(state.copyWith(isGenderValid: false));
+ return false;
+ }
+ emit(state.copyWith(isGenderValid: true));
+ return true;
+ }
+
+ bool validateWeight() {
+ if (state.weight == 0) {
+ emit(state.copyWith(isWeightValid: false));
+ return false;
+ }
+ emit(state.copyWith(isWeightValid: true));
+ return true;
+ }
+
+ bool validateHeight() {
+ if (state.height == 0) {
+ emit(state.copyWith(isHeightValid: false));
+ return false;
+ }
+ emit(state.copyWith(isHeightValid: true));
+ return true;
+ }
+
+ bool validateActivityCoefficient() {
+ if (state.activityCoefficient == 0) {
+ emit(state.copyWith(isActivityCoefficientValid: false));
+ return false;
+ }
+ emit(state.copyWith(isActivityCoefficientValid: true));
+ return true;
+ }
+
+ bool validateBirthday() {
+ if (state.birthday == null) {
+ emit(state.copyWith(isBirthdayValid: false));
+ return false;
+ }
+ emit(state.copyWith(isBirthdayValid: true));
+ return true;
+ }
+
+ void nextStep() {
+ emit(state.copyWith(step: 1));
+ }
+
+ void prevStep() {
+ emit(state.copyWith(step: 0));
+ }
+
+ bool validateAllFields() {
+ if (!validateFirstName() ||
+ !validateLastName() ||
+ !validateEmail() ||
+ !validatePhone() ||
+ !validateGender() ||
+ !validateWeight() ||
+ !validateHeight() ||
+ !validateActivityCoefficient() ||
+ !validateBirthday()) {
+ return false;
+ }
+ return true;
+ }
+
+ Future<(bool, bool)> register() async {
+ if (!validateAllFields()) {
+ return (false, true);
+ }
+ final birthday = state.birthday?.format('yyyy-MM-dd');
+ if (birthday == null) {
+ validateBirthday();
+ return (false, true);
+ }
+ final password = await _generatePassword();
+ final registrationModel = RegistrationModel(
+ firstName: state.firstName,
+ lastName: state.lastName,
+ email: state.email,
+ phone: state.phone,
+ gender: state.gender,
+ password: password,
+ confirmPassword: password,
+ weight: state.weight,
+ height: state.height,
+ activityCoefficient: state.activityCoefficient,
+ birthday: birthday,
+ );
+ bool didApiComplainOnValidation = false;
+ String errorMessage = '';
+ try {
+ final token = await registrationRepository.register(registrationModel: registrationModel);
+ if (token != null) {
+ TokenStorage.saveTokenInStorage(token);
+ emit(state.copyWith(registrationError: null));
+ return (true, false);
+ }
+ } on DioException catch (e) {
+ final errors = e.response?.data['errors'] as Map?;
+ final emailErrors = errors?['email'] as List?;
+ final phoneErrors = errors?['phone'] as List?;
+ final dateOfBirth = errors?['date_of_birth'] as List?;
+
+ // Собираем все ошибки для отображения в диалоге
+ List allErrors = [];
+
+ if (emailErrors != null && emailErrors.isNotEmpty) {
+ for (var error in emailErrors) {
+ allErrors.add(error.toString());
+ if (error.toString() == 'Некорректный формат email') {
+ emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Некорректный формат email'));
+ didApiComplainOnValidation = true;
+ }
+ if (error.toString() == 'Такой Эл. почта уже существует.') {
+ emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Такая Эл. почта уже существует.'));
+ didApiComplainOnValidation = true;
+ }
+ }
+ }
+ if (phoneErrors != null && phoneErrors.isNotEmpty) {
+ for (var error in phoneErrors) {
+ allErrors.add(error.toString());
+ if (error.toString() == 'Такой phone уже существует.') {
+ emit(state.copyWith(isPhoneValid: false, phoneDisplayError: 'Такой номер телефона уже существует.'));
+ didApiComplainOnValidation = true;
+ }
+ }
+ }
+ if (dateOfBirth != null && dateOfBirth.isNotEmpty) {
+ for (var error in dateOfBirth) {
+ allErrors.add(error.toString());
+ if (error.toString() == 'Некорректный формат даты рождения') {
+ emit(state.copyWith(isBirthdayValid: false, dateOfBirthDisplayError: 'Некорректный формат даты рождения'));
+ didApiComplainOnValidation = true;
+ }
+ }
+ }
+
+ // Сохраняем все ошибки для отображения в диалоге
+ if (allErrors.isNotEmpty) {
+ errorMessage = allErrors.join('\n');
+ emit(state.copyWith(registrationError: errorMessage));
+ } else {
+ // Если нет конкретных ошибок, берем общее сообщение
+ final message = e.response?.data['message'] as String?;
+ errorMessage = message ?? 'Ошибка при регистрации';
+ emit(state.copyWith(registrationError: errorMessage));
+ }
+ } catch (e) {
+ log(e.toString());
+ errorMessage = e.toString();
+ emit(state.copyWith(registrationError: errorMessage));
+ }
+ return (false, didApiComplainOnValidation);
+ }
+
+ Future _generatePassword() async {
+ final generator = GPassword();
+ final password = generator.generate(passwordLength: 10);
+ emit(state.copyWith(password: password));
+ return password;
+ }
+}
diff --git a/lib/features/registration_v2/cubit/registration_state.dart b/lib/features/registration_v2/cubit/registration_state.dart
index de26c146..8191d7d2 100644
--- a/lib/features/registration_v2/cubit/registration_state.dart
+++ b/lib/features/registration_v2/cubit/registration_state.dart
@@ -1,32 +1,33 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'registration_state.freezed.dart';
-
-@freezed
-abstract class RegistrationStateV2 with _$RegistrationStateV2 {
- factory RegistrationStateV2({
- @Default('') String firstName,
- @Default('') String lastName,
- @Default('') String email,
- @Default('') String phone,
- @Default('') String gender,
- @Default('') String password,
- @Default(0) int weight,
- @Default(0) int height,
- @Default(1.2) double activityCoefficient,
- DateTime? birthday,
- @Default(true) bool isFirstNameValid,
- @Default(true) bool isLastNameValid,
- @Default(true) bool isEmailValid,
- @Default(true) bool isPhoneValid,
- @Default(true) bool isGenderValid,
- @Default(true) bool isWeightValid,
- @Default(true) bool isHeightValid,
- @Default(true) bool isActivityCoefficientValid,
- @Default(true) bool isBirthdayValid,
- @Default(0) int step,
- @Default('') String emailDisplayError,
- @Default('') String phoneDisplayError,
- @Default('') String dateOfBirthDisplayError,
- }) = _RegistrationStateV2;
-}
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'registration_state.freezed.dart';
+
+@freezed
+abstract class RegistrationStateV2 with _$RegistrationStateV2 {
+ const factory RegistrationStateV2({
+ @Default('') String firstName,
+ @Default('') String lastName,
+ @Default('') String email,
+ @Default('') String phone,
+ @Default('') String gender,
+ @Default('') String password,
+ @Default(0) int weight,
+ @Default(0) int height,
+ @Default(1.2) double activityCoefficient,
+ DateTime? birthday,
+ @Default(true) bool isFirstNameValid,
+ @Default(true) bool isLastNameValid,
+ @Default(true) bool isEmailValid,
+ @Default(true) bool isPhoneValid,
+ @Default(true) bool isGenderValid,
+ @Default(true) bool isWeightValid,
+ @Default(true) bool isHeightValid,
+ @Default(true) bool isActivityCoefficientValid,
+ @Default(true) bool isBirthdayValid,
+ @Default(0) int step,
+ @Default('') String emailDisplayError,
+ @Default('') String phoneDisplayError,
+ @Default('') String dateOfBirthDisplayError,
+ String? registrationError,
+ }) = _RegistrationStateV2;
+}
diff --git a/lib/features/registration_v2/presentation/widgets/first_step_content.dart b/lib/features/registration_v2/presentation/widgets/first_step_content.dart
index 8f4b5372..78244da8 100644
--- a/lib/features/registration_v2/presentation/widgets/first_step_content.dart
+++ b/lib/features/registration_v2/presentation/widgets/first_step_content.dart
@@ -1,176 +1,178 @@
-import 'package:eatvio_app/core/theme/custom_text_style.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
-import 'package:eatvio_app/features/registration_v2/presentation/widgets/sex_widget.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
-
-class FirstStepContent extends StatefulWidget {
- const FirstStepContent({super.key});
-
- @override
- State createState() => _FirstStepContentState();
-}
-
-class _FirstStepContentState extends State {
- final maskFormatterForBirthday = MaskTextInputFormatter(mask: '##.##.####', filter: {"#": RegExp(r'[0-9]')}, type: MaskAutoCompletionType.lazy);
-
- final firstNameController = TextEditingController();
-
- final lastNameController = TextEditingController();
-
- final emailController = TextEditingController();
-
- final phoneController = TextEditingController();
-
- final dateController = TextEditingController();
- @override
- void initState() {
- super.initState();
- firstNameController.text = context.read().state.firstName;
- lastNameController.text = context.read().state.lastName;
- emailController.text = context.read().state.email;
- phoneController.text = context.read().state.phone;
- dateController.text = context.read().state.birthday?.format('dd.MM.yyyy') ?? '';
- }
-
- @override
- Widget build(BuildContext context) {
- final s = S.of(context);
- return BlocBuilder(
- builder: (context, state) {
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Row(
- children: [
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(s.first_name, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
- const SizedBox(height: 4),
- CustomTextFormField(
- hintText: s.your_name,
- hasError: !state.isFirstNameValid,
- controller: firstNameController,
- onChanged: (val) {
- context.read().setFirstName(val);
- },
- ),
- if (!state.isFirstNameValid) ...[const SizedBox(height: 4), ValidationErrorWidget(error: s.first_name_validation_error)],
- ],
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(s.last_name, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
- const SizedBox(height: 4),
- CustomTextFormField(
- hintText: s.your_last_name,
- hasError: !state.isLastNameValid,
- controller: lastNameController,
- onChanged: (val) {
- context.read