Merge remote-tracking branch 'upstream/main'

2024-11-20 18:45:50 +07:00
parent 985243a2aa 7355d453aa
commit c3cb55f8a2
206 changed files with 951 additions and 8388 deletions
--- a/lib/features/auth/auth_screen/auth_screen.dart
+++ b/lib/features/auth/auth_screen/auth_screen.dart
@@ -0,0 +1,256 @@
+import 'dart:convert';
+
+import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/core/utils/image_constant.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/generated/l10n.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:http/http.dart' as http;
+import 'package:url_launcher/url_launcher.dart';
+import 'package:validators/validators.dart';
+
+import 'bloc/auth_bloc.dart';
+import 'models/auth_model.dart';
+
+class AuthScreen extends StatefulWidget {
+  static Widget builder(BuildContext context) {
+    return BlocProvider<AuthBloc>(
+      create: (context) => AuthBloc(
+        AuthState(
+          authModelObj: AuthModel(),
+        ),
+      )..add(
+          AuthInitialEvent(),
+        ),
+      child: AuthScreen(),
+    );
+  }
+
+  @override
+  State<AuthScreen> createState() => _AuthScreenState();
+}
+
+class _AuthScreenState extends State<AuthScreen> {
+  bool checkboxState = false;
+  bool hidePassword = true;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: true,
+        title: SvgPicture.asset(
+          ImageConstant.imgLogoEatvio,
+          height: 48,
+          fit: BoxFit.contain,
+        ),
+      ),
+      body: SafeArea(
+        child: Padding(
+          padding: EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(s.email),
+              const SizedBox(height: 4),
+              BlocSelector<AuthBloc, AuthState, TextEditingController?>(
+                selector: (state) => state.emailController,
+                builder: (context, emailController) {
+                  return CustomTextFormField(
+                    controller: emailController,
+                    textInputAction: TextInputAction.next,
+                    keyboardType: TextInputType.emailAddress,
+                    textInputType: TextInputType.emailAddress,
+                    hintText: 'Введите email',
+                  );
+                },
+              ),
+              const SizedBox(height: 16),
+              Text(s.password),
+              const SizedBox(height: 4),
+              BlocSelector<AuthBloc, AuthState, TextEditingController?>(
+                selector: (state) => state.passwordController,
+                builder: (context, passwordController) {
+                  return CustomTextFormField(
+                    obscureText: hidePassword,
+                    controller: passwordController,
+                    hintText: 'Введите пароль',
+                    suffix: IconButton(
+                      onPressed: () {
+                        setState(() {
+                          hidePassword = !hidePassword;
+                        });
+                      },
+                      icon: Icon(
+                        hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
+                        color: Colors.grey,
+                      ),
+                    ),
+                  );
+                },
+              ),
+              const SizedBox(height: 16),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text('Нет аккаунта? '),
+                  GestureDetector(
+                    onTap: () => GoRouter.of(context).goNamed('registrationScreen'),
+                    child: Text(
+                      'Зарегистрироваться',
+                      style: TextStyle(
+                        color: appTheme.blueA400,
+                        decorationColor: appTheme.blueA400,
+                        decoration: TextDecoration.underline,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              Spacer(),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    'Нажимая "Войти", Вы соглашаетесь с ',
+                    style: TextStyle(
+                      fontSize: 12,
+                    ),
+                  ),
+                  GestureDetector(
+                    onTap: () async {
+                      await launchUrl(Uri.parse(baseUrl + '/oferta_bs.pdf'));
+                    },
+                    child: Text(
+                      'Публичной офертой',
+                      style: TextStyle(
+                        fontSize: 12,
+                        color: appTheme.blueA400,
+                        decorationColor: appTheme.blueA400,
+                        decoration: TextDecoration.underline,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 16),
+              BlocBuilder<AuthBloc, AuthState>(
+                builder: (context, state) {
+                  return Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width - 32,
+                    child: FloatingActionButton.extended(
+                      heroTag: 'authButton',
+                      highlightElevation: 0,
+                      elevation: 0,
+                      focusElevation: 0,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: appTheme.blueA400,
+                      onPressed: onTapAuth(state, context),
+                      label: Text(
+                        'Войти',
+                        style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  onTapAuth(AuthState state, BuildContext context) {
+    final s = S.of(context);
+    return () async {
+      List<String> errors = validateFields(state.emailController!.text, state.passwordController!.text);
+      if (errors.isEmpty) {
+        final Map<String, dynamic> credentials = {
+          'email': state.emailController!.text,
+          'password': state.passwordController!.text,
+        };
+        final response = await http.post(
+          Uri.parse(baseUrl + '/api/login'),
+          headers: {'Content-Type': 'application/json'},
+          body: json.encode(credentials),
+          encoding: utf8,
+        );
+
+        if (response.statusCode == 200) {
+          var res = await jsonDecode(response.body);
+          final token = res['token'];
+          await TokenStorage.saveTokenInStorage(token);
+          GoRouter.of(context).go('/my-profile-screen');
+        } else {
+          showDialog(
+            context: context,
+            builder: (context) => AlertDialog(
+              title: Text('Ошибка'),
+              content: Text(s.wrong_credentials),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.pop(context),
+                  child: Text('OK'),
+                ),
+              ],
+            ),
+          );
+        }
+      } else {
+        String errorMessage = '';
+
+        for (var error in errors) {
+          errorMessage += error + '\n\n';
+        }
+
+        showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: Text('Ошибка'),
+            content: Text(errorMessage),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.pop(context),
+                child: Text('OK'),
+              ),
+            ],
+          ),
+        );
+      }
+    };
+  }
+
+  List<String> validateFields(String email, String password) {
+    final s = S.of(context);
+
+    List<String> errors = [];
+
+    if (!isEmail(email)) {
+      errors.add(s.email_invalid);
+    }
+
+    if (email.isEmpty) {
+      errors.add(s.email_empty);
+    }
+
+    if (password.isEmpty) {
+      errors.add(s.password_empty);
+    }
+
+    if (password.length < 6) {
+      errors.add(s.password_short);
+    }
+
+    return errors;
+  }
+}
--- a/lib/features/auth/auth_screen/bloc/auth_bloc.dart
+++ b/lib/features/auth/auth_screen/bloc/auth_bloc.dart
@@ -0,0 +1,26 @@
+import 'package:eatvio_app/features/auth/auth_screen/models/auth_model.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+part 'auth_event.dart';
+part 'auth_state.dart';
+
+/// A bloc that manages the state of a Auth according to the event that is dispatched to it.
+class AuthBloc extends Bloc<AuthEvent, AuthState> {
+  AuthBloc(AuthState initialState) : super(initialState) {
+    on<AuthInitialEvent>(_onInitialize);
+  }
+
+  _onInitialize(
+    AuthInitialEvent event,
+    Emitter<AuthState> emit,
+  ) async {
+    emit(
+      state.copyWith(
+        emailController: TextEditingController(),
+        passwordController: TextEditingController(),
+      ),
+    );
+  }
+}
--- a/lib/features/auth/auth_screen/bloc/auth_event.dart
+++ b/lib/features/auth/auth_screen/bloc/auth_event.dart
@@ -0,0 +1,16 @@
+// ignore_for_file: must_be_immutable
+
+part of 'auth_bloc.dart';
+
+/// Abstract class for all events that can be dispatched from the
+///Credentials widget.
+///
+/// Events must be immutable and implement the [Equatable] interface.
+@immutable
+abstract class AuthEvent extends Equatable {}
+
+/// Event that is dispatched when the Credentials widget is first created.
+class AuthInitialEvent extends AuthEvent {
+  @override
+  List<Object?> get props => [];
+}
--- a/lib/features/auth/auth_screen/bloc/auth_state.dart
+++ b/lib/features/auth/auth_screen/bloc/auth_state.dart
@@ -0,0 +1,37 @@
+// ignore_for_file: must_be_immutable
+
+part of 'auth_bloc.dart';
+
+/// Represents the state of Auth in the application.
+class AuthState extends Equatable {
+  AuthState({
+    this.emailController,
+    this.passwordController,
+    this.authModelObj,
+  });
+
+  TextEditingController? emailController;
+
+  TextEditingController? passwordController;
+
+  AuthModel? authModelObj;
+
+  @override
+  List<Object?> get props => [
+        emailController,
+        passwordController,
+        authModelObj,
+      ];
+
+  AuthState copyWith({
+    TextEditingController? emailController,
+    TextEditingController? passwordController,
+    AuthModel? authModelObj,
+  }) {
+    return AuthState(
+      emailController: emailController ?? this.emailController,
+      passwordController: passwordController ?? this.passwordController,
+      authModelObj: authModelObj ?? this.authModelObj,
+    );
+  }
+}
--- a/lib/features/auth/auth_screen/models/auth_model.dart
+++ b/lib/features/auth/auth_screen/models/auth_model.dart
@@ -0,0 +1,16 @@
+// ignore_for_file: must_be_immutable
+
+import 'package:equatable/equatable.dart';
+
+/// This class defines the variables used in the [auth_screen],
+/// and is typically used to hold data that is passed between different parts of the application.
+class AuthModel extends Equatable {
+  AuthModel();
+
+  AuthModel copyWith() {
+    return AuthModel();
+  }
+
+  @override
+  List<Object?> get props => [];
+}
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/commen
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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_html/flutter_html.dart';
--- a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
+++ b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
@@ -0,0 +1,28 @@
+import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
+import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
+
+class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
+  final BlogPostRepository blogPostRepository;
+
+  BlogPostCreateCubit({
+    required this.blogPostRepository,
+  }) : super(BlogPostCreateState());
+
+  createBlogPost({
+    String? title,
+    String? youtubeURL,
+    String? description,
+    XFile? image,
+  }) async {
+    emit(BlogPostCreateState.loading());
+    await blogPostRepository.createBlogPost(
+      title,
+      youtubeURL,
+      description,
+      image,
+    );
+    emit(BlogPostCreateState.loaded());
+  }
+}
--- a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart
+++ b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart
@@ -0,0 +1,16 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'blog_post_create_state.freezed.dart';
+
+@freezed
+abstract class BlogPostCreateState with _$BlogPostCreateState {
+  const factory BlogPostCreateState() = _BlogPostCreateState;
+
+  const factory BlogPostCreateState.loading() = BlogPostCreateStateLoading;
+
+  const factory BlogPostCreateState.loaded() = BlogPostCreateStateLoaded;
+
+  const factory BlogPostCreateState.error({
+    required String errorMessage,
+  }) = BlogPostCreateStateError;
+}
--- a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.freezed.dart
+++ b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.freezed.dart
@@ -0,0 +1,608 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'blog_post_create_state.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+/// @nodoc
+mixin _$BlogPostCreateState {
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function() $default, {
+    required TResult Function() loading,
+    required TResult Function() loaded,
+    required TResult Function(String errorMessage) error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function()? $default, {
+    TResult? Function()? loading,
+    TResult? Function()? loaded,
+    TResult? Function(String errorMessage)? error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function()? $default, {
+    TResult Function()? loading,
+    TResult Function()? loaded,
+    TResult Function(String errorMessage)? error,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value) $default, {
+    required TResult Function(BlogPostCreateStateLoading value) loading,
+    required TResult Function(BlogPostCreateStateLoaded value) loaded,
+    required TResult Function(BlogPostCreateStateError value) error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_BlogPostCreateState value)? $default, {
+    TResult? Function(BlogPostCreateStateLoading value)? loading,
+    TResult? Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult? Function(BlogPostCreateStateError value)? error,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value)? $default, {
+    TResult Function(BlogPostCreateStateLoading value)? loading,
+    TResult Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult Function(BlogPostCreateStateError value)? error,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $BlogPostCreateStateCopyWith<$Res> {
+  factory $BlogPostCreateStateCopyWith(
+          BlogPostCreateState value, $Res Function(BlogPostCreateState) then) =
+      _$BlogPostCreateStateCopyWithImpl<$Res, BlogPostCreateState>;
+}
+
+/// @nodoc
+class _$BlogPostCreateStateCopyWithImpl<$Res, $Val extends BlogPostCreateState>
+    implements $BlogPostCreateStateCopyWith<$Res> {
+  _$BlogPostCreateStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+abstract class _$$BlogPostCreateStateImplCopyWith<$Res> {
+  factory _$$BlogPostCreateStateImplCopyWith(_$BlogPostCreateStateImpl value,
+          $Res Function(_$BlogPostCreateStateImpl) then) =
+      __$$BlogPostCreateStateImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$BlogPostCreateStateImplCopyWithImpl<$Res>
+    extends _$BlogPostCreateStateCopyWithImpl<$Res, _$BlogPostCreateStateImpl>
+    implements _$$BlogPostCreateStateImplCopyWith<$Res> {
+  __$$BlogPostCreateStateImplCopyWithImpl(_$BlogPostCreateStateImpl _value,
+      $Res Function(_$BlogPostCreateStateImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$BlogPostCreateStateImpl implements _BlogPostCreateState {
+  const _$BlogPostCreateStateImpl();
+
+  @override
+  String toString() {
+    return 'BlogPostCreateState()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$BlogPostCreateStateImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function() $default, {
+    required TResult Function() loading,
+    required TResult Function() loaded,
+    required TResult Function(String errorMessage) error,
+  }) {
+    return $default();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function()? $default, {
+    TResult? Function()? loading,
+    TResult? Function()? loaded,
+    TResult? Function(String errorMessage)? error,
+  }) {
+    return $default?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function()? $default, {
+    TResult Function()? loading,
+    TResult Function()? loaded,
+    TResult Function(String errorMessage)? error,
+    required TResult orElse(),
+  }) {
+    if ($default != null) {
+      return $default();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value) $default, {
+    required TResult Function(BlogPostCreateStateLoading value) loading,
+    required TResult Function(BlogPostCreateStateLoaded value) loaded,
+    required TResult Function(BlogPostCreateStateError value) error,
+  }) {
+    return $default(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_BlogPostCreateState value)? $default, {
+    TResult? Function(BlogPostCreateStateLoading value)? loading,
+    TResult? Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult? Function(BlogPostCreateStateError value)? error,
+  }) {
+    return $default?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value)? $default, {
+    TResult Function(BlogPostCreateStateLoading value)? loading,
+    TResult Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult Function(BlogPostCreateStateError value)? error,
+    required TResult orElse(),
+  }) {
+    if ($default != null) {
+      return $default(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _BlogPostCreateState implements BlogPostCreateState {
+  const factory _BlogPostCreateState() = _$BlogPostCreateStateImpl;
+}
+
+/// @nodoc
+abstract class _$$BlogPostCreateStateLoadingImplCopyWith<$Res> {
+  factory _$$BlogPostCreateStateLoadingImplCopyWith(
+          _$BlogPostCreateStateLoadingImpl value,
+          $Res Function(_$BlogPostCreateStateLoadingImpl) then) =
+      __$$BlogPostCreateStateLoadingImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$BlogPostCreateStateLoadingImplCopyWithImpl<$Res>
+    extends _$BlogPostCreateStateCopyWithImpl<$Res,
+        _$BlogPostCreateStateLoadingImpl>
+    implements _$$BlogPostCreateStateLoadingImplCopyWith<$Res> {
+  __$$BlogPostCreateStateLoadingImplCopyWithImpl(
+      _$BlogPostCreateStateLoadingImpl _value,
+      $Res Function(_$BlogPostCreateStateLoadingImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$BlogPostCreateStateLoadingImpl implements BlogPostCreateStateLoading {
+  const _$BlogPostCreateStateLoadingImpl();
+
+  @override
+  String toString() {
+    return 'BlogPostCreateState.loading()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$BlogPostCreateStateLoadingImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function() $default, {
+    required TResult Function() loading,
+    required TResult Function() loaded,
+    required TResult Function(String errorMessage) error,
+  }) {
+    return loading();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function()? $default, {
+    TResult? Function()? loading,
+    TResult? Function()? loaded,
+    TResult? Function(String errorMessage)? error,
+  }) {
+    return loading?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function()? $default, {
+    TResult Function()? loading,
+    TResult Function()? loaded,
+    TResult Function(String errorMessage)? error,
+    required TResult orElse(),
+  }) {
+    if (loading != null) {
+      return loading();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value) $default, {
+    required TResult Function(BlogPostCreateStateLoading value) loading,
+    required TResult Function(BlogPostCreateStateLoaded value) loaded,
+    required TResult Function(BlogPostCreateStateError value) error,
+  }) {
+    return loading(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_BlogPostCreateState value)? $default, {
+    TResult? Function(BlogPostCreateStateLoading value)? loading,
+    TResult? Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult? Function(BlogPostCreateStateError value)? error,
+  }) {
+    return loading?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value)? $default, {
+    TResult Function(BlogPostCreateStateLoading value)? loading,
+    TResult Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult Function(BlogPostCreateStateError value)? error,
+    required TResult orElse(),
+  }) {
+    if (loading != null) {
+      return loading(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class BlogPostCreateStateLoading implements BlogPostCreateState {
+  const factory BlogPostCreateStateLoading() = _$BlogPostCreateStateLoadingImpl;
+}
+
+/// @nodoc
+abstract class _$$BlogPostCreateStateLoadedImplCopyWith<$Res> {
+  factory _$$BlogPostCreateStateLoadedImplCopyWith(
+          _$BlogPostCreateStateLoadedImpl value,
+          $Res Function(_$BlogPostCreateStateLoadedImpl) then) =
+      __$$BlogPostCreateStateLoadedImplCopyWithImpl<$Res>;
+}
+
+/// @nodoc
+class __$$BlogPostCreateStateLoadedImplCopyWithImpl<$Res>
+    extends _$BlogPostCreateStateCopyWithImpl<$Res,
+        _$BlogPostCreateStateLoadedImpl>
+    implements _$$BlogPostCreateStateLoadedImplCopyWith<$Res> {
+  __$$BlogPostCreateStateLoadedImplCopyWithImpl(
+      _$BlogPostCreateStateLoadedImpl _value,
+      $Res Function(_$BlogPostCreateStateLoadedImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+}
+
+/// @nodoc
+
+class _$BlogPostCreateStateLoadedImpl implements BlogPostCreateStateLoaded {
+  const _$BlogPostCreateStateLoadedImpl();
+
+  @override
+  String toString() {
+    return 'BlogPostCreateState.loaded()';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$BlogPostCreateStateLoadedImpl);
+  }
+
+  @override
+  int get hashCode => runtimeType.hashCode;
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function() $default, {
+    required TResult Function() loading,
+    required TResult Function() loaded,
+    required TResult Function(String errorMessage) error,
+  }) {
+    return loaded();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function()? $default, {
+    TResult? Function()? loading,
+    TResult? Function()? loaded,
+    TResult? Function(String errorMessage)? error,
+  }) {
+    return loaded?.call();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function()? $default, {
+    TResult Function()? loading,
+    TResult Function()? loaded,
+    TResult Function(String errorMessage)? error,
+    required TResult orElse(),
+  }) {
+    if (loaded != null) {
+      return loaded();
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value) $default, {
+    required TResult Function(BlogPostCreateStateLoading value) loading,
+    required TResult Function(BlogPostCreateStateLoaded value) loaded,
+    required TResult Function(BlogPostCreateStateError value) error,
+  }) {
+    return loaded(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_BlogPostCreateState value)? $default, {
+    TResult? Function(BlogPostCreateStateLoading value)? loading,
+    TResult? Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult? Function(BlogPostCreateStateError value)? error,
+  }) {
+    return loaded?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value)? $default, {
+    TResult Function(BlogPostCreateStateLoading value)? loading,
+    TResult Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult Function(BlogPostCreateStateError value)? error,
+    required TResult orElse(),
+  }) {
+    if (loaded != null) {
+      return loaded(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class BlogPostCreateStateLoaded implements BlogPostCreateState {
+  const factory BlogPostCreateStateLoaded() = _$BlogPostCreateStateLoadedImpl;
+}
+
+/// @nodoc
+abstract class _$$BlogPostCreateStateErrorImplCopyWith<$Res> {
+  factory _$$BlogPostCreateStateErrorImplCopyWith(
+          _$BlogPostCreateStateErrorImpl value,
+          $Res Function(_$BlogPostCreateStateErrorImpl) then) =
+      __$$BlogPostCreateStateErrorImplCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String errorMessage});
+}
+
+/// @nodoc
+class __$$BlogPostCreateStateErrorImplCopyWithImpl<$Res>
+    extends _$BlogPostCreateStateCopyWithImpl<$Res,
+        _$BlogPostCreateStateErrorImpl>
+    implements _$$BlogPostCreateStateErrorImplCopyWith<$Res> {
+  __$$BlogPostCreateStateErrorImplCopyWithImpl(
+      _$BlogPostCreateStateErrorImpl _value,
+      $Res Function(_$BlogPostCreateStateErrorImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? errorMessage = null,
+  }) {
+    return _then(_$BlogPostCreateStateErrorImpl(
+      errorMessage: null == errorMessage
+          ? _value.errorMessage
+          : errorMessage // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$BlogPostCreateStateErrorImpl implements BlogPostCreateStateError {
+  const _$BlogPostCreateStateErrorImpl({required this.errorMessage});
+
+  @override
+  final String errorMessage;
+
+  @override
+  String toString() {
+    return 'BlogPostCreateState.error(errorMessage: $errorMessage)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$BlogPostCreateStateErrorImpl &&
+            (identical(other.errorMessage, errorMessage) ||
+                other.errorMessage == errorMessage));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, errorMessage);
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$BlogPostCreateStateErrorImplCopyWith<_$BlogPostCreateStateErrorImpl>
+      get copyWith => __$$BlogPostCreateStateErrorImplCopyWithImpl<
+          _$BlogPostCreateStateErrorImpl>(this, _$identity);
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function() $default, {
+    required TResult Function() loading,
+    required TResult Function() loaded,
+    required TResult Function(String errorMessage) error,
+  }) {
+    return error(errorMessage);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function()? $default, {
+    TResult? Function()? loading,
+    TResult? Function()? loaded,
+    TResult? Function(String errorMessage)? error,
+  }) {
+    return error?.call(errorMessage);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function()? $default, {
+    TResult Function()? loading,
+    TResult Function()? loaded,
+    TResult Function(String errorMessage)? error,
+    required TResult orElse(),
+  }) {
+    if (error != null) {
+      return error(errorMessage);
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value) $default, {
+    required TResult Function(BlogPostCreateStateLoading value) loading,
+    required TResult Function(BlogPostCreateStateLoaded value) loaded,
+    required TResult Function(BlogPostCreateStateError value) error,
+  }) {
+    return error(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_BlogPostCreateState value)? $default, {
+    TResult? Function(BlogPostCreateStateLoading value)? loading,
+    TResult? Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult? Function(BlogPostCreateStateError value)? error,
+  }) {
+    return error?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_BlogPostCreateState value)? $default, {
+    TResult Function(BlogPostCreateStateLoading value)? loading,
+    TResult Function(BlogPostCreateStateLoaded value)? loaded,
+    TResult Function(BlogPostCreateStateError value)? error,
+    required TResult orElse(),
+  }) {
+    if (error != null) {
+      return error(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class BlogPostCreateStateError implements BlogPostCreateState {
+  const factory BlogPostCreateStateError({required final String errorMessage}) =
+      _$BlogPostCreateStateErrorImpl;
+
+  String get errorMessage;
+
+  /// Create a copy of BlogPostCreateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$BlogPostCreateStateErrorImplCopyWith<_$BlogPostCreateStateErrorImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -1,26 +1,36 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:eatvio_app/old/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
+import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
+import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';

 class BlogPostCreateScreen extends StatefulWidget {
-  const BlogPostCreateScreen({Key? key}) : super(key: key);
+  const BlogPostCreateScreen({
+    Key? key,
+  }) : super(key: key);

  @override
  State<BlogPostCreateScreen> createState() => _BlogPostCreateScreenState();
 }

 class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
-  final blogPostCreateBloc = BlogPostCreateBloc(BlogPostCreateState())..add(BlogPostCreateInitialEvent());
+  final blogPostCubit = sl<BlogPostCreateCubit>();
  bool shrinkImage = false;
  late StreamSubscription<bool> keyboardSubscription;
+  XFile? image;
+  final titleController = TextEditingController();
+  final descriptionController = TextEditingController();
+  final youtubeUrlController = TextEditingController();
+  bool isLoading = false;

  @override
  void initState() {
@@ -40,26 +50,15 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
  }

  Widget build(BuildContext context) {
-    return BlocProvider<BlogPostCreateBloc>(
-      create: (BuildContext context) => blogPostCreateBloc,
-      child: BlocBuilder<BlogPostCreateBloc, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateInitialState) {
-            // Это начальное состояние, данные ещё не загружены.
-            return Container(
-              color: Colors.white,
-            );
-          } else if (state is BlogPostCreateLoadedState) {
-            // Данные загружены, можно строить экран.
-            return _buildBlogPostCreate(context, state);
-          } else if (state is BlogPostCreateErrorState) {
-            // Произошла ошибка при загрузке данных.
-            return Center(child: Text(state.errorMessage));
-          } else {
-            // Другие состояния, если они есть.
-            return Container(); // Пустой контейнер для необработанных состояний.
+    return BlocProvider<BlogPostCreateCubit>(
+      create: (BuildContext context) => blogPostCubit,
+      child: BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+        listener: (BuildContext context, BlogPostCreateState state) {
+          if (state is BlogPostCreateStateLoaded) {
+            GoRouter.of(context).pop();
          }
        },
+        child: _buildBlogPostCreate(),
      ),
    );
  }
@@ -72,8 +71,8 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
          CupertinoActionSheetAction(
            onPressed: () async {
              final picker = ImagePicker();
-              XFile? image = await picker.pickImage(source: ImageSource.camera);
-              if (image != null) blogPostCreateBloc.add(UploadImages(image));
+              image = await picker.pickImage(source: ImageSource.camera);
+              setState(() {});
              Navigator.of(context).pop();
            },
            child: const Row(
@@ -87,8 +86,8 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
          CupertinoActionSheetAction(
            onPressed: () async {
              final picker = ImagePicker();
-              XFile? image = await picker.pickImage(source: ImageSource.gallery);
-              if (image != null) blogPostCreateBloc.add(UploadImages(image));
+              image = await picker.pickImage(source: ImageSource.gallery);
+              setState(() {});
              Navigator.of(context).pop();
            },
            child: const Row(
@@ -109,7 +108,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
    );
  }

-  _buildBlogPostCreate(BuildContext context, BlogPostCreateLoadedState state) {
+  _buildBlogPostCreate() {
    return Scaffold(
      resizeToAvoidBottomInset: true,
      appBar: AppBar(),
@@ -125,13 +124,27 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
            borderRadius: BorderRadius.circular(16),
          ),
          backgroundColor: appTheme.blueA400,
-          onPressed: () => _submitForm(context, state.title!.text, state.description!.text, state.youtubeURL!.text),
-          label: Text(
-            'Создать',
-            style: TextStyle(
-              color: Colors.white,
-            ),
-          ),
+          label: isLoading
+              ? CircularProgressIndicator()
+              : Text(
+                  'Создать',
+                  style: TextStyle(
+                    color: Colors.white,
+                  ),
+                ),
+          onPressed: isLoading
+              ? null
+              : () {
+                  setState(() {
+                    isLoading = true;
+                  });
+                  blogPostCubit.createBlogPost(
+                    title: titleController.text,
+                    description: descriptionController.text,
+                    youtubeURL: youtubeUrlController.text,
+                    image: image,
+                  );
+                },
        ),
      ),
      body: SingleChildScrollView(
@@ -143,26 +156,26 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
            Text('Заголовок'),
            SizedBox(height: 8),
            CustomTextFormField(
-              controller: state.title,
+              controller: titleController,
            ),
            SizedBox(height: 16),
            Text('Описание'),
            SizedBox(height: 8),
            CustomTextFormField(
-              controller: state.description,
+              controller: descriptionController,
              maxLines: 6,
              minLines: 4,
            ),
            SizedBox(height: 16),
-            if (state.youtubeURL!.text.isEmpty) Text('Изображение поста'),
-            if (state.youtubeURL!.text.isEmpty) SizedBox(height: 8),
-            if (state.youtubeURL!.text.isEmpty) _buildAddPhoto(state),
+            if (youtubeUrlController.text.isEmpty) Text('Изображение поста'),
+            if (youtubeUrlController.text.isEmpty) SizedBox(height: 8),
+            if (youtubeUrlController.text.isEmpty) _buildAddPhoto(),
            SizedBox(height: 16),
-            if (state.image == null) Text('Ссылка на видео'),
-            if (state.image == null) SizedBox(height: 8),
-            if (state.image == null)
+            if (image == null) Text('Ссылка на видео'),
+            if (image == null) SizedBox(height: 8),
+            if (image == null)
              CustomTextFormField(
-                controller: state.youtubeURL,
+                controller: youtubeUrlController,
              ),
            SizedBox(height: 80),
          ],
@@ -171,14 +184,14 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
    );
  }

-  _buildAddPhoto(BlogPostCreateLoadedState state) {
-    bool isLoading = state.isLoading;
-
+  _buildAddPhoto() {
    return GestureDetector(
-      onTap: addImage(context, isLoading),
+      onTap: () {
+        _showImagePicker();
+      },
      child: Stack(
        children: [
-          if (state.image == null)
+          if (image == null)
            AnimatedContainer(
              height: shrinkImage ? 52 : 128,
              curve: Curves.easeIn,
@@ -202,7 +215,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                ],
              ),
            ),
-          if (state.image != null)
+          if (image != null)
            Container(
              width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
              child: ClipRRect(
@@ -210,7 +223,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                child: Image(
                  image: FileImage(
                    File(
-                      state.image!.path,
+                      image!.path,
                    ),
                  ),
                ),
@@ -220,21 +233,4 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
      ),
    );
  }
-
-  addImage(BuildContext context, bool isLoading) {
-    if (!isLoading) {
-      return () {
-        _showImagePicker();
-      };
-    }
-  }
-}
-
-_submitForm(
-  BuildContext context,
-  String title,
-  String description,
-  String youtubeURL,
-) async {
-  context.read<BlogPostCreateBloc>().add(CreateBlogPost());
 }
--- a/lib/features/blog_post_create/repositories/blog_post_repository.dart
+++ b/lib/features/blog_post_create/repositories/blog_post_repository.dart
@@ -0,0 +1,32 @@
+import 'dart:io';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
+import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
+
+class BlogPostRepository {
+  final BlogPostService blogPostService;
+
+  BlogPostRepository({
+    required this.blogPostService,
+  });
+
+  Future<void> createBlogPost(
+    String? title,
+    String? youtubeURL,
+    String? description,
+    XFile? image,
+  ) async {
+    FormData formData = FormData.fromMap({
+      'title': title,
+      'description': description,
+      'state': 'active',
+      'youtube_url': youtubeURL,
+      'image': image != null ? await MultipartFile.fromFile((await ImageCompressUtility.compressFile(File(image.path))).path, filename: image.name) : null,
+    });
+
+    return await blogPostService.createBlogPost(
+      formData: formData,
+    );
+  }
+}
--- a/lib/features/blog_post_create/repositories/blog_repository.dart
+++ b/lib/features/blog_post_create/repositories/blog_repository.dart
--- a/lib/features/blog_post_create/services/blog_post_service.dart
+++ b/lib/features/blog_post_create/services/blog_post_service.dart
@@ -9,11 +9,7 @@ abstract class BlogPostService {

  @POST('/api/blogPosts/create')
  @MultiPart()
-  Future<void> sendMessage({
-    @Path() String? title,
-    @Path() required String state,
-    @Path() String? description,
-    @Part() String? youtube_url,
-    @Part(name: 'image', contentType: 'multipart/form-data') List<MultipartFile>? media_data,
+  Future<void> createBlogPost({
+    @Body() required FormData formData,
  });
 }
--- a/lib/features/blog_post_create/services/blog_post_service.g.dart
+++ b/lib/features/blog_post_create/services/blog_post_service.g.dart
@@ -22,27 +22,11 @@ class _BlogPostService implements BlogPostService {
  final ParseErrorLogger? errorLogger;

  @override
-  Future<void> sendMessage({
-    String? title,
-    required String state,
-    String? description,
-    String? youtube_url,
-    List<MultipartFile>? media_data,
-  }) async {
+  Future<void> createBlogPost({required FormData formData}) async {
    final _extra = <String, dynamic>{};
    final queryParameters = <String, dynamic>{};
-    queryParameters.removeWhere((k, v) => v == null);
    final _headers = <String, dynamic>{};
-    final _data = FormData();
-    if (youtube_url != null) {
-      _data.fields.add(MapEntry(
-        'youtube_url',
-        youtube_url,
-      ));
-    }
-    if (media_data != null) {
-      _data.files.addAll(media_data.map((i) => MapEntry('image', i)));
-    }
+    final _data = formData;
    final _options = _setStreamType<void>(Options(
      method: 'POST',
      headers: _headers,
--- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
+++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/noti
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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';
--- a/lib/features/calendar/presentation/pages/calendar_screen.dart
+++ b/lib/features/calendar/presentation/pages/calendar_screen.dart
@@ -1,9 +1,9 @@
+import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
 import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.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_form_builder/flutter_form_builder.dart';
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/chat/presentation/pages/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/cha
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/chat_select_state.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:rive/rive.dart';
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/const.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:photo_view/photo_view.dart';
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_preview_model.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';

--- a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
@@ -1,5 +1,5 @@
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class ChatSearchBarWidget extends StatelessWidget {
--- a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';

@@ -25,7 +25,7 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
      body: Padding(
        padding: const EdgeInsets.all(16),
        child: Text(
-          '    Чтобы стать консультантом необходимо пройти короткую регистрацию. Подготовьте свои дипломы и/или сертификаты в формате jpg, они Вам пригодятся для проверки и подтверждения. Также необходимо будет указать ссылки на Ваши соц. сети и указать тип лица (физ. лицо или юр. лицо). На данный момент доступна регистрация в качестве физ. лица.\n\n  Внутри Итвио разница между обычным пользователем и консультантом заключается в дополнительных возможностях последнего создавать публичные диеты, рецепты и планы питания; участвовать в ежемесячных рейтингах.',
+          'Чтобы стать консультантом необходимо пройти короткую регистрацию. Подготовьте свои дипломы и/или сертификаты в формате jpg, они Вам пригодятся для проверки и подтверждения. Также необходимо будет указать ссылки на Ваши соц. сети и указать тип лица (физ. лицо или юр. лицо). На данный момент доступна регистрация в качестве физ. лица.\n\nВнутри Итвио разница между обычным пользователем и консультантом заключается в дополнительных возможностях последнего создавать публичные диеты, рецепты и планы питания; участвовать в ежемесячных рейтингах.',
          style: TextStyle(
            fontSize: 16,
          ),
--- a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/consultant/become_consultant/entities/diploma_entity.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
--- a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:url_launcher/url_launcher.dart';
--- a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:image_picker/image_picker.dart';
--- a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class RegistrationAsScreen extends StatefulWidget {
--- a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
--- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
@@ -6,11 +6,11 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/pa
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/app_bar/appbar_title_image.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:lottie/lottie.dart';

@@ -215,7 +215,11 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
            ),
          ),
          centerTitle: true,
-          title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio),
+          title: SvgPicture.asset(
+            ImageConstant.imgLogoEatvio,
+            height: 48,
+            fit: BoxFit.contain,
+          ),
          actions: [
            Padding(
              padding: const EdgeInsets.only(right: 16),
--- a/lib/features/diary/presentation/pages/diary_screen.dart
+++ b/lib/features/diary/presentation/pages/diary_screen.dart
@@ -9,9 +9,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/finish_day_button
 import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
 import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
@@ -1,6 +1,6 @@
 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/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
+++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';

--- a/lib/features/diets/presentation/pages/about_diet_screen.dart
+++ b/lib/features/diets/presentation/pages/about_diet_screen.dart
@@ -21,9 +21,9 @@ import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/commen
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.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_portal/flutter_portal.dart';
--- a/lib/features/diets/presentation/widgets/author_card.dart
+++ b/lib/features/diets/presentation/widgets/author_card.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/diets/presentation/widgets/calendar_widget.dart
+++ b/lib/features/diets/presentation/widgets/calendar_widget.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/core/utils/string_extentions.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:table_calendar/table_calendar.dart';
--- a/lib/features/diets/presentation/widgets/cpfc_container.dart
+++ b/lib/features/diets/presentation/widgets/cpfc_container.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class CpfcContainer extends StatelessWidget {
--- a/lib/features/diets/presentation/widgets/expandable_text.dart
+++ b/lib/features/diets/presentation/widgets/expandable_text.dart
@@ -1,8 +1,8 @@
 import 'dart:math' as math;

 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/svg.dart';
--- a/lib/features/diets/presentation/widgets/info_bouble.dart
+++ b/lib/features/diets/presentation/widgets/info_bouble.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class InfoBouble extends StatelessWidget {
--- a/lib/features/diets/presentation/widgets/main_background_bouble.dart
+++ b/lib/features/diets/presentation/widgets/main_background_bouble.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class MainBackgroundBouble extends StatelessWidget {
--- a/lib/features/diets/presentation/widgets/more_options.dart
+++ b/lib/features/diets/presentation/widgets/more_options.dart
@@ -3,8 +3,8 @@ import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/main_background_bouble.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
--- a/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
+++ b/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
@@ -2,9 +2,9 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/calendar_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
 import 'package:flutter/material.dart';

 class StartDietBottomSheet extends StatelessWidget {
--- a/lib/features/diets/presentation/widgets/type_badges.dart
+++ b/lib/features/diets/presentation/widgets/type_badges.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/diets/presentation/widgets/main_background_bouble.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_portal/flutter_portal.dart';
 import 'package:flutter_svg/svg.dart';
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -15,8 +15,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dar
 import 'package:eatvio_app/features/feed/presentation/widgets/tags_modal_widget.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_cubit.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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:go_router/go_router.dart';
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.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_html/flutter_html.dart';
--- a/lib/features/feed/presentation/widgets/choice_chip_widget.dart
+++ b/lib/features/feed/presentation/widgets/choice_chip_widget.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class ChoiceChipWidget extends StatelessWidget {
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
+++ b/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
@@ -3,8 +3,8 @@ import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/sorting_drop_down_filter.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/type_choice_filter_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';

 class DietFilterBottomSheet extends StatelessWidget {
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -5,8 +5,8 @@ import 'package:eatvio_app/core/widgets/diet_info_row.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.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_html/flutter_html.dart';
--- a/lib/features/feed/presentation/widgets/filter_badge.dart
+++ b/lib/features/feed/presentation/widgets/filter_badge.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';

--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -1,7 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
+++ b/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
@@ -1,6 +1,6 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter_svg/flutter_svg.dart';
--- a/lib/features/feed/presentation/widgets/tags_modal_widget.dart
+++ b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_tag_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -2,8 +2,8 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -9,8 +9,8 @@ import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/prof
 import 'package:eatvio_app/features/profile/presentation/widgets/circumference_chart_widget.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/imt_chart_widget.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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:go_router/go_router.dart';
--- a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/profile/models/circumference_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
--- a/lib/features/profile/presentation/widgets/imt_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/imt_chart_widget.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/features/profile/models/weight_model.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:syncfusion_flutter_charts/charts.dart';
 import 'package:intl/intl.dart';
--- a/lib/features/profile/presentation/widgets/weight_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/weight_chart_widget.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/profile/models/weight_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
--- a/lib/features/profile/repositories/profile_repository.dart
+++ b/lib/features/profile/repositories/profile_repository.dart
@@ -7,7 +7,9 @@ import 'package:eatvio_app/features/profile/services/profile_service.dart';
 class ProfileRepository {
  final ProfileService profileService;

-  ProfileRepository({required this.profileService});
+  ProfileRepository({
+    required this.profileService,
+  });

  Future<ProfileModel> getProfileBySlug(String slug) async {
    try {
--- a/lib/features/recipes/presentation/bloc/recipe_create_cubit.dart
+++ b/lib/features/recipes/presentation/bloc/recipe_create_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_state.dart';
--- a/lib/features/recipes/presentation/bloc/recipe_create_state.dart
+++ b/lib/features/recipes/presentation/bloc/recipe_create_state.dart
@@ -1,12 +1,10 @@
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/product.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:image_picker/image_picker.dart';
-
-import '../../../../data/models/selectionPopupModel/selection_popup_model.dart';
-
 part 'recipe_create_state.freezed.dart';

@freezed
--- a/lib/features/recipes/presentation/pages/about_recipes_screen.dart
+++ b/lib/features/recipes/presentation/pages/about_recipes_screen.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.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_html/flutter_html.dart';
--- a/lib/features/recipes/presentation/pages/recipe_create_screen.dart
+++ b/lib/features/recipes/presentation/pages/recipe_create_screen.dart
@@ -1,16 +1,16 @@
 import 'dart:io';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/recipes/models/product.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/models/step.dart' as step;
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart';
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/recipes/presentation/pages/recipe_edit_screen.dart
+++ b/lib/features/recipes/presentation/pages/recipe_edit_screen.dart
@@ -1,15 +1,15 @@
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/theme/app_decoration.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/recipes/models/product.dart';
 import 'package:eatvio_app/features/recipes/models/ingredient.dart';
 import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
 import 'package:eatvio_app/features/recipes/models/step.dart' as step;
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart';
 import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_state.dart';
-import 'package:eatvio_app/theme/app_decoration.dart';
-import 'package:eatvio_app/theme/custom_text_style.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/core/app_router.dart';

 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
--- a/lib/features/registration/presentation/pages/additional_information_screen.dart
+++ b/lib/features/registration/presentation/pages/additional_information_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/pages/allergies_screen.dart
+++ b/lib/features/registration/presentation/pages/allergies_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/blood_pressure_screen.dart
+++ b/lib/features/registration/presentation/pages/blood_pressure_screen.dart
@@ -1,11 +1,10 @@
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_image_view.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -93,8 +92,8 @@ class _BloodPressureScreenState extends State<BloodPressureScreen> {
              decoration: BoxDecoration(
                borderRadius: BorderRadius.circular(4),
              ),
-              child: CustomImageView(
-                imagePath: ImageConstant.imgFavorite,
+              child: Image.asset(
+                ImageConstant.imgFavorite,
                height: 16,
                width: 16,
              ),
@@ -119,8 +118,8 @@ class _BloodPressureScreenState extends State<BloodPressureScreen> {
              decoration: BoxDecoration(
                borderRadius: BorderRadius.circular(4),
              ),
-              child: CustomImageView(
-                imagePath: ImageConstant.imgFavorite,
+              child: Image.asset(
+                ImageConstant.imgFavorite,
                height: 16,
                width: 16,
              ),
--- a/lib/features/registration/presentation/pages/body_circumferences_screen.dart
+++ b/lib/features/registration/presentation/pages/body_circumferences_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/pages/city_of_living_screen.dart
+++ b/lib/features/registration/presentation/pages/city_of_living_screen.dart
@@ -1,8 +1,8 @@
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/pages/credentials_screen.dart
+++ b/lib/features/registration/presentation/pages/credentials_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/date_of_birth_screen.dart
+++ b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/pages/favorite_foods_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_foods_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/favorite_sports_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_sports_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/height_screen.dart
+++ b/lib/features/registration/presentation/pages/height_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/registration/presentation/pages/language_select_screen.dart
+++ b/lib/features/registration/presentation/pages/language_select_screen.dart
@@ -1,8 +1,8 @@
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/medicine_intake_screen.dart
+++ b/lib/features/registration/presentation/pages/medicine_intake_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/name_screen.dart
+++ b/lib/features/registration/presentation/pages/name_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -17,13 +17,13 @@ import 'package:eatvio_app/features/registration/presentation/pages/medicine_int
 import 'package:eatvio_app/features/registration/presentation/pages/name_screen.dart';
 import 'package:eatvio_app/features/registration/presentation/pages/weight_screen.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/app_bar/appbar_title_image.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:rive/rive.dart';
+import 'package:rive/rive.dart' as rive;
 import 'package:validators/validators.dart';

 class RegistrationScreen extends StatefulWidget {
@@ -116,7 +116,11 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
                ),
              ),
              centerTitle: true,
-              title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio),
+              title: SvgPicture.asset(
+                ImageConstant.imgLogoEatvio,
+                height: 48,
+                fit: BoxFit.contain,
+              ),
              actions: [
                Padding(
                  padding: const EdgeInsets.only(right: 16),
@@ -322,7 +326,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
                child: SizedBox(
                  height: 32,
                  width: 32,
-                  child: RiveAnimation.asset(
+                  child: rive.RiveAnimation.asset(
                    'assets/rive_animations/loading.riv',
                  ),
                ),
--- a/lib/features/registration/presentation/pages/weight_screen.dart
+++ b/lib/features/registration/presentation/pages/weight_screen.dart
@@ -1,7 +1,7 @@
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/settings/presentation/pages/general_info_screen.dart
+++ b/lib/features/settings/presentation/pages/general_info_screen.dart
@@ -1,11 +1,11 @@
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/settings/presentation/pages/other_info_screen.dart
+++ b/lib/features/settings/presentation/pages/other_info_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';

--- a/lib/features/settings/presentation/pages/physical_activity_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_activity_screen.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';

--- a/lib/features/settings/presentation/pages/physical_form_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_form_screen.dart
@@ -1,8 +1,8 @@
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/settings/presentation/pages/pressure_screen.dart
+++ b/lib/features/settings/presentation/pages/pressure_screen.dart
@@ -1,10 +1,10 @@
-import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
-import 'package:eatvio_app/widgets/custom_drop_down.dart';
-import 'package:eatvio_app/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/settings/presentation/pages/settings_screen.dart
+++ b/lib/features/settings/presentation/pages/settings_screen.dart
@@ -2,8 +2,8 @@ import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
-import 'package:eatvio_app/locator_service.dart';
-import 'package:eatvio_app/theme/theme_helper.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';