Merge remote-tracking branch 'upstream/main' into personalDiets

Reviewed-on: eatvio/eatvio_app#745

.gitea/workflows/docker-run-tests.yml

@@ -41,7 +41,7 @@ jobs:
 
       # - name: Build apk
       #   run: flutter build apk   
-      # some test                           
+      # some test 2                          
 
       # - name: Rename and move apk
       #   run: |

.gitea/workflows/test-flight-cd.yaml

@@ -1,4 +1,4 @@
-name: "Build Test Flight"
+name: 'Build Test Flight'
 on:
   pull_request:
     branches:
@@ -10,27 +10,65 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
+      - name: Checkout env repository
+        uses: actions/checkout@v2
+        with:
+          repository: mso7nueh/eatvio_app_env
+          path: env_repo
+          token: ${{ vars.MSO7NUEH_TOKEN }}
+          ref: main
+
+      - name: Copy .env file
+        run: |
+          cp env_repo/.env .env
+
+      - name: Load environment variables from .env
+        run: |
+          set -a
+          source .env
+          set +a
+          # Export all variables to GITHUB_ENV
+          while IFS= read -r line; do
+            if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < .env
 
       - name: Unlock login keychain
         run: |
           security unlock-keychain -p "$KEYCHAIN_PASSWORD" /Users/gitea_runner_ci/Library/Keychains/login.keychain-db
         env:
-          KEYCHAIN_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }} 
+          KEYCHAIN_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
-          
+
+      - name: Setup API key
+        run: |
+          echo "${API_APPSTORE_KEY}" | tr -d '\n' | base64 --decode > ios/AuthKey.p8
+          chmod 600 ios/AuthKey.p8
+          ls -la ios/AuthKey.p8
+          echo "File size: $(wc -c < ios/AuthKey.p8) bytes"
+          echo "Contents of ios directory:"
+          ls -la ios/
+        env:
+          API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
+
       - name: Flutter build
         run: |
           flutter clean
           flutter pub get
           flutter pub upgrade
           flutter pub run build_runner build --delete-conflicting-outputs
+          # Configure Flutter for release mode
+          flutter build ios --config-only --release
           cd ios
           pod update
           fastlane beta
         env:
           LANG: en_US.UTF-8
           LC_ALL: en_US.UTF-8
-          MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }} 
+          MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
+          FASTLANE_PASSWORD: ${{ vars.FASTLANE_PASSWORD }}
           MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
           FASTLANE_USER: eatvio2023@icloud.com
-          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} 
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+          API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}

.gitea/workflows/test.yml

@@ -3,7 +3,7 @@ name: Eatvio App Android Test
 on: [ pull_request ]
 
 env:
-  flutter_version: "3.32.5"
+  flutter_version: "3.35.1"
   java_version: "21.x"
   flutter_channel: "stable"
   my_local_cache_dir: "/opt/hostedtoolcache/"
@@ -16,6 +16,30 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Checkout env repository
+        uses: actions/checkout@v3
+        with:
+          repository: mso7nueh/eatvio_app_env
+          path: env_repo
+          token: ${{ vars.MSO7NUEH_TOKEN }}
+          ref: main
+
+      - name: Copy .env file
+        run: |
+          cp env_repo/.env .env
+
+      - name: Load environment variables from .env
+        run: |
+          set -a
+          source .env
+          set +a
+          # Export all variables to GITHUB_ENV
+          while IFS= read -r line; do
+            if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < .env
+
       - name: Create key.properties file
         run: |
           cat > android/key.properties <<EOF
@@ -119,7 +143,11 @@ jobs:
         run: flutter test
 
       - name: Build apk
-        run: flutter build apk --release
+        run: |
+          BUILD_DATE=$(TZ=Europe/Moscow date +'%Y-%m-%d %H:%M:%S')
+          flutter build apk --release \
+            --dart-define=HIDE_PLANS=false \
+            --dart-define=BUILD_DATE="$BUILD_DATE"
 
       - name: Rename and move apk
         run: |

.gitignore

@@ -12,5 +12,11 @@
 /android/app/.cxx
 *.g.dart
 *.freezed.dart
+*.gr.dart
+*.mocks.dart
 android/build/
 ios/XCBuildData/
+env/.env
+.env
+android/key.properties
+app/upload-keystore.jks

.kilocode/rules/memory-bank-instructions.md

@@ -0,0 +1,167 @@
+# Memory Bank
+
+I am an expert software engineer with a unique characteristic: my memory resets completely between sessions. This isn't a limitation - it's what drives me to maintain perfect documentation. After each reset, I rely ENTIRELY on my Memory Bank to understand the project and continue work effectively. I MUST read ALL memory bank files at the start of EVERY task - this is not optional. The memory bank files are located in `.kilocode/rules/memory-bank` folder.
+
+When I start a task, I will include `[Memory Bank: Active]` at the beginning of my response if I successfully read the memory bank files, or `[Memory Bank: Missing]` if the folder doesn't exist or is empty. If memory bank is missing, I will warn the user about potential issues and suggest initialization.
+
+## Memory Bank Structure
+
+The Memory Bank consists of core files and optional context files, all in Markdown format.
+
+### Core Files (Required)
+1. `brief.md`
+   This file is created and maintained manually by the developer. Don't edit this file directly but suggest to user to update it if it can be improved.
+   - Foundation document that shapes all other files
+   - Created at project start if it doesn't exist
+   - Defines core requirements and goals
+   - Source of truth for project scope
+
+2. `product.md`
+   - Why this project exists
+   - Problems it solves
+   - How it should work
+   - User experience goals
+
+3. `context.md`
+   This file should be short and factual, not creative or speculative.
+   - Current work focus
+   - Recent changes
+   - Next steps
+
+4. `architecture.md`
+   - System architecture
+   - Source Code paths
+   - Key technical decisions
+   - Design patterns in use
+   - Component relationships
+   - Critical implementation paths
+
+5. `tech.md`
+   - Technologies used
+   - Development setup
+   - Technical constraints
+   - Dependencies
+   - Tool usage patterns
+
+### Additional Files
+Create additional files/folders within memory-bank/ when they help organize:
+- `tasks.md` - Documentation of repetitive tasks and their workflows
+- Complex feature documentation
+- Integration specifications
+- API documentation
+- Testing strategies
+- Deployment procedures
+
+## Core workflows
+
+### Memory Bank Initialization
+
+The initialization step is CRITICALLY IMPORTANT and must be done with extreme thoroughness as it defines all future effectiveness of the Memory Bank. This is the foundation upon which all future interactions will be built.
+
+When user requests initialization of the memory bank (command `initialize memory bank`), I'll perform an exhaustive analysis of the project, including:
+- All source code files and their relationships
+- Configuration files and build system setup
+- Project structure and organization patterns
+- Documentation and comments
+- Dependencies and external integrations
+- Testing frameworks and patterns
+
+I must be extremely thorough during initialization, spending extra time and effort to build a comprehensive understanding of the project. A high-quality initialization will dramatically improve all future interactions, while a rushed or incomplete initialization will permanently limit my effectiveness.
+
+After initialization, I will ask the user to read through the memory bank files and verify product description, used technologies and other information. I should provide a summary of what I've understood about the project to help the user verify the accuracy of the memory bank files. I should encourage the user to correct any misunderstandings or add missing information, as this will significantly improve future interactions.
+
+### Memory Bank Update
+
+Memory Bank updates occur when:
+1. Discovering new project patterns
+2. After implementing significant changes
+3. When user explicitly requests with the phrase **update memory bank** (MUST review ALL files)
+4. When context needs clarification
+
+If I notice significant changes that should be preserved but the user hasn't explicitly requested an update, I should suggest: "Would you like me to update the memory bank to reflect these changes?"
+
+To execute Memory Bank update, I will:
+
+1. Review ALL project files
+2. Document current state
+3. Document Insights & Patterns
+4. If requested with additional context (e.g., "update memory bank using information from @/Makefile"), focus special attention on that source
+
+Note: When triggered by **update memory bank**, I MUST review every memory bank file, even if some don't require updates. Focus particularly on context.md as it tracks current state.
+
+### Add Task
+
+When user completes a repetitive task (like adding support for a new model version) and wants to document it for future reference, they can request: **add task** or **store this as a task**.
+
+This workflow is designed for repetitive tasks that follow similar patterns and require editing the same files. Examples include:
+- Adding support for new AI model versions
+- Implementing new API endpoints following established patterns
+- Adding new features that follow existing architecture
+
+Tasks are stored in the file `tasks.md` in the memory bank folder. The file is optional and can be empty. The file can store many tasks. 
+
+To execute Add Task workflow:
+
+1. Create or update `tasks.md` in the memory bank folder
+2. Document the task with:
+   - Task name and description
+   - Files that need to be modified
+   - Step-by-step workflow followed
+   - Important considerations or gotchas
+   - Example of the completed implementation
+3. Include any context that was discovered during task execution but wasn't previously documented
+
+Example task entry:
+```markdown
+## Add New Model Support
+**Last performed:** [date]
+**Files to modify:**
+- `/providers/gemini.md` - Add model to documentation
+- `/src/providers/gemini-config.ts` - Add model configuration
+- `/src/constants/models.ts` - Add to model list
+- `/tests/providers/gemini.test.ts` - Add test cases
+
+**Steps:**
+1. Add model configuration with proper token limits
+2. Update documentation with model capabilities
+3. Add to constants file for UI display
+4. Write tests for new model configuration
+
+**Important notes:**
+- Check Google's documentation for exact token limits
+- Ensure backward compatibility with existing configurations
+- Test with actual API calls before committing
+```
+
+### Regular Task Execution
+
+In the beginning of EVERY task I MUST read ALL memory bank files - this is not optional. 
+
+The memory bank files are located in `.kilocode/rules/memory-bank` folder. If the folder doesn't exist or is empty, I will warn user about potential issues with the memory bank. I will include `[Memory Bank: Active]` at the beginning of my response if I successfully read the memory bank files, or `[Memory Bank: Missing]` if the folder doesn't exist or is empty. If memory bank is missing, I will warn the user about potential issues and suggest initialization. I should briefly summarize my understanding of the project to confirm alignment with the user's expectations, like:
+
+"[Memory Bank: Active] I understand we're building a React inventory system with barcode scanning. Currently implementing the scanner component that needs to work with the backend API."
+
+When starting a task that matches a documented task in `tasks.md`, I should mention this and follow the documented workflow to ensure no steps are missed.
+
+If the task was repetitive and might be needed again, I should suggest: "Would you like me to add this task to the memory bank for future reference?"
+
+In the end of the task, when it seems to be completed, I will update `context.md` accordingly. If the change seems significant, I will suggest to the user: "Would you like me to update memory bank to reflect these changes?" I will not suggest updates for minor changes.
+
+## Context Window Management
+
+When the context window fills up during an extended session:
+1. I should suggest updating the memory bank to preserve the current state
+2. Recommend starting a fresh conversation/task
+3. In the new conversation, I will automatically load the memory bank files to maintain continuity
+
+## Technical Implementation
+
+Memory Bank is built on Kilo Code's Custom Rules feature, with files stored as standard markdown documents that both the user and I can access.
+
+## Important Notes
+
+REMEMBER: After every memory reset, I begin completely fresh. The Memory Bank is my only link to previous work. It must be maintained with precision and clarity, as my effectiveness depends entirely on its accuracy.
+
+If I detect inconsistencies between memory bank files, I should prioritize brief.md and note any discrepancies to the user.
+
+IMPORTANT: I MUST read ALL memory bank files at the start of EVERY task - this is not optional. The memory bank files are located in `.kilocode/rules/memory-bank` folder.

.kilocode/rules/memory-bank/architecture.md

@@ -0,0 +1,374 @@
+# System Architecture
+
+## Project Structure
+
+### Core Directory (`lib/core/`)
+Central infrastructure and shared components:
+- **Dependency Injection**: GetIt-based service locator in `locator_service.dart`
+- **Routing**: GoRouter implementation in `app_router.dart` with deep linking
+- **Theme**: Material theme with Mulish font family in `theme/theme_helper.dart`
+- **Networking**: Dio HTTP client with token interceptor
+- **WebSockets**: Pusher Channels for real-time communication
+- **State Management**: Flutter BLoC/Cubit pattern
+
+### Features Directory (`lib/features/`)
+Feature-based modular architecture with 35+ feature modules:
+
+**Core Features:**
+- `auth/` - Authentication (email/password, OAuth)
+- `feed/` - Content discovery feed
+- `diary/` - Food diary tracking
+- `chat/` - Real-time messaging
+- `consultations/` - Consultation management
+- `profile/` - User profiles and settings
+
+**Content Creation:**
+- `create_recipe/` - Recipe creation
+- `create_diet/` - Diet plan creation
+- `create_plan/` - Nutrition plan creation
+- `blog_post_create/` - Blog post creation
+
+**User Management:**
+- `settings/` - User preferences
+- `user_details/` - User information management
+- `menu/` - App navigation menu
+- `bottom_navigation_bar/` - Main navigation
+
+**Consultant Features:**
+- `consultant/` - Consultant verification
+- `consultant_rating/` - Rating system
+- `finances_and_consultations_archive/` - Financial tracking
+
+**Supporting Features:**
+- `notifications/` - Push notifications
+- `glossary/` - Nutrition glossary
+- `calendar/` - Calendar integration
+- `support/` - Customer support
+- `welcome/` - Onboarding
+- `update_screen/` - App update management
+
+## Architectural Patterns
+
+### Clean Architecture Layers
+
+Each feature follows a layered structure:
+
+```
+feature/
+├── models/          # Data models (freezed + json_serializable)
+├── services/        # API services (Retrofit)
+├── repositories/    # Data repositories
+├── presentation/    # UI layer
+│   ├── pages/       # Screen widgets
+│   ├── widgets/     # Feature-specific widgets
+│   └── bloc/        # State management (Cubit)
+└── entities/        # Domain entities
+```
+
+### Dependency Injection
+
+**Registration Structure** (`lib/core/di/`):
+- `app_config_registration.dart` - App configuration
+- `external_registrations.dart` - External dependencies (Dio, etc.)
+- `service_registrations.dart` - API services
+- `repository_registrations.dart` - Data repositories
+- `cubit_registrations.dart` - State management
+
+**Service Lifecycle:**
+- Singleton: Services, Repositories (most common)
+- Factory: Cubits that need fresh instances
+- Lazy Singleton: WebSocket manager, core services
+
+### State Management Pattern
+
+**BLoC/Cubit Implementation:**
+- Global state: Registered in `AppConfig.globalBlocProviders`
+- Feature state: Created per screen/feature
+- State classes: Freezed unions for type-safe states
+
+**Global Cubits:**
+- `NewMessagesCubit` - Message notifications
+- `NotificationsCubit` - Push notifications
+- `FeedCubit` - Feed content
+- `ProfileAvatarCubit` - User profile
+- `ChatsCubit` - Chat rooms
+- `ViewsCubit` - Content view tracking
+- `InternetConnectionCubit` - Network status
+
+## Data Flow
+
+### API Integration
+
+**Base Setup:**
+- Base URL: Configurable via environment (prod/dev)
+- HTTP Client: Dio with interceptors
+- API Services: Retrofit for type-safe endpoints
+- Authentication: Bearer token in headers
+
+**Interceptors:**
+1. `TokenInterceptor` - Adds auth token, handles 401 errors
+2. `PhoneVerifyErrorInterceptor` - Handles phone verification errors
+
+### Real-time Communication
+
+**WebSocket Architecture:**
+- Library: `dart_pusher_channels`
+- Manager: `WsManager` (singleton)
+- Connection: Authenticated via backend endpoint
+
+**Channels:**
+1. Private Notifications: `App\Events\BroadcastNotificationCreated`
+2. Private Messages: `App\Events\ChatMessageUpdated`
+3. Direct Chat: Room-specific message updates
+4. Client Typing: Real-time typing indicators
+
+**Socket ID Storage:**
+- Persisted via SharedPreferences
+- Used for authentication and channel subscription
+
+### Authentication Flow
+
+**Methods:**
+1. Email/Password - Traditional credentials
+2. OAuth Providers:
+   - VK ID (Russian social network)
+   - Yandex ID
+   - OK (Odnoklassniki)
+   - Mail.ru
+
+**Token Management:**
+- Storage: SharedPreferences via `TokenStorage`
+- Refresh: Automatic on 401 response
+- Logout: Token removal + WebSocket cleanup
+
+**Post-Authentication:**
+1. WebSocket initialization
+2. Profile loading
+3. Chat room loading
+4. Notification loading
+5. Firebase push token registration
+
+## Navigation Architecture
+
+### GoRouter Setup
+
+**Route Structure:**
+- Shell routes for persistent bottom navigation
+- Named routes for easy navigation
+- Deep linking support for content (recipe/blog_post/plan/diet)
+
+**Route Groups:**
+- `AuthRoutes` - Login, registration, password reset
+- `MainNavigationRoutes` - Shell route with bottom nav
+- `ContentRoutes` - Content viewing screens
+- `SettingsRoutes` - User settings
+- `OtherRoutes` - Miscellaneous screens
+
+**Deep Linking Pattern:**
+```
+/content/{type}/{identifier}
+- /content/recipe/{slug}
+- /content/blog_post/{id}
+- /content/plan/{slug}
+- /content/diet/{slug}
+```
+
+### Bottom Navigation
+
+**Main Sections:**
+1. My Profile - User profile and content
+2. Feed - Content discovery
+3. Diary - Food tracking
+4. Consultations - Consultation management
+5. Chat - Messaging
+6. Notifications - Notification center
+7. Menu - Settings and more
+
+**Implementation:**
+- `BottomNavigationBarWidget` wraps content
+- No transition animations for tab switches
+- WebSocket initialization on feed screen
+
+## Data Persistence
+
+### Storage Solutions
+
+**SharedPreferences:**
+- Authentication token
+- Socket ID
+- User preferences
+
+**Cached Network Images:**
+- Library: `cached_network_image`
+- Automatic caching of user avatars, content images
+
+**Firebase:**
+- Push notification tokens
+- Remote configuration
+- Analytics events
+
+## Critical Implementation Details
+
+### Content View Tracking
+
+**Pattern:**
+- `ViewsCubit` handles visibility detection
+- `VisibilityDetector` widget tracks on-screen time
+- Views sent to backend when 50%+ visible for 2+ seconds
+- Debounced to prevent excessive API calls
+
+**Tracked Content:**
+- Blog posts
+- Recipes
+- Diets
+- Nutrition plans
+
+### Image Handling
+
+**Upload Flow:**
+1. `ImagePicker` for selection
+2. `FlutterImageCompress` for compression
+3. MultiPart form data upload via Dio
+4. Preview via `CachedNetworkImage`
+
+**Supported Formats:**
+- User photos (profile, diary)
+- Content images (recipes, diets, plans)
+- Chat attachments
+
+### Search Implementation
+
+**Debounced Search:**
+- Library: `easy_debounce`
+- Delay: 500ms
+- Min query length: 3 characters
+- Applied to: Feed, Recipes, Diets, Plans, Consultants
+
+**Tag-based Filtering:**
+- Recipe tags for filtering
+- Modal bottom sheet UI
+- Persistent selection across sessions
+
+### Pagination Pattern
+
+**Implementation:**
+- Page-based pagination
+- Scroll detection for next page load
+- Loading state during fetch
+- Meta data tracking (current page, last page)
+
+**Example (FeedCubit):**
+```dart
+currentPage = 1
+lastPage = meta.lastPage
+loadNextPage() when currentPage < lastPage
+```
+
+## Error Handling
+
+### Network Errors
+
+**401 Unauthorized:**
+- Auto logout
+- Token removal
+- Navigate to auth screen
+
+**Connection Errors:**
+- `InternetConnectionCubit` monitors status
+- Retry mechanisms in repositories
+- User-friendly error messages
+
+### State Error Handling
+
+**Pattern:**
+```dart
+sealed class State {
+  const State.loading();
+  const State.loaded({required data});
+  const State.error({required String errorMessage});
+}
+```
+
+**UI Response:**
+- Loading: Show loaders/skeletons
+- Error: Show `DataErrorWidget` with retry
+- Empty: Show empty state messages
+
+## Performance Optimizations
+
+### Lazy Loading
+- Lazy singleton services
+- On-demand cubit creation
+- Deferred widget loading
+
+### Image Optimization
+- Compression before upload
+- Cached network images
+- Thumbnail generation
+
+### WebSocket Management
+- Connection reuse
+- Automatic reconnection
+- Proper cleanup on logout
+
+### List Rendering
+- Pagination for large lists
+- ListView.builder for efficiency
+- Visibility detection for tracking
+
+## Platform-Specific Features
+
+### Android
+- Huawei HMS support for Huawei devices
+- Google FCM for push notifications
+- ProGuard rules for release builds
+- QR code scanning via camera
+
+### iOS
+- APNs for push notifications
+- Deep linking configuration
+- App Store compliance
+
+### Firebase Integration
+- Separate configs for Android/iOS
+- Environment-based configuration
+- Push notification handling
+- Analytics tracking
+
+## Security Considerations
+
+### Authentication
+- Bearer token authentication
+- Secure token storage
+- Automatic session management
+- OAuth 2.0 for social login
+
+### Data Protection
+- HTTPS only communication
+- Token encryption in storage
+- Secure WebSocket connections
+- Privacy policy compliance
+
+## Key Files Reference
+
+**Entry Point:**
+- `lib/main.dart` - App initialization
+
+**Core Infrastructure:**
+- `lib/core/app_initializer.dart` - Startup sequence
+- `lib/core/locator_service.dart` - DI container
+- `lib/core/app_config.dart` - App configuration
+- `lib/core/app_router.dart` - Routing setup
+
+**WebSocket:**
+- `lib/core/websockets/ws_manager.dart` - Connection management
+- `lib/core/websockets/ws_service.dart` - API service
+
+**Authentication:**
+- `lib/features/auth/sdk/social_auth_facade.dart` - Social auth
+- `lib/core/token_storage.dart` - Token persistence
+- `lib/core/interceptors/token_interceptor.dart` - Auth interceptor
+
+**Environment:**
+- `lib/core/env_config.dart` - Environment variables
+- `.env` - Environment file (not in repo)

.kilocode/rules/memory-bank/brief.md

@@ -0,0 +1,35 @@
+# Project Brief
+
+## Project Name
+Eatvio - Nutrition & Diet Management Application
+
+## Project Description
+A comprehensive mobile application connecting users with nutrition consultants, providing diet planning tools, recipes, food diary tracking, and professional consultation services.
+
+## Core Features
+- **Blog Posts**: Educational nutrition content and articles
+- **Nutrition Consultation**: Professional consultation services with certified nutritionists
+- **Recipes**: User-generated and professional recipes with nutritional information
+- **Diets**: Structured diet plans with daily schedules
+- **Nutrition Plans**: Long-term nutrition planning and tracking
+
+## Target Audience
+- Primary: Russian-speaking users interested in nutrition and healthy eating
+- Secondary: Certified nutrition consultants offering professional services
+- Market: Russian Federation and Russian-speaking countries
+
+## Platform
+- Mobile: iOS and Android (including Huawei devices)
+- Language: Russian (ru)
+- Current Version: 1.3.0+79
+
+## Business Model
+- Paid consultations with nutritionists
+- Content marketplace for premium diets and plans
+- Subscription-based features for consultants
+
+## Key Success Metrics
+- User engagement with food diary
+- Consultation bookings and completion rates
+- Content creation by consultants
+- User retention and progress tracking

.kilocode/rules/memory-bank/context.md

@@ -0,0 +1,29 @@
+# Current Context
+
+## Project Status
+Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.3.0+79) currently in production.
+
+## Recent Activity
+- Memory Bank initialization completed
+- All core files documented
+- Architecture and technology stack catalogued
+
+## Current Focus
+Ready for development tasks. No active work in progress.
+
+## Known Issues
+None documented at initialization.
+
+## Next Steps
+Awaiting user direction for:
+- Feature development
+- Bug fixes
+- Architecture improvements
+- Performance optimizations
+
+## Important Notes
+- Primary language: Russian (ru)
+- Target market: Russian users
+- Multi-platform: Android (including Huawei) and iOS
+- Environment: Uses `.env` file for configuration (not in repository)
+- Build system: Requires code generation for models/services

.kilocode/rules/memory-bank/product.md

@@ -0,0 +1,73 @@
+# Product Overview
+
+## Purpose
+Eatvio is a comprehensive nutrition and diet management mobile application that connects users with nutrition consultants, provides diet planning tools, recipes, and personal food diary tracking.
+
+## Core Problems It Solves
+
+### For Regular Users:
+1. **Diet Management**: Track daily food intake with detailed nutritional information
+2. **Meal Planning**: Access to recipes and structured diet plans
+3. **Professional Guidance**: Connect with certified nutrition consultants
+4. **Progress Tracking**: Monitor weight, body measurements, and dietary habits
+5. **Knowledge Access**: Learn about nutrition through blog posts and glossary
+
+### For Nutrition Consultants:
+1. **Client Management**: Communicate with clients via integrated chat
+2. **Content Creation**: Create and publish diets, meal plans, recipes, and blog posts
+3. **Consultation Services**: Offer paid nutrition consultation services
+4. **Income Tracking**: Monitor earnings and client purchases
+5. **Professional Presence**: Build profile and gain subscribers
+
+## How It Works
+
+### User Journey:
+1. **Authentication**: Sign up via email/password or social networks (VK, Yandex, OK, Mail.ru)
+2. **Feed Exploration**: Browse recipes, diets, nutrition plans, blog posts, and consultants
+3. **Content Interaction**: Like, bookmark, comment on content
+4. **Diary Tracking**: Log daily meals with photos and nutritional data
+5. **Consultations**: Book and pay for nutrition consultant services
+6. **Real-time Chat**: Communicate with consultants through integrated messaging
+7. **Progress Monitoring**: Track weight and body measurements over time
+
+### Consultant Journey:
+1. **Become Consultant**: Apply and get verified as nutrition consultant
+2. **Content Creation**: Publish professional diets, meal plans, recipes
+3. **Client Interaction**: Respond to consultations and provide guidance
+4. **Diary Review**: Review client food diaries and provide feedback
+5. **Earnings Management**: Track income from consultations and content
+
+## User Experience Goals
+
+### Seamless Navigation:
+- Bottom navigation bar for main sections (Profile, Feed, Diary, Consultations, Chat)
+- Tab-based feed filtering (Blog posts, Recipes, Diets, Plans, Consultants)
+- Deep linking support for direct content access
+
+### Real-time Engagement:
+- WebSocket-powered chat for instant messaging
+- Push notifications for messages and updates
+- Live content updates without app restart
+
+### Professional Interface:
+- Clean, modern UI with Mulish font family
+- Intuitive search and filtering across all content types
+- Visual progress tracking with charts and gauges
+
+### Content Discovery:
+- Tag-based recipe filtering
+- Search functionality across all content types
+- Personalized feed based on user interests
+
+### Offline Capability:
+- Token persistence for seamless re-authentication
+- Cached content for better performance
+- Queue system for offline actions
+
+## Key Differentiators
+
+1. **Integrated Platform**: Combines diet tracking, content, and professional consultations
+2. **Social Features**: Follow consultants, like/bookmark content, engage with community
+3. **Professional Tools**: Full toolkit for consultants to manage practice
+4. **Russian Market Focus**: Optimized for Russian users with local payment and auth integrations
+5. **Multi-platform Support**: Works on Android (including Huawei) and iOS

.kilocode/rules/memory-bank/tech.md

@@ -0,0 +1,152 @@
+# Technology Stack
+
+## Core Framework
+- **Flutter**: SDK 3.8.0+
+- **Dart**: Language version >=3.8.0 <4.0.0
+- **Version**: 1.3.0+79 (build 79)
+
+## State Management
+- **flutter_bloc**: ^9.1.1 - BLoC pattern implementation
+- **equatable**: ^2.0.7 - Value equality for state objects
+
+## Data Management
+- **freezed**: ^3.2.0 - Immutable data classes
+- **freezed_annotation**: ^3.1.0 - Code generation annotations
+- **json_annotation**: ^4.9.0 - JSON serialization
+- **json_serializable**: ^6.10.0 - JSON code generation
+
+## Networking
+- **dio**: ^5.9.0 - HTTP client
+- **retrofit**: ^4.7.1 - Type-safe REST client
+- **retrofit_generator**: ^10.0.2 - Retrofit code generation
+- **http**: ^1.5.0 - Additional HTTP support
+- **http_parser**: ^4.1.2 - HTTP parsing utilities
+
+## Real-time Communication
+- **dart_pusher_channels**: ^1.2.3 - WebSocket support via Pusher
+- **connectivity_plus**: ^6.1.5 - Network connectivity monitoring
+
+## Navigation & Routing
+- **go_router**: ^16.1.0 - Declarative routing
+- Deep linking support for content
+
+## UI Components
+- **cached_network_image**: ^3.4.1 - Image caching
+- **flutter_svg**: ^2.2.0 - SVG rendering
+- **google_fonts**: ^6.3.0 - Mulish font family
+- **carousel_slider_plus**: ^7.1.1 - Carousel widgets
+- **photo_view**: ^0.15.0 - Image viewer
+- **dismissible_page**: ^1.0.2 - Swipe to dismiss
+- **badges**: ^3.1.2 - Notification badges
+- **lottie**: ^3.3.1 - Animation support
+- **flutter_portal**: ^1.1.4 - Overlay widgets
+- **dotted_border**: ^3.1.0 - Dotted borders
+- **flutter_rating_bar**: ^4.0.1 - Rating widgets
+
+## Forms & Input
+- **flutter_form_builder**: ^10.2.0 - Form management
+- **validators**: ^3.0.0 - Input validation
+- **flutter_typeahead**: ^5.2.0 - Autocomplete
+- **keyboard_dismisser**: ^3.0.0 - Keyboard management
+- **flutter_keyboard_visibility**: ^6.0.0 - Keyboard state
+- **mask_text_input_formatter**: ^2.9.0 - Input masking
+
+## Media & Files
+- **image_picker**: ^1.2.0 - Image selection
+- **flutter_image_compress**: ^2.4.0 - Image compression
+- **image**: ^4.5.4 - Image manipulation
+- **file_picker**: ^10.3.1 - File selection
+- **audioplayers**: ^6.5.0 - Audio playback
+- **qr_code_scanner_plus**: ^2.0.10+1 - QR code scanning
+
+## Data Visualization
+- **syncfusion_flutter_charts**: ^30.2.5 - Chart widgets
+- **syncfusion_flutter_gauges**: ^30.2.5 - Gauge widgets
+- **table_calendar**: ^3.2.0 - Calendar widget
+
+## Storage & Persistence
+- **shared_preferences**: ^2.5.3 - Local key-value storage
+- **path_provider**: ^2.1.5 - File system paths
+- **path**: ^1.9.1 - Path manipulation
+
+## Firebase
+- **firebase_core**: ^4.0.0 - Firebase initialization
+- **firebase_messaging**: ^16.0.0 - Push notifications
+
+## Analytics & Monitoring
+- **sentry_flutter**: ^9.6.0 - Error tracking
+- **appmetrica_plugin**: ^3.3.0 - Analytics (Russian market)
+
+## Authentication
+- **vk_id**: ^1.0.3 - VK social login
+- **flutter_login_yandex**: ^0.0.5 - Yandex ID login
+- OAuth support for OK and Mail.ru
+
+## Utilities
+- **url_launcher**: ^6.3.2 - URL handling
+- **easy_debounce**: ^2.0.3 - Debouncing
+- **share_plus**: ^11.1.0 - Content sharing
+- **flutter_html**: ^3.0.0 - HTML rendering
+- **webview_flutter**: ^4.13.0 - WebView
+- **intl**: ^0.20.2 - Internationalization
+- **collection**: ^1.19.1 - Collection utilities
+- **uuid**: ^4.5.1 - UUID generation
+- **visibility_detector**: ^0.4.0+2 - Visibility tracking
+- **fluttertoast**: ^8.2.12 - Toast messages
+- **version**: ^3.0.2 - Version management
+- **package_info_plus**: ^8.3.1 - Package info
+- **device_info_plus**: ^11.5.0 - Device information
+- **permission_handler**: ^12.0.1 - Permissions
+
+## Platform-Specific
+
+### Android
+- Huawei HMS Push (6.12.0.300)
+- Huawei Analytics (6.12.0.300)
+- Google Play Services
+- ProGuard for code obfuscation
+- NDK version 27.0.12077973
+- Compile SDK: Flutter default
+- Min SDK: Flutter default
+- Target SDK: Flutter default
+
+### iOS
+- APNs for push notifications
+- Deep linking support
+
+## Development Tools
+- **build_runner**: ^2.7.0 - Code generation
+- **flutter_native_splash**: ^2.4.6 - Splash screen
+- **flutter_lints**: ^6.0.0 - Linting
+- **mockito**: ^5.5.0 - Mocking for tests
+- **flutter_test**: SDK - Testing framework
+- **integration_test**: SDK - Integration testing
+- **flutter_dotenv**: ^5.2.1 - Environment variables
+
+## Localization
+- **flutter_localizations**: SDK - Localization
+- **flutter_intl**: Enabled - Internationalization
+- Primary language: Russian (ru)
+
+## Build Configuration
+- **Environment**: Production/Development/Test modes
+- **Build types**: Debug, Release, Profile
+- **Code generation**: Freezed, JSON, Retrofit
+- **Obfuscation**: ProGuard (Android release)
+- **Resource optimization**: Shrink resources enabled
+
+## API Integration Patterns
+- RESTful API via Retrofit
+- Bearer token authentication
+- Interceptor-based auth injection
+- Automatic 401 handling
+- Environment-based base URLs
+- Type-safe API clients
+
+## Development Workflow
+1. Code generation: `flutter pub run build_runner build`
+2. Clean generation: `flutter pub run build_runner build --delete-conflicting-outputs`
+3. Watch mode: `flutter pub run build_runner watch`
+4. Environment setup: `.env` file configuration
+5. Firebase setup: Separate configs per platform
+6. Testing: Unit tests + Integration tests

ENV_SETUP.md

@@ -0,0 +1,93 @@
+# Настройка переменных окружения
+
+Этот проект использует переменные окружения для хранения секретных данных и конфигурации.
+
+## Установка
+
+1. Скопируйте файл `env.example` в `.env`:
+```bash
+cp env.example .env
+```
+
+2. Отредактируйте файл `.env` и замените значения на ваши собственные секреты.
+
+## Переменные окружения
+
+### API URLs
+- `BASE_URL` - основной URL API (по умолчанию: https://eatvio.ru)
+- `DEV_BASE_URL` - URL API для разработки (по умолчанию: https://dev2.eatvio.com)
+
+### Sentry Configuration
+- `SENTRY_DSN` - DSN для Sentry мониторинга
+
+### Firebase Configuration
+- `FIREBASE_PROJECT_ID` - ID проекта Firebase
+- `FIREBASE_DATABASE_URL` - URL базы данных Firebase
+- `FIREBASE_STORAGE_BUCKET` - bucket для хранения файлов
+- `FIREBASE_MESSAGING_SENDER_ID` - ID отправителя сообщений
+
+### Firebase Android Configuration
+- `FIREBASE_ANDROID_API_KEY` - API ключ для Android
+- `FIREBASE_ANDROID_APP_ID` - ID приложения для Android
+
+### Firebase iOS Configuration
+- `FIREBASE_IOS_API_KEY` - API ключ для iOS
+- `FIREBASE_IOS_APP_ID` - ID приложения для iOS
+- `FIREBASE_IOS_BUNDLE_ID` - Bundle ID для iOS
+
+### App Store URLs
+- `APP_STORE_URL` - URL App Store
+- `RUSTORE_URL` - URL RuStore
+
+### Support URLs
+- `TELEGRAM_SUPPORT_URL` - URL поддержки в Telegram
+- `SUPPORT_EMAIL` - email для поддержки
+
+### Test Credentials (только для разработки)
+- `TEST_EMAIL` - тестовый email
+- `TEST_PASSWORD` - тестовый пароль
+
+### Email Validation API
+- `EMAIL_VALIDATION_API_URL` - URL API для валидации email
+
+### Connection Check URLs
+- `GOOGLE_CHECK_URL` - URL для проверки соединения (Google)
+- `YANDEX_CHECK_URL` - URL для проверки соединения (Yandex)
+
+### VK ID Configuration
+- `VK_CLIENT_ID` - ID приложения VK (числовой)
+- **Примечание**: VK_CLIENT_ID - это числовой "ID приложения" из консоли VK ID, НЕ "Защищённый ключ" или "Сервисный ключ доступа"
+
+### Yandex ID Configuration
+- `YANDEX_CLIENT_ID` - ID приложения Yandex OAuth
+- `YANDEX_CLIENT_SECRET` - секретный ключ приложения Yandex OAuth
+- `YANDEX_REDIRECT_URI` - URI для перенаправления (должен совпадать с настройками в Yandex OAuth приложении)
+
+## Безопасность
+
+⚠️ **ВАЖНО**: Файл `.env` добавлен в `.gitignore` и не должен попадать в репозиторий. Все секретные данные должны храниться только в этом файле.
+
+## Использование в коде
+
+Для доступа к переменным окружения используйте класс `EnvConfig`:
+
+```dart
+import 'package:eatvio_app/core/env_config.dart';
+
+String baseUrl = EnvConfig.baseUrl;
+String sentryDsn = EnvConfig.sentryDsn;
+```
+
+## Миграция
+
+Все секреты были перенесены из кода в переменные окружения:
+
+1. **Sentry DSN** - из `main.dart`
+2. **Firebase конфигурация** - из `firebase_options.dart`
+3. **API URLs** - из `const.dart`
+4. **URL для проверки соединения** - из `internet_connection_checker_screen.dart`
+5. **URL для обновления приложения** - из `update_screen.dart`
+6. **URL поддержки Telegram** - из `support_screen.dart`
+7. **API для валидации email** - из `registration_repository.dart`
+8. **Тестовые учетные данные** - из `test_cases.dart`
+9. **Email поддержки** - из `support_screen.dart` 

Makefile

@@ -4,4 +4,7 @@ run-tests:
 run-analyse:
 	flutter analyze
 
-run-checks: run-analyse run-tests
+run-checks: run-analyse run-tests
+
+build-generated-files:
+	dart run build_runner build --delete-conflicting-outputs

README.md

@@ -1 +1,449 @@
-# eatvio_app
+# Eatvio - Nutrition & Diet Management Application
+
+## Project Overview
+
+Eatvio is a comprehensive mobile application connecting users with nutrition consultants, providing diet planning tools, recipes, food diary tracking, and professional consultation services. The application is specifically designed for Russian-speaking users interested in nutrition and healthy eating.
+
+### Core Features
+- **Blog Posts**: Educational nutrition content and articles
+- **Nutrition Consultation**: Professional consultation services with certified nutritionists
+- **Recipes**: User-generated and professional recipes with nutritional information
+- **Diets**: Structured diet plans with daily schedules
+- **Nutrition Plans**: Long-term nutrition planning and tracking
+
+### Target Audience
+- **Primary**: Russian-speaking users interested in nutrition and healthy eating
+- **Secondary**: Certified nutrition consultants offering professional services
+- **Market**: Russian Federation and Russian-speaking countries
+
+### Business Model
+- Paid consultations with nutritionists
+- Content marketplace for premium diets and plans
+- Subscription-based features for consultants
+
+### Platform Information
+- **Mobile**: iOS and Android (including Huawei devices)
+- **Language**: Russian (ru)
+- **Current Version**: 1.3.0+79 (build 79)
+
+## Prerequisites
+
+### Flutter & Dart Versions
+- **Flutter**: SDK 3.8.0+
+- **Dart**: Language version >=3.8.0 <4.0.0
+
+### Platform-Specific Requirements
+
+#### Android
+- **NDK Version**: 27.0.12077973
+- **Huawei HMS Dependencies**:
+  - Huawei Push (6.12.0.300)
+  - Huawei Analytics (6.12.0.300)
+- **Google Play Services**
+- **ProGuard** for code obfuscation
+- **Compile SDK**: Flutter default
+- **Min SDK**: Flutter default
+- **Target SDK**: Flutter default
+
+#### iOS
+- **APNs** for push notifications
+- **Deep linking** configuration
+- **Xcode** version compatible with Flutter requirements
+
+#### General IDE Requirements
+- **VS Code** with Flutter/Dart extensions
+- **Android Studio** with Flutter plugin
+- **Visual Studio Code** recommended for development
+
+## Environment Configuration
+
+### .env Setup Process
+
+1. Copy the environment template:
+   ```bash
+   cp env.example .env
+   ```
+
+2. Edit the `.env` file with your configuration values
+
+### Required Environment Variables
+
+#### API URLs
+- `BASE_URL` - основной URL API (по умолчанию: https://eatvio.ru)
+- `DEV_BASE_URL` - URL API для разработки (по умолчанию: https://dev2.eatvio.com)
+
+#### Sentry Configuration
+- `SENTRY_DSN` - DSN для Sentry мониторинга
+
+#### Firebase Configuration
+- `FIREBASE_PROJECT_ID` - ID проекта Firebase
+- `FIREBASE_DATABASE_URL` - URL базы данных Firebase
+- `FIREBASE_STORAGE_BUCKET` - bucket для хранения файлов
+- `FIREBASE_MESSAGING_SENDER_ID` - ID отправителя сообщений
+
+#### Firebase Android Configuration
+- `FIREBASE_ANDROID_API_KEY` - API ключ для Android
+- `FIREBASE_ANDROID_APP_ID` - ID приложения для Android
+
+#### Firebase iOS Configuration
+- `FIREBASE_IOS_API_KEY` - API ключ для iOS
+- `FIREBASE_IOS_APP_ID` - ID приложения для iOS
+- `FIREBASE_IOS_BUNDLE_ID` - Bundle ID для iOS
+
+#### App Store URLs
+- `APP_STORE_URL` - URL App Store
+- `RUSTORE_URL` - URL RuStore
+
+#### Support URLs
+- `TELEGRAM_SUPPORT_URL` - URL поддержки в Telegram
+- `SUPPORT_EMAIL` - email для поддержки
+
+#### Test Credentials (только для разработки)
+- `TEST_EMAIL` - тестовый email
+- `TEST_PASSWORD` - тестовый пароль
+
+#### Email Validation API
+- `EMAIL_VALIDATION_API_URL` - URL API для валидации email
+
+#### Connection Check URLs
+- `GOOGLE_CHECK_URL` - URL для проверки соединения (Google)
+- `YANDEX_CHECK_URL` - URL для проверки соединения (Yandex)
+
+#### VK ID Configuration
+- `VK_CLIENT_ID` - ID приложения VK (числовой)
+- **Примечание**: VK_CLIENT_ID - это числовой "ID приложения" из консоли VK ID, НЕ "Защищённый ключ" или "Сервисный ключ доступа"
+
+#### Yandex ID Configuration
+- `YANDEX_CLIENT_ID` - ID приложения Yandex OAuth
+- `YANDEX_CLIENT_SECRET` - секретный ключ приложения Yandex OAuth
+- `YANDEX_REDIRECT_URI` - URI для перенаправления (должен совпадать с настройками в Yandex OAuth приложении)
+
+## Technology Stack
+
+### Core Framework
+- **Flutter**: SDK 3.8.0+
+- **Dart**: Language version >=3.8.0 <4.0.0
+- **Version**: 1.3.0+79 (build 79)
+
+### State Management
+- **flutter_bloc**: ^9.1.1 - BLoC pattern implementation
+- **equatable**: ^2.0.7 - Value equality for state objects
+
+### Data Management
+- **freezed**: ^3.2.0 - Immutable data classes
+- **freezed_annotation**: ^3.1.0 - Code generation annotations
+- **json_annotation**: ^4.9.0 - JSON serialization
+- **json_serializable**: ^6.10.0 - JSON code generation
+
+### Networking
+- **dio**: ^5.9.0 - HTTP client
+- **retrofit**: ^4.7.1 - Type-safe REST client
+- **retrofit_generator**: ^10.0.2 - Retrofit code generation
+- **http**: ^1.5.0 - Additional HTTP support
+- **http_parser**: ^4.1.2 - HTTP parsing utilities
+
+### Real-time Communication
+- **dart_pusher_channels**: ^1.2.3 - WebSocket support via Pusher
+- **connectivity_plus**: ^6.1.5 - Network connectivity monitoring
+
+### Navigation & Routing
+- **go_router**: ^16.1.0 - Declarative routing
+- Deep linking support for content
+
+### UI Components
+- **cached_network_image**: ^3.4.1 - Image caching
+- **flutter_svg**: ^2.2.0 - SVG rendering
+- **google_fonts**: ^6.3.0 - Mulish font family
+- **carousel_slider_plus**: ^7.1.1 - Carousel widgets
+- **photo_view**: ^0.15.0 - Image viewer
+- **dismissible_page**: ^1.0.2 - Swipe to dismiss
+- **badges**: ^3.1.2 - Notification badges
+- **lottie**: ^3.3.1 - Animation support
+- **flutter_portal**: ^1.1.4 - Overlay widgets
+- **dotted_border**: ^3.1.0 - Dotted borders
+- **flutter_rating_bar**: ^4.0.1 - Rating widgets
+
+### Forms & Input
+- **flutter_form_builder**: ^10.2.0 - Form management
+- **validators**: ^3.0.0 - Input validation
+- **flutter_typeahead**: ^5.2.0 - Autocomplete
+- **keyboard_dismisser**: ^3.0.0 - Keyboard management
+- **flutter_keyboard_visibility**: ^6.0.0 - Keyboard state
+- **mask_text_input_formatter**: ^2.9.0 - Input masking
+
+### Media & Files
+- **image_picker**: ^1.2.0 - Image selection
+- **flutter_image_compress**: ^2.4.0 - Image compression
+- **image**: ^4.5.4 - Image manipulation
+- **file_picker**: ^10.3.1 - File selection
+- **audioplayers**: ^6.5.0 - Audio playback
+- **qr_code_scanner_plus**: ^2.0.10+1 - QR code scanning
+
+### Data Visualization
+- **syncfusion_flutter_charts**: ^30.2.5 - Chart widgets
+- **syncfusion_flutter_gauges**: ^30.2.5 - Gauge widgets
+- **table_calendar**: ^3.2.0 - Calendar widget
+
+### Storage & Persistence
+- **shared_preferences**: ^2.5.3 - Local key-value storage
+- **path_provider**: ^2.1.5 - File system paths
+- **path**: ^1.9.1 - Path manipulation
+
+### Firebase
+- **firebase_core**: ^4.0.0 - Firebase initialization
+- **firebase_messaging**: ^16.0.0 - Push notifications
+
+### Analytics & Monitoring
+- **sentry_flutter**: ^9.6.0 - Error tracking
+- **appmetrica_plugin**: ^3.3.0 - Analytics (Russian market)
+
+### Authentication
+- **vk_id**: ^1.0.3 - VK social login
+- **flutter_login_yandex**: ^0.0.5 - Yandex ID login
+- OAuth support for OK and Mail.ru
+
+### Utilities
+- **url_launcher**: ^6.3.2 - URL handling
+- **easy_debounce**: ^2.0.3 - Debouncing
+- **share_plus**: ^11.1.0 - Content sharing
+- **flutter_html**: ^3.0.0 - HTML rendering
+- **webview_flutter**: ^4.13.0 - WebView
+- **intl**: ^0.20.2 - Internationalization
+- **collection**: ^1.19.1 - Collection utilities
+- **uuid**: ^4.5.1 - UUID generation
+- **visibility_detector**: ^0.4.0+2 - Visibility tracking
+- **fluttertoast**: ^8.2.12 - Toast messages
+- **version**: ^3.0.2 - Version management
+- **package_info_plus**: ^8.3.1 - Package info
+- **device_info_plus**: ^11.5.0 - Device information
+- **permission_handler**: ^12.0.1 - Permissions
+
+## Development Workflow
+
+### Code Generation
+- Run `flutter pub run build_runner build` for code generation
+- Run `flutter pub run build_runner build --delete-conflicting-outputs` for clean generation
+- Use `flutter pub run build_runner watch` for watch mode
+
+### Environment Setup
+- Configure `.env` file with all required variables
+- Set up Firebase for both Android and iOS platforms
+- Configure social authentication providers (VK, Yandex, etc.)
+
+### Testing
+- Unit tests with `flutter_test`
+- Integration tests with `integration_test`
+- Mocking with `mockito`
+
+## Build Commands
+
+### Development Builds
+```bash
+# Run on connected device
+flutter run
+
+# Run on specific Android device
+flutter run -d emulator-5554
+
+# Run on specific iOS simulator
+flutter run -d iPhone\ 15
+```
+
+### Production Builds
+
+#### Android
+```bash
+# Build APK (split by ABI)
+flutter build apk --release --split-per-abi
+
+# Build App Bundle
+flutter build appbundle --release
+
+# Huawei-specific build (with HMS)
+flutter build apk --release --flavor production --target-platform android-arm64
+```
+
+#### iOS
+```bash
+# Build IPA for TestFlight
+flutter build ipa --export-options-plist=ExportOptions.plist
+
+# Build for specific device architecture
+flutter build ipa --export-options-plist=ExportOptions.plist --no-codesign
+```
+
+## Optimization Techniques
+
+### Android Build Optimization
+1. **ProGuard Rules**:
+   - Configure rules in [`android/app/proguard-rules.pro`](android/app/proguard-rules.pro:1)
+   - Essential rules for Flutter:
+     ```
+     -keep class io.flutter.app.** { *; }
+     -keep class io.flutter.plugin.**  { *; }
+     -keep class io.flutter.util.**  { *; }
+     -keep class io.flutter.view.**  { *; }
+     ```
+
+2. **Resource Shrinking**:
+   - Enabled in `android/app/build.gradle`:
+     ```gradle
+     buildTypes {
+         release {
+             shrinkResources true
+             minifyEnabled true
+         }
+     }
+     ```
+
+3. **Code Obfuscation**:
+   - Use `--obfuscate` flag with build commands
+   - Verify with `flutter build apk --release --obfuscate --split-debug-info=debug-info/`
+
+4. **Image Compression Workflow**:
+   - Automatic compression via [`flutter_image_compress`](lib/features/create_diet/models/create_diet_model.dart:1)
+   - Configuration in image upload flows:
+     ```dart
+     final compressedFile = await FlutterImageCompress.compressWithFile(
+       file.path,
+       quality: 85,
+       minWidth: 1024,
+       minHeight: 1024,
+     );
+     ```
+
+## Troubleshooting
+
+### Common Issues
+
+#### Missing .env Variables
+- **Symptom**: Application crashes on startup with "Missing environment variable" error
+- **Solution**: 
+  1. Verify `.env` file exists in project root
+  2. Check [`ENV_SETUP.md`](ENV_SETUP.md) for required variables
+  3. Regenerate configuration with `flutter clean && flutter pub get`
+
+#### Firebase Configuration Errors
+- **Android**:
+  - Missing `google-services.json` in `android/app/`
+  - Missing `agconnect-services.json` for Huawei devices
+  - Verify SHA-1 fingerprints match Firebase console
+- **iOS**:
+  - Missing `GoogleService-Info.plist` in `ios/Runner`
+  - Check bundle identifier matches Firebase project
+
+#### WebSocket Connection Failures
+- **Symptoms**: Chat messages not delivering, real-time updates not working
+- **Solutions**:
+  1. Verify Pusher configuration in [`lib/core/websockets/ws_manager.dart`](lib/core/websockets/ws_manager.dart:1)
+  2. Check network connectivity with `connectivity_plus` package
+  3. Ensure proper authentication token is sent with WebSocket connection
+
+#### Platform-Specific Build Errors
+- **Huawei vs Google Services**:
+  - For Huawei devices, ensure `agconnect-services.json` is present
+  - Use `--flavor` flag to specify build variant:
+    ```bash
+    flutter build apk --release --flavor hms
+    ```
+  - Check for conflicting dependencies between HMS and GMS
+
+- **iOS Code Signing Issues**:
+  - Verify `ExportOptions.plist` contains correct provisioning profiles
+  - Update signing certificates in Xcode
+  - Clean build folder: `flutter clean && rm -rf ios/Pods ios/Podfile.lock`
+
+## Key Implementation Details
+
+### Content View Tracking
+- `ViewsCubit` handles visibility detection
+- `VisibilityDetector` widget tracks on-screen time
+- Views sent to backend when 50%+ visible for 2+ seconds
+- Debounced to prevent excessive API calls
+
+### Image Handling
+- `ImagePicker` for selection
+- `FlutterImageCompress` for compression
+- MultiPart form data upload via Dio
+- Preview via `CachedNetworkImage`
+
+### Search Implementation
+- Debounced search with 500ms delay
+- Min query length: 3 characters
+- Applied to: Feed, Recipes, Diets, Plans, Consultants
+- Tag-based filtering for recipes
+
+### Pagination Pattern
+- Page-based pagination
+- Scroll detection for next page load
+- Loading state during fetch
+- Meta data tracking (current page, last page)
+
+## Security Considerations
+
+### Authentication
+- Bearer token authentication
+- Secure token storage
+- Automatic session management
+- OAuth 2.0 for social login
+
+### Data Protection
+- HTTPS only communication
+- Token encryption in storage
+- Secure WebSocket connections
+- Privacy policy compliance
+
+## Key Files Reference
+
+### Entry Point
+- `lib/main.dart` - App initialization
+
+### Core Infrastructure
+- `lib/core/app_initializer.dart` - Startup sequence
+- `lib/core/locator_service.dart` - DI container
+- `lib/core/app_config.dart` - App configuration
+- `lib/core/app_router.dart` - Routing setup
+
+### WebSocket
+- `lib/core/websockets/ws_manager.dart` - Connection management
+- `lib/core/websockets/ws_service.dart` - API service
+
+### Authentication
+- `lib/features/auth/sdk/social_auth_facade.dart` - Social auth
+- `lib/core/token_storage.dart` - Token persistence
+- `lib/core/interceptors/token_interceptor.dart` - Auth interceptor
+
+### Environment
+- `lib/core/env_config.dart` - Environment variables
+- `.env` - Environment file (not in repo)
+
+## Key Success Metrics
+
+- User engagement with food diary
+- Consultation bookings and completion rates
+- Content creation by consultants
+- User retention and progress tracking
+
+## Documentation Standards
+
+- **Last Updated**: 2025-10-16
+- All paths are relative to `/home/apoloz/dev/eatvio_app`
+- Russian market focus maintained throughout documentation
+- Version compatibility matrix:
+  | Component | Version | Notes |
+  |-----------|---------|-------|
+  | Flutter | 3.8.0+ | Required |
+  | Dart | 3.8.0-3.9.9 | Required |
+  | Android SDK | 34 | Target SDK |
+  | iOS Deployment | 14.0 | Minimum |
+
+## Ubuntu Development PC Optimization
+ ```bash
+-# apt install linux-oem-24.04
+-# sudo apt-get install --install-recommends linux-lowlatency-hwe-24.04
+```
+----
+- ubuntu switch to hwe [kernel](https://canonical-kernel-docs.readthedocs-hosted.com/latest/reference/hwe-kernels/#installing-a-hwe-kernel)
+----
+- ubuntu instal intel iRIS gpu [drivers](https://dgpu-docs.intel.com/driver/client/overview.html#ubuntu-latest)
+```

android/app/agconnect-services.json

@@ -0,0 +1 @@
+{"agcgw":{"url":"connect-drru.hispace.dbankcloud.ru","backurl":"connect-drru.hispace.dbankcloud.cn","websocketurl":"connect-ws-drru.hispace.dbankcloud.ru","websocketbackurl":"connect-ws-drru.hispace.dbankcloud.cn"},"agcgw_all":{"SG":"connect-dra.dbankcloud.cn","SG_back":"connect-dra.hispace.hicloud.com","CN":"connect-drcn.dbankcloud.cn","CN_back":"connect-drcn.hispace.hicloud.com","RU":"connect-drru.hispace.dbankcloud.ru","RU_back":"connect-drru.hispace.dbankcloud.cn","DE":"connect-dre.dbankcloud.cn","DE_back":"connect-dre.hispace.hicloud.com"},"websocketgw_all":{"SG":"connect-ws-dra.hispace.dbankcloud.cn","SG_back":"connect-ws-dra.hispace.dbankcloud.com","CN":"connect-ws-drcn.hispace.dbankcloud.cn","CN_back":"connect-ws-drcn.hispace.dbankcloud.com","RU":"connect-ws-drru.hispace.dbankcloud.ru","RU_back":"connect-ws-drru.hispace.dbankcloud.cn","DE":"connect-ws-dre.hispace.dbankcloud.cn","DE_back":"connect-ws-dre.hispace.dbankcloud.com"},"client":{"cp_id":"20007000036693451","product_id":"461323198429446894","client_id":"1595824543740483264","client_secret":"2A1727B0D31AA9BE1F5D9E8A5CDA1A67B9EF084AC9FB68D6C633A3CCB08ECDEE","project_id":"461323198429446894","app_id":"113238569","api_key":"DQEDAJNRITp9M3uc1rPHyT8PzLc7bnVcKJAeavZZk0TQNMx9ifvBebr+JOmZe9tEvjnLwv7c1hAHXmPGR/gWG86iABDrCVotq+NGnw==","package_name":"com.eatvioapp.app"},"oauth_client":{"client_id":"113238569","client_type":1},"app_info":{"app_id":"113238569","package_name":"com.eatvioapp.app"},"service":{"analytics":{"collector_url":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn","collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn","resource_id":"p1","channel_id":""},"ml":{"mlservice_url":"ml-api-drru.ai.dbankcloud.ru,ml-api-drru.ai.dbankcloud.cn"},"cloudstorage":{"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg":"https://ops-dra.agcstorage.link","storage_url_de":"https://ops-dre.agcstorage.link","storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia","storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu","storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn"},"search":{"url":"https://search-drru.cloud.huawei.ru"},"edukit":{"edu_url":"edukit.cloud.huawei.com.cn","dh_url":"edukit.cloud.huawei.com.cn"}},"region":"RU","configuration_version":"3.0","appInfos":[{"package_name":"com.eatvioapp.app","client":{"app_id":"113238569"},"app_info":{"package_name":"com.eatvioapp.app","app_id":"113238569"},"oauth_client":{"client_type":1,"client_id":"113238569"}}]}

android/app/build.gradle

@@ -5,6 +5,7 @@ plugins {
     // END: FlutterFire Configuration
     id "kotlin-android"
     id "dev.flutter.flutter-gradle-plugin"
+    id 'com.huawei.agconnect'
 }
 
 def keystoreProperties = new Properties()
@@ -13,26 +14,32 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+def yandexClientId = project.hasProperty('YANDEX_CLIENT_ID') ? project.property('YANDEX_CLIENT_ID') : (System.getenv('YANDEX_CLIENT_ID') ?: "")
+
 android {
     namespace = "com.eatvioapp.app"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = 21
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     defaultConfig {
         applicationId = "com.eatvioapp.app"
-        minSdk = flutter.minSdkVersion
+        minSdkVersion flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+        manifestPlaceholders = [
+                YANDEX_CLIENT_ID: yandexClientId,
+                applicationName: "io.flutter.app.FlutterApplication"
+        ]
     }
 
     signingConfigs {
@@ -47,6 +54,9 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
             signingConfig signingConfigs.debug
@@ -57,6 +67,15 @@ android {
     }
 }
 
+dependencies {
+    implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
+    implementation 'com.huawei.hms:push:6.12.0.300'
+    // Huawei Analytics dependency to satisfy com.huawei.hianalytics.* references during R8
+    implementation 'com.huawei.hms:hianalytics:6.12.0.300'
+    // BouncyCastle provider required by Huawei secure utils used transitively by HMS
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
+}
+
 flutter {
     source = "../.."
 }

android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+-keep class com.huawei.** { *; }
+-dontwarn com.huawei.**
+
+-keep class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
+
+-keep class io.flutter.** { *; }
+-dontwarn io.flutter.**
+
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.coroutines.**
+
+-keep class **.R$* { *; }
+-keepclassmembers class ** { @androidx.annotation.Keep *; }
+-keep @androidx.annotation.Keep class * { *; }
+
+-keep public class * extends android.app.Application
+-keep public class * extends android.content.ContentProvider
+
+-keep class * implements android.os.Parcelable { *; }
+-keepclassmembers enum * { *; }

android/app/src/main/AndroidManifest.xml

@@ -7,10 +7,20 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
 
     <application
-        android:label="Eatvio"
+        android:label="Итвио"
         android:usesCleartextTraffic="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <service
+            android:name=".HmsPushService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+        <meta-data
+            android:name="push_kit_auto_init_enabled"
+            android:value="true" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -53,6 +63,18 @@
 
                 <data android:pathPattern="/ru/plan/.*" />
                 <data android:pathPattern="/en/plan/.*" />
+
+                <data android:pathPattern="/ru/chat/.*" />
+                <data android:pathPattern="/en/chat/.*" />
+
+                <data android:pathPattern="/ru/chat" />
+                <data android:pathPattern="/en/chat" />
+
+                <data android:pathPattern="/ru/profile/.*" />
+                <data android:pathPattern="/en/profile/.*" />
+
+                <data android:pathPattern="/ru/diary/.*" />
+                <data android:pathPattern="/en/diary/.*" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

android/app/src/main/kotlin/com/eatvioapp/app/HmsPushService.kt

@@ -0,0 +1,19 @@
+package com.eatvioapp.app
+
+import android.util.Log
+import com.huawei.hms.push.HmsMessageService
+import com.huawei.hms.push.RemoteMessage
+
+class HmsPushService : HmsMessageService() {
+    override fun onNewToken(token: String?) {
+        super.onNewToken(token)
+        Log.i("HMS", "onNewToken: ${token ?: "null"}")
+    }
+
+    override fun onMessageReceived(message: RemoteMessage?) {
+        super.onMessageReceived(message)
+        Log.i("HMS", "onMessageReceived: ${message?.data}")
+    }
+}
+
+

android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt

@@ -1,6 +1,71 @@
 package com.eatvioapp.app
 
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.os.Bundle
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import com.huawei.agconnect.config.AGConnectServicesConfig
+import com.huawei.hms.aaid.HmsInstanceId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class MainActivity: FlutterActivity() {
+    private val channelName = "com.eatvioapp/hms_push"
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "getHuaweiToken" -> {
+                        CoroutineScope(Dispatchers.IO).launch {
+                            try {
+                                // Try to read appId from agconnect-services.json
+                                var appId: String? = try {
+                                    AGConnectServicesConfig.fromContext(applicationContext)
+                                        .getString("client/app_id")
+                                } catch (_: Exception) {
+                                    null
+                                }
+
+                                // Fallback to manifest meta-data if needed
+                                if (appId.isNullOrBlank()) {
+                                    try {
+                                        val pm: PackageManager = applicationContext.packageManager
+                                        val ai: ApplicationInfo = pm.getApplicationInfo(applicationContext.packageName, PackageManager.GET_META_DATA)
+                                        val raw = ai.metaData?.getString("com.huawei.hms.client.appid")
+                                        if (!raw.isNullOrBlank()) {
+                                            appId = raw.removePrefix("appid=")
+                                        }
+                                    } catch (_: Exception) {
+                                        // ignore and handle below
+                                    }
+                                }
+
+                                if (appId.isNullOrBlank()) {
+                                    runOnUiThread {
+                                        result.error("HMS_TOKEN_ERROR", "Missing Huawei appId. Ensure agconnect-services.json or manifest meta-data is configured.", null)
+                                    }
+                                    return@launch
+                                }
+                                val token = HmsInstanceId.getInstance(applicationContext)
+                                    .getToken(appId, "HCM")
+                                runOnUiThread {
+                                    result.success(token)
+                                }
+                            } catch (e: Exception) {
+                                runOnUiThread {
+                                    result.error("HMS_TOKEN_ERROR", e.message, null)
+                                }
+                            }
+                        }
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+    }
 }

android/build.gradle

@@ -1,7 +1,21 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        maven {url 'https://developer.huawei.com/repo/'}
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.12.0'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
+    }
+}
+
 allprojects {
     repositories {
         google()
         mavenCentral()
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 }
 
@@ -13,6 +27,32 @@ subprojects {
     project.evaluationDependsOn(":app")
 }
 
+// Temporary safeguard: set missing namespaces for Android library modules based on their manifest package
+subprojects { Project subproject ->
+    subproject.pluginManager.withPlugin('com.android.library') {
+        def androidExt = subproject.extensions.findByName('android')
+        if (androidExt != null) {
+            def hasNamespaceProp = androidExt.hasProperty('namespace')
+            def currentNamespace = hasNamespaceProp ? androidExt.namespace : null
+            if (hasNamespaceProp && !currentNamespace) {
+                def manifestFile = file("${subproject.projectDir}/src/main/AndroidManifest.xml")
+                if (manifestFile.exists()) {
+                    try {
+                        def manifest = new groovy.xml.XmlSlurper().parse(manifestFile)
+                        def manifestPackage = manifest.@package?.text()
+                        if (manifestPackage) {
+                            androidExt.namespace = manifestPackage
+                            subproject.logger.lifecycle("[namespace-fix] Set namespace for ${subproject.path} to '${manifestPackage}' from AndroidManifest.xml")
+                        }
+                    } catch (Throwable t) {
+                        subproject.logger.warn("[namespace-fix] Failed to read manifest for ${subproject.path}: ${t.message}")
+                    }
+                }
+            }
+        }
+    }
+}
+
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip

android/settings.gradle

@@ -12,17 +12,18 @@ pluginManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://developer.huawei.com/repo/' }
         gradlePluginPortal()
     }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.3" apply false
+    id "com.android.application" version "8.12.0" apply false
     // START: FlutterFire Configuration
-    id "com.google.gms.google-services" version "4.4.2" apply false
+    id "com.google.gms.google-services" version "4.4.3" apply false
     // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.10" apply false
 }
 
 include ":app"

assets/icons/consultant_rating_icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2F80ED"><path d="M759.23-353.08q8.92-8.92 21.19-8.92 12.27 0 21.19 8.92l63.39 64q8.92 9.07 8.92 21.15 0 12.08-8.92 21.01-8.92 8.92-21.01 8.92-12.08 0-21.14-8.92l-64-63.39q-8.93-8.92-8.73-21.38.19-12.46 9.11-21.39Zm33.85-472.22q8.92 9 8.92 21.38 0 12.38-8.92 21.3l-63.39 63.39q-8.92 8.92-21.19 8.92-12.27 0-21.19-9-8.92-9.01-8.92-21.39t8.92-21.3l63.61-63.38q9.07-8.93 21.15-8.93 12.08 0 21.01 9.01ZM167-825q9.01-8.92 21.39-8.92t21.3 8.92l63.39 63.62q8.92 9.06 8.92 21.14 0 12.09-9 21.01-9.01 8.92-21.39 8.92t-21.3-8.92l-63.39-63.39q-8.92-8.92-8.92-21.19 0-12.27 9-21.19Zm33.77 472.31q8.92 8.92 8.92 21.19 0 12.27-8.92 21.19l-63.39 63.39q-8.92 8.92-21.19 8.92-12.27 0-21.19-9-8.92-9.01-8.92-21.39t8.92-21.3l63.62-63.39q8.92-8.92 21.07-8.73 12.16.2 21.08 9.12Zm135.54 86.85L480-352.23l144.08 87.77-37.62-163.62 126.39-109.07-166.39-14.93L480-706.54l-66.08 153.46-166.38 14.54 126.38 110.46-37.61 162.24ZM480.38-486ZM480-281.31 306.69-177.08q-8.69 5.08-17.42 4.27-8.73-.81-15.81-5.88-7.07-5.08-10.92-13.27-3.85-8.19-1.23-18.12L307.23-406 154.08-538.39q-7.69-6.83-9.62-15.57-1.92-8.73 1.31-17.04 3.23-8.31 9.28-13.62 6.05-5.32 16.64-6.84l201.7-17.39 78.46-185.3q3.84-9.31 11.65-13.77 7.81-4.46 16.5-4.46 8.69 0 16.5 4.46 7.81 4.46 11.65 13.77L587-608.85l201.69 17.39q10.68 1.51 16.78 6.82 6.1 5.3 9.14 13.64 3.24 8.31 1.31 17.04-1.92 8.74-9.61 15.57L653.15-406l45.93 196.31q2.61 9.92-1.23 17.92-3.85 8-10.93 13.08-7.07 5.07-15.8 5.88-8.73.81-17.43-4.27L480-281.31Z"/></svg>

assets/icons/logo_2.svg

@@ -0,0 +1,9 @@
+<svg width="89" height="90" viewBox="0 0 89 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.0119 0C65.9947 0 83 9.05026 83 29.6764C83 50.2792 65.9947 67 45.0119 67C24.0053 67 7 50.2792 7 29.6764C7 9.05026 24.0053 0 45.0119 0Z" fill="#43A6F2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.8844 43.5162C39.8585 43.5162 34.9274 42.5623 30.3282 40.7209C25.7291 38.8573 21.5803 36.1284 18.1428 32.7119C16.5544 31.1589 16.6493 28.6741 18.3087 27.2098C19.9919 25.7234 22.6234 25.8122 24.2118 27.3651C26.867 30.0052 30.0675 32.1129 33.6235 33.5327C37.1796 34.9748 40.9964 35.7069 44.8844 35.7069C48.7486 35.7069 52.5655 34.9748 56.1215 33.5327C59.6776 32.1129 62.878 30.0052 65.5332 27.3651C67.1216 25.8122 69.7531 25.7234 71.4363 27.2098C73.0958 28.6741 73.1906 31.1589 71.6022 32.7119C68.1647 36.1284 64.016 38.8573 59.4168 40.7209C54.8176 42.5623 49.8866 43.5162 44.8844 43.5162Z" fill="white"/>
+<path d="M9.69721 80.8957L3.51318 88.877C2.93793 89.6257 2.28049 90 1.54087 90C0.513623 90 0 89.3382 0 88.0147V77.3663C0 75.7888 0.56841 75 1.70523 75C2.84205 75 3.41046 75.7888 3.41046 77.3663V84.2246L9.71775 76.0829C10.2793 75.361 10.882 75 11.5257 75C12.5803 75 13.1077 75.7487 13.1077 77.246V87.6337C13.1077 89.2112 12.5393 90 11.4024 90C10.2656 90 9.69721 89.2112 9.69721 87.6337V80.8957Z" fill="#323F4B"/>
+<path d="M23.0017 78.2888C21.769 78.2888 21.0019 78.2553 20.7006 78.1885C19.7829 78.0013 19.3241 77.5201 19.3241 76.7447C19.3241 75.7019 20.1322 75.1805 21.7484 75.1805H27.6859C29.3021 75.1805 30.1102 75.7019 30.1102 76.7447C30.1102 77.5201 29.6514 78.0013 28.7337 78.1885C28.4324 78.2553 27.6654 78.2888 26.4327 78.2888V87.6337C26.4327 89.2112 25.8642 90 24.7274 90C23.5769 90 23.0017 89.2112 23.0017 87.6337V78.2888Z" fill="#323F4B"/>
+<path d="M38.6564 89.8195C37.7935 89.8195 37.1909 89.6791 36.8485 89.3984C36.506 89.1043 36.3348 88.5428 36.3348 87.7139V77.5267C36.3348 76.6578 36.506 76.0495 36.8485 75.7019C37.1909 75.3543 37.8072 75.1805 38.6975 75.1805H41.4916C42.8476 75.1805 43.9981 75.4545 44.9432 76.0027C46.0937 76.6578 46.6689 77.6003 46.6689 78.8302C46.6689 80.4211 46.08 81.4973 44.9021 82.0588V82.119C45.7787 82.3864 46.4087 82.7807 46.7922 83.3021C47.1757 83.8102 47.3675 84.512 47.3675 85.4078C47.3675 86.8917 46.8401 88.0214 45.7855 88.7968C44.8541 89.4786 43.6009 89.8195 42.0258 89.8195H38.6564ZM39.7453 83.5027V86.9519H41.4505C42.1764 86.9519 42.7175 86.8583 43.0736 86.6711C43.5393 86.4171 43.7721 85.9626 43.7721 85.3075C43.7721 84.5455 43.5461 84.0374 43.0941 83.7834C42.7654 83.5963 42.197 83.5027 41.3889 83.5027H39.7453ZM39.7453 78.0281V80.8957H41.2245C41.8957 80.8957 42.3682 80.8155 42.6421 80.6551C43.0256 80.4412 43.2174 80.0401 43.2174 79.4519C43.2174 78.5027 42.5531 78.0281 41.2245 78.0281H39.7453Z" fill="#323F4B"/>
+<path d="M64.1493 80.8957L57.9653 88.877C57.39 89.6257 56.7326 90 55.993 90C54.9657 90 54.4521 89.3382 54.4521 88.0147V77.3663C54.4521 75.7888 55.0205 75 56.1573 75C57.2941 75 57.8626 75.7888 57.8626 77.3663V84.2246L64.1698 76.0829C64.7314 75.361 65.3341 75 65.9778 75C67.0324 75 67.5598 75.7487 67.5598 77.246V87.6337C67.5598 89.2112 66.9913 90 65.8545 90C64.7177 90 64.1493 89.2112 64.1493 87.6337V80.8957Z" fill="#323F4B"/>
+<path d="M74.6391 82.5201C74.6391 80.3275 75.2691 78.5428 76.5292 77.1658C77.8304 75.7219 79.5904 75 81.8093 75C84.0418 75 85.8087 75.7152 87.1099 77.1457C88.37 78.5227 89 80.3142 89 82.5201C89 84.7126 88.37 86.4973 87.1099 87.8743C85.795 89.2914 84.0281 90 81.8093 90C79.5904 90 77.8304 89.2848 76.5292 87.8543C75.2691 86.4906 74.6391 84.7126 74.6391 82.5201ZM78.255 82.5602C78.255 83.7634 78.5358 84.7594 79.0973 85.5481C79.7274 86.4706 80.6314 86.9318 81.8093 86.9318C82.9872 86.9318 83.898 86.4773 84.5417 85.5682C85.1033 84.766 85.3841 83.7634 85.3841 82.5602C85.3841 81.3168 85.117 80.2941 84.5828 79.492C83.9391 78.5428 83.0146 78.0682 81.8093 78.0682C80.604 78.0682 79.6863 78.5428 79.0563 79.492C78.5221 80.2941 78.255 81.3168 78.255 82.5602Z" fill="#323F4B"/>
+</svg>

assets/icons/mail_logo.svg

@@ -0,0 +1,11 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1713_218)">
+<path d="M7.48034 0.0116882H20.547C24.6707 0.0116882 28.0137 3.35463 28.0137 7.47836V20.545C28.0137 24.6687 24.6707 28.0117 20.547 28.0117H7.48034C3.35661 28.0117 0.0136719 24.6687 0.0136719 20.545V7.47836C0.0136717 3.35463 3.35661 0.0116882 7.48034 0.0116882Z" fill="#0077FF"/>
+<path d="M14.0133 3.43393C19.8423 3.43393 24.5911 8.18276 24.5911 14.0117C24.5911 17.6432 22.8964 19.3565 20.7548 19.3565C19.5071 19.3565 18.4269 18.7047 17.8124 17.7363C16.844 18.7233 15.5031 19.3378 14.0133 19.3378C11.0709 19.3378 8.6872 16.9541 8.6872 14.0117C8.6872 11.0693 11.0709 8.68558 14.0133 8.68558C16.9557 8.68558 19.3395 11.0693 19.3395 14.0117V15.7436C19.3395 16.6189 19.954 17.2334 20.7548 17.2334C21.7046 17.2334 22.4867 16.4327 22.4867 14.0117C22.4867 9.33739 18.6876 5.53832 14.0133 5.53832C9.339 5.53832 5.53993 9.33739 5.53993 14.0117C5.53993 18.686 9.339 22.4851 14.0133 22.4851C16.7136 22.4851 18.5759 21.1443 18.5759 21.1443L19.9726 22.7458C19.9726 22.7458 17.5889 24.5895 14.0133 24.5895C8.18438 24.5895 3.43555 19.8407 3.43555 14.0117C3.43555 8.18276 8.18438 3.43393 14.0133 3.43393ZM10.7916 14.0117C10.7916 15.7809 12.2255 17.2334 14.0133 17.2334C15.7825 17.2334 17.2351 15.7809 17.2351 14.0117C17.2351 12.2239 15.7825 10.79 14.0133 10.79C12.2255 10.79 10.7916 12.2239 10.7916 14.0117Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1713_218">
+<rect width="28" height="28" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/icons/ok_logo.svg

@@ -0,0 +1,5 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13.4393C0 7.10718 0 3.92462 1.9623 1.96231C3.9411 1.57261e-07 7.10718 0 13.4393 0H14.5607C20.8928 0 24.0754 1.57261e-07 26.0377 1.96231C28 3.92462 28 7.10718 28 13.4393V14.5607C28 20.8928 28 24.0754 26.0377 26.0377C24.0754 28 20.8928 28 14.5607 28H13.4393C7.10718 28 3.92461 28 1.9623 26.0377C0 24.0754 0 20.9093 0 14.5607V13.4393Z" fill="#FF7700"/>
+<path d="M13.9997 13.934C15.3684 13.934 16.6051 13.3734 17.4956 12.4829C18.3861 11.5925 18.9467 10.3557 18.9467 8.98704C18.9467 7.61837 18.3861 6.38162 17.4956 5.49116C16.6051 4.6007 15.3684 4.04004 13.9997 4.04004C12.631 4.04004 11.3943 4.6007 10.5039 5.49116C9.61339 6.38162 9.05273 7.61837 9.05273 8.98704C9.05273 10.3557 9.61339 11.5925 10.5039 12.4829C11.3943 13.3734 12.6475 13.934 13.9997 13.934ZM12.4167 7.38751C12.8289 6.97526 13.3896 6.72791 13.9997 6.72791C14.6263 6.72791 15.187 6.97526 15.5828 7.38751C15.995 7.79976 16.2424 8.36042 16.2424 8.97055C16.2424 9.59716 15.995 10.1578 15.5828 10.5536C15.1705 10.9658 14.6098 11.2132 13.9997 11.2132C13.3731 11.2132 12.8124 10.9658 12.4167 10.5536C12.0044 10.1413 11.7571 9.58067 11.7571 8.97055C11.7571 8.36042 12.0209 7.79976 12.4167 7.38751Z" fill="white"/>
+<path d="M20.6615 15.9293L19.2104 13.9505C19.1279 13.8351 18.963 13.8186 18.8641 13.9175C17.4954 15.0883 15.8134 15.8469 13.9995 15.8469C12.1856 15.8469 10.5037 15.0883 9.13498 13.9175C9.03604 13.8351 8.87114 13.8516 8.78869 13.9505L7.33758 15.9293C7.27162 16.0283 7.28811 16.1602 7.37056 16.2426C8.59081 17.232 10.009 17.9081 11.4931 18.2544L8.42591 23.6631C8.34346 23.8115 8.45889 24.0094 8.62379 24.0094H11.625C11.7239 24.0094 11.8064 23.9599 11.8393 23.861L13.983 19.0789L16.1267 23.861C16.1597 23.9434 16.2422 24.0094 16.3411 24.0094H19.3423C19.5237 24.0094 19.6226 23.828 19.5402 23.6631L16.473 18.2544C17.9571 17.9081 19.3753 17.2485 20.5955 16.2426C20.7274 16.1602 20.7439 16.0283 20.6615 15.9293Z" fill="white"/>
+</svg>

assets/icons/resend.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.377 11L15.3193 6.94225C15.1641 6.78709 15.0865 6.60892 15.0865 6.40775C15.0865 6.20642 15.1641 6.02817 15.3193 5.873C15.4744 5.72817 15.6542 5.65734 15.8587 5.6605C16.0631 5.66384 16.2345 5.73467 16.373 5.873L20.8673 10.3673C20.9609 10.4609 21.0269 10.5597 21.0653 10.6635C21.1038 10.7673 21.123 10.8795 21.123 11C21.123 11.1205 21.1038 11.2327 21.0653 11.3365C21.0269 11.4403 20.9609 11.5391 20.8673 11.6328L16.373 16.127C16.2178 16.282 16.0422 16.357 15.8462 16.352C15.6501 16.3468 15.4744 16.2718 15.3193 16.127C15.1641 15.9718 15.0856 15.7946 15.0837 15.5953C15.0817 15.3959 15.1551 15.2218 15.3038 15.073L19.377 11ZM14.0693 11.75H7.25C6.3525 11.75 5.5865 12.0673 4.952 12.702C4.31733 13.3365 4 14.1025 4 15V17.75C4 17.9628 3.92817 18.141 3.7845 18.2845C3.641 18.4282 3.46283 18.5 3.25 18.5C3.03717 18.5 2.859 18.4282 2.7155 18.2845C2.57183 18.141 2.5 17.9628 2.5 17.75V15C2.5 13.6872 2.9635 12.5673 3.8905 11.6405C4.81733 10.7135 5.93717 10.25 7.25 10.25H14.0693L10.7615 6.94225C10.6065 6.78709 10.529 6.60892 10.529 6.40775C10.529 6.20642 10.6065 6.02817 10.7615 5.873C10.9167 5.72817 11.0965 5.65734 11.301 5.6605C11.5055 5.66384 11.677 5.73467 11.8155 5.873L16.3095 10.3673C16.4032 10.4609 16.4692 10.5597 16.5078 10.6635C16.5463 10.7673 16.5655 10.8795 16.5655 11C16.5655 11.1205 16.5463 11.2327 16.5078 11.3365C16.4692 11.4403 16.4032 11.5391 16.3095 11.6328L11.8155 16.127C11.6603 16.282 11.4847 16.357 11.2885 16.352C11.0923 16.3468 10.9167 16.2718 10.7615 16.127C10.6065 15.9718 10.528 15.7946 10.526 15.5953C10.524 15.3959 10.5974 15.2218 10.7463 15.073L14.0693 11.75Z" fill="#2F80ED"/>
+</svg>

assets/icons/vk_logo.svg

@@ -0,0 +1,16 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1709_298)">
+<mask id="mask0_1709_298" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="28">
+<path d="M27.8614 0H0.138672V28H27.8614V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_1709_298)">
+<path d="M0.138672 13.44C0.138672 7.10433 0.138672 3.93649 2.08743 1.96824C4.03619 0 7.17266 0 13.4456 0H14.5545C20.8275 0 23.9639 0 25.9127 1.96824C27.8614 3.93649 27.8614 7.10433 27.8614 13.44V14.56C27.8614 20.8957 27.8614 24.0635 25.9127 26.0318C23.9639 28 20.8275 28 14.5545 28H13.4456C7.17266 28 4.03619 28 2.08743 26.0318C0.138672 24.0635 0.138672 20.8957 0.138672 14.56V13.44Z" fill="#0077FF"/>
+<path d="M14.89 20.1718C8.57149 20.1718 4.96756 15.7968 4.81738 8.51675H7.98241C8.08637 13.8601 10.4197 16.1234 12.2678 16.5901V8.51675H15.2481V13.125C17.0732 12.9267 18.9905 10.8268 19.6373 8.51675H22.6176C22.1209 11.3634 20.0417 13.4634 18.5632 14.3267C20.0417 15.0267 22.4098 16.8584 23.3108 20.1718H20.0302C19.3255 17.9551 17.5699 16.2401 15.2481 16.0067V20.1718H14.89Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1709_298">
+<rect width="28" height="28" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/icons/yandex_logo.svg

@@ -0,0 +1,16 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1709_319)">
+<mask id="mask0_1709_319" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="28">
+<path d="M27.8614 0H0.138672V28H27.8614V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_1709_319)">
+<path d="M0.138672 13.44C0.138672 7.10433 0.138672 3.93649 2.08743 1.96824C4.03619 0 7.17266 0 13.4456 0H14.5545C20.8275 0 23.9639 0 25.9127 1.96824C27.8614 3.93649 27.8614 7.10433 27.8614 13.44V14.56C27.8614 20.8957 27.8614 24.0635 25.9127 26.0318C23.9639 28 20.8275 28 14.5545 28H13.4456C7.17266 28 4.03619 28 2.08743 26.0318C0.138672 24.0635 0.138672 20.8957 0.138672 14.56V13.44Z" fill="#FC3F1D"/>
+</g>
+<path d="M17.3371 24H21V4H15.6687C10.3069 4 7.49454 6.614 7.49454 10.4755C7.49454 13.809 9.31785 15.6885 12.5476 17.73L14.51 18.9635L11.9911 16.9515L7 24H10.971L16.3029 16.423L14.4486 15.248C12.2079 13.809 11.1107 12.693 11.1107 10.27C11.1107 8.141 12.6873 6.702 15.6844 6.702H17.3224V24H17.3382H17.3371Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1709_319">
+<rect width="28" height="28" fill="white"/>
+</clipPath>
+</defs>
+</svg>

integration_test/auth_screen/auth_screen_login_test.dart

@@ -0,0 +1,39 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/env_config.dart';
+import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
+import 'package:eatvio_app/main.dart' as app;
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import '../common_cases/skip_welcome_screen.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() async {
+    await AppInitializer.initialize(buildType: AppBuildType.tests);
+  });
+
+  testWidgets('Signs in successfully with valid credentials', (WidgetTester tester) async {
+    await tester.pumpWidget(const app.MyApp());
+    await tester.pumpAndSettle(const Duration(seconds: 3));
+    await skipWelcomeScreen(tester);
+    final emailFieldFinder = find.byKey(AppKeys.emailTextFieldAuthScreen);
+    final passwordFieldFinder = find.byKey(AppKeys.passwordTextFieldAuthScreen);
+    final signInButtonFinder = find.byKey(AppKeys.signInButtonAuthScreen);
+
+    expect(emailFieldFinder, findsOneWidget, reason: 'Email text field should be found.');
+    expect(passwordFieldFinder, findsOneWidget, reason: 'Password text field should be found.');
+    expect(signInButtonFinder, findsOneWidget, reason: 'Sign In button should be found.');
+
+    await tester.enterText(emailFieldFinder, EnvConfig.testEmail);
+    await tester.enterText(passwordFieldFinder, EnvConfig.testPassword);
+    await tester.pumpAndSettle();
+
+    await tester.tap(signInButtonFinder);
+
+    await tester.pumpAndSettle(const Duration(seconds: 3));
+
+    expect(FeedScreen, findsOne, reason: 'Feed screen should be visible after successful login and navigation.');
+  });
+}

integration_test/auth_screen/auth_screen_logo_button_test.dart

@@ -0,0 +1,31 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import 'package:eatvio_app/main.dart' as app;
+import '../common_cases/skip_welcome_screen.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() async {
+    await AppInitializer.initialize(buildType: AppBuildType.tests);
+  });
+
+  testWidgets('tapping logo 7 times opens dev tools', (WidgetTester tester) async {
+    await tester.pumpWidget(const app.MyApp());    
+    await tester.pumpAndSettle(const Duration(seconds: 3));
+    await skipWelcomeScreen(tester);
+    final logoButtonFinder = find.byKey(AppKeys.hiddenLogoButtonAuthScreen);
+    expect(logoButtonFinder, findsOneWidget, reason: 'The logo GestureDetector should be found in auth screen');
+
+    for (int i = 0; i < 7; i++) {
+      await tester.tap(logoButtonFinder);
+      await tester.pump(const Duration(milliseconds: 50));
+    }
+    await tester.pumpAndSettle();
+
+    expect(find.byType(DevToolsScreen), findsOneWidget, reason: 'DevToolsScreen should be visible after tapping the logo 7 times.');
+  });
+}

integration_test/common_cases/skip_sign_in.dart

@@ -0,0 +1,21 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:eatvio_app/core/env_config.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+Future<void> skipSignIn(WidgetTester tester) async {
+  final emailFieldFinder = find.byKey(AppKeys.emailTextFieldAuthScreen);
+  final passwordFieldFinder = find.byKey(AppKeys.passwordTextFieldAuthScreen);
+  final signInButtonFinder = find.byKey(AppKeys.signInButtonAuthScreen);
+
+  expect(emailFieldFinder, findsOneWidget, reason: 'Email text field should be found.');
+  expect(passwordFieldFinder, findsOneWidget, reason: 'Password text field should be found.');
+  expect(signInButtonFinder, findsOneWidget, reason: 'Sign In button should be found.');
+
+  await tester.enterText(emailFieldFinder, EnvConfig.testEmail);
+  await tester.enterText(passwordFieldFinder, EnvConfig.testPassword);
+  await tester.pumpAndSettle();
+
+  await tester.tap(signInButtonFinder);
+
+  await tester.pumpAndSettle(const Duration(seconds: 3));
+}

integration_test/common_cases/skip_welcome_screen.dart

@@ -0,0 +1,8 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+Future<void> skipWelcomeScreen(WidgetTester tester) async {
+  final welcomeScreenButtonFinder = find.byKey(AppKeys.welcomeScreenButton);
+  await tester.tap(welcomeScreenButtonFinder);
+  await tester.pumpAndSettle();
+}

integration_test/create_recipe/README.md

@@ -0,0 +1,147 @@
+# Интеграционные тесты создания рецепта
+
+Этот набор интеграционных тестов покрывает полный пользовательский путь создания нового рецепта в приложении Eatvio.
+
+## Структура файлов
+
+- `create_recipe_test.dart` - Основные интеграционные тесты
+- `create_recipe_helpers.dart` - Helper функции для тестирования
+- `README.md` - Документация
+
+## Тестовые сценарии
+
+### 1. Полное создание рецепта
+**Файл:** `create_recipe_test.dart` - `should create and publish a new recipe successfully`
+
+**Описание:** Тестирует полный пользовательский путь создания рецепта с заполнением всех полей.
+
+**Шаги:**
+1. Запуск приложения и вход в систему
+2. Навигация к экрану создания рецепта
+3. Заполнение основной информации (название, тип, порции, калории, время)
+4. Добавление тегов
+5. Добавление ингредиентов
+6. Добавление шагов приготовления
+7. Симуляция добавления изображения
+8. Публикация рецепта
+9. Проверка успешного перехода
+
+### 2. Валидация полей
+**Файл:** `create_recipe_test.dart` - `should validate required fields before publishing`
+
+**Описание:** Проверяет, что валидация обязательных полей работает корректно.
+
+**Шаги:**
+1. Запуск приложения и вход в систему
+2. Навигация к экрану создания рецепта
+3. Попытка публикации без заполнения полей
+4. Проверка, что остались на экране создания (валидация не прошла)
+
+### 3. Минимальное создание рецепта
+**Файл:** `create_recipe_test.dart` - `should create recipe with minimal required fields`
+
+**Описание:** Тестирует создание рецепта с минимально необходимыми полями.
+
+**Шаги:**
+1. Запуск приложения и вход в систему
+2. Навигация к экрану создания рецепта
+3. Заполнение только обязательных полей
+4. Добавление минимума ингредиентов
+5. Симуляция добавления изображения
+6. Публикация рецепта
+7. Проверка успешного перехода
+
+## Helper функции
+
+### Навигация
+- `navigateToCreateRecipeScreen()` - Переход к экрану создания рецепта
+
+### Заполнение формы
+- `fillRecipeBasicInfo()` - Заполнение основной информации о рецепте
+- `selectRecipeType()` - Выбор типа рецепта
+- `addTags()` - Добавление тегов
+- `addIngredients()` - Добавление ингредиентов
+- `addCookingSteps()` - Добавление шагов приготовления
+
+### Публикация и проверки
+- `publishRecipe()` - Публикация рецепта
+- `verifyRecipePublished()` - Проверка успешной публикации
+- `verifyValidationErrors()` - Проверка ошибок валидации
+
+### Симуляция изображений
+- `mockImageSelection()` - Симуляция выбора изображения для рецепта
+- `mockStepImageSelection()` - Симуляция выбора изображения для шага
+
+### Тестовые данные
+- `createTestRecipeData()` - Создание набора тестовых данных
+
+## Ключи для тестирования
+
+В файле `lib/app_keys.dart` добавлены следующие ключи для стабильного тестирования:
+
+### Основные поля
+- `recipeCreateScreenTitleField` - Поле названия
+- `recipeCreateScreenDescriptionField` - Поле описания
+- `recipeCreateScreenTypeDropdown` - Выпадающий список типа рецепта
+- `recipeCreateScreenPortionsField` - Поле количества порций
+- `recipeCreateScreenCaloriesField` - Поле калорийности
+
+### Время приготовления
+- `recipeCreateScreenTotalHoursField` - Часы общего времени
+- `recipeCreateScreenTotalMinutesField` - Минуты общего времени
+- `recipeCreateScreenActiveHoursField` - Часы активного времени
+- `recipeCreateScreenActiveMinutesField` - Минуты активного времени
+
+### Теги и ингредиенты
+- `recipeCreateScreenTagField` - Поле для ввода тега
+- `recipeCreateScreenAddTagButton` - Кнопка добавления тега
+- `recipeCreateScreenAddIngredientButton` - Кнопка добавления ингредиента
+
+### Шаги приготовления
+- `recipeCreateScreenAddStepButton` - Кнопка добавления шага
+- `recipeCreateScreenStepDescriptionField` - Поле описания шага
+- `recipeCreateScreenStepImageWidget` - Виджет изображения шага
+
+### Изображения и публикация
+- `recipeCreateScreenImageWidget` - Виджет основного изображения
+- `recipeCreateScreenPublishButton` - Кнопка публикации
+
+## Запуск тестов
+
+```bash
+# Запуск всех интеграционных тестов
+flutter test integration_test/
+
+# Запуск только тестов создания рецепта
+flutter test integration_test/create_recipe/
+
+# Запуск конкретного теста
+flutter test integration_test/create_recipe/create_recipe_test.dart
+```
+
+## Требования
+
+- Flutter SDK
+- Настроенная тестовая среда (AppBuildType.tests)
+- Тестовые учетные данные в .env файле
+- Доступ к API бэкенда для тестирования
+
+## Примечания
+
+1. **Изображения**: В текущей реализации используется симуляция выбора изображений. Для полноценного тестирования рекомендуется добавить моки для `image_picker`.
+
+2. **API взаимодействие**: Тесты взаимодействуют с реальным API бэкенда. Убедитесь, что тестовая среда настроена корректно.
+
+3. **Время выполнения**: Тесты могут занимать значительное время из-за анимаций и API запросов. Используйте `pumpAndSettle()` с достаточными таймаутами.
+
+4. **Стабильность**: Ключи для тестирования добавлены в UI компоненты для обеспечения стабильности тестов при изменениях в интерфейсе.
+
+## Расширение тестов
+
+Для добавления новых тестовых сценариев:
+
+1. Создайте новый `testWidgets` в `create_recipe_test.dart`
+2. Используйте существующие helper функции или создайте новые в `create_recipe_helpers.dart`
+3. При необходимости добавьте новые ключи в `app_keys.dart`
+4. Обновите документацию в этом файле
+

integration_test/create_recipe/create_recipe_helpers.dart

@@ -0,0 +1,237 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.dart';
+import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+/// Helper функции для интеграционных тестов создания рецепта
+
+/// Навигация к экрану создания рецепта
+Future<void> navigateToCreateRecipeScreen(WidgetTester tester) async {
+  // Переключаемся на вкладку "Рецепты" если она есть
+  final recipesTab = find.text('Рецепты');
+  if (recipesTab.evaluate().isNotEmpty) {
+    await tester.tap(recipesTab);
+    await tester.pumpAndSettle();
+  }
+
+  // Находим кнопку добавления рецепта (круглая кнопка с плюсом)
+  final addRecipeButton = find.byType(InkWell).first;
+  await tester.tap(addRecipeButton);
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+}
+
+/// Заполняет основную информацию о рецепте
+Future<void> fillRecipeBasicInfo(
+  WidgetTester tester, {
+  String title = 'Интеграционный Тестовый Рецепт',
+  TypeOfRecipe type = TypeOfRecipe.salads,
+  int portions = 4,
+  double calories = 250.0,
+  int totalHours = 1,
+  int totalMinutes = 30,
+  int activeHours = 0,
+  int activeMinutes = 45,
+  String description = 'Этот рецепт создан для интеграционного тестирования. Он содержит все необходимые ингредиенты и пошаговую инструкцию приготовления.',
+}) async {
+  // Заполняем название рецепта
+  final titleField = find.byKey(AppKeys.recipeCreateScreenTitleField);
+  await tester.enterText(titleField, title);
+  await tester.pumpAndSettle();
+
+  // Выбираем тип рецепта
+  await selectRecipeType(tester, type);
+
+  // Заполняем количество порций
+  final portionsField = find.byKey(AppKeys.recipeCreateScreenPortionsField);
+  await tester.enterText(portionsField, portions.toString());
+  await tester.pumpAndSettle();
+
+  // Заполняем калорийность
+  final caloriesField = find.byKey(AppKeys.recipeCreateScreenCaloriesField);
+  await tester.enterText(caloriesField, calories.toString());
+  await tester.pumpAndSettle();
+
+  // Заполняем общее время приготовления
+  final totalHoursField = find.byKey(AppKeys.recipeCreateScreenTotalHoursField);
+  await tester.enterText(totalHoursField, totalHours.toString());
+  await tester.pumpAndSettle();
+
+  final totalMinutesField = find.byKey(AppKeys.recipeCreateScreenTotalMinutesField);
+  await tester.enterText(totalMinutesField, totalMinutes.toString());
+  await tester.pumpAndSettle();
+
+  // Заполняем активное время приготовления
+  final activeHoursField = find.byKey(AppKeys.recipeCreateScreenActiveHoursField);
+  await tester.enterText(activeHoursField, activeHours.toString());
+  await tester.pumpAndSettle();
+
+  final activeMinutesField = find.byKey(AppKeys.recipeCreateScreenActiveMinutesField);
+  await tester.enterText(activeMinutesField, activeMinutes.toString());
+  await tester.pumpAndSettle();
+
+  // Заполняем описание
+  final descriptionField = find.byKey(AppKeys.recipeCreateScreenDescriptionField);
+  await tester.enterText(descriptionField, description);
+  await tester.pumpAndSettle();
+}
+
+/// Выбирает тип рецепта из выпадающего списка
+Future<void> selectRecipeType(WidgetTester tester, TypeOfRecipe type) async {
+  final typeDropdown = find.byKey(AppKeys.recipeCreateScreenTypeDropdown);
+  await tester.tap(typeDropdown);
+  await tester.pumpAndSettle();
+
+  // Выбираем нужный тип из выпадающего списка
+  final typeOption = find.text(type.toString());
+  await tester.tap(typeOption);
+  await tester.pumpAndSettle();
+}
+
+/// Добавляет теги к рецепту
+Future<void> addTags(WidgetTester tester, List<String> tags) async {
+  final tagField = find.byKey(AppKeys.recipeCreateScreenTagField);
+  final addTagButton = find.byKey(AppKeys.recipeCreateScreenAddTagButton);
+
+  for (final tag in tags) {
+    await tester.enterText(tagField, tag);
+    await tester.pumpAndSettle();
+    await tester.tap(addTagButton);
+    await tester.pumpAndSettle();
+  }
+}
+
+/// Добавляет ингредиенты к рецепту
+Future<void> addIngredients(WidgetTester tester, List<Map<String, String>> ingredients) async {
+  final addIngredientButton = find.byKey(AppKeys.recipeCreateScreenAddIngredientButton);
+
+  for (final ingredient in ingredients) {
+    await tester.ensureVisible(addIngredientButton);
+    await tester.tap(addIngredientButton);
+    await tester.pumpAndSettle();
+
+    await addIngredientInModal(tester, ingredient['name']!, ingredient['quantity']!);
+    await tester.pumpAndSettle();
+  }
+}
+
+/// Добавляет ингредиент в модальном окне
+Future<void> addIngredientInModal(WidgetTester tester, String name, String quantity) async {
+  // Ищем поля в модальном окне
+  final nameFields = find.byType(TextFormField);
+  if (nameFields.evaluate().isNotEmpty) {
+    await tester.enterText(nameFields.first, name);
+    await tester.pumpAndSettle();
+  }
+
+  // Ищем поле количества (второе поле)
+  if (nameFields.evaluate().length > 1) {
+    await tester.enterText(nameFields.at(1), quantity);
+    await tester.pumpAndSettle();
+  }
+
+  // Ищем кнопку добавления в модальном окне
+  final addButton = find.text('Добавить');
+  if (addButton.evaluate().isNotEmpty) {
+    await tester.tap(addButton);
+    await tester.pumpAndSettle();
+  }
+}
+
+/// Добавляет шаги приготовления
+Future<void> addCookingSteps(WidgetTester tester, List<Map<String, String>> steps) async {
+  final addStepButton = find.byKey(AppKeys.recipeCreateScreenAddStepButton);
+
+  for (int i = 0; i < steps.length; i++) {
+    final step = steps[i];
+
+    // Заполняем описание шага
+    final stepDescription = find.byKey(Key('${AppKeys.recipeCreateScreenStepDescriptionField}_$i'));
+    await tester.enterText(stepDescription, step['description']!);
+    await tester.pumpAndSettle();
+
+    // Симулируем добавление изображения к шагу если указано
+    if (step.containsKey('hasImage') && step['hasImage'] == 'true') {
+      await mockStepImageSelection(tester, i);
+    }
+
+    // Добавляем следующий шаг (кроме последнего)
+    if (i < steps.length - 1) {
+      await tester.ensureVisible(addStepButton);
+      await tester.tap(addStepButton);
+      await tester.pumpAndSettle();
+    }
+  }
+}
+
+/// Публикует рецепт
+Future<void> publishRecipe(WidgetTester tester) async {
+  final publishButton = find.byKey(AppKeys.recipeCreateScreenPublishButton);
+  await tester.ensureVisible(publishButton);
+  await tester.tap(publishButton);
+  await tester.pumpAndSettle(const Duration(seconds: 5)); // Дать время на API-запрос
+}
+
+/// Симулирует выбор изображения для основного рецепта
+Future<void> mockImageSelection(WidgetTester tester) async {
+  final imageWidget = find.byKey(AppKeys.recipeCreateScreenImageWidget);
+  if (imageWidget.evaluate().isNotEmpty) {
+    await tester.tap(imageWidget);
+    await tester.pumpAndSettle();
+
+    // В реальном интеграционном тесте здесь будет мок image_picker
+    // который возвращает тестовое изображение
+  }
+}
+
+/// Симулирует выбор изображения для шага приготовления
+Future<void> mockStepImageSelection(WidgetTester tester, int stepIndex) async {
+  final stepImageWidget = find.byKey(Key('${AppKeys.recipeCreateScreenStepImageWidget}_$stepIndex'));
+  if (stepImageWidget.evaluate().isNotEmpty) {
+    await tester.tap(stepImageWidget);
+    await tester.pumpAndSettle();
+
+    // В реальном интеграционном тесте здесь будет мок image_picker
+    // который возвращает тестовое изображение
+  }
+}
+
+/// Проверяет, что рецепт был успешно опубликован
+void verifyRecipePublished(WidgetTester tester) {
+  // После успешной публикации должен произойти переход обратно на экран ленты
+  expect(find.byKey(AppKeys.recipeCreateScreenPublishButton), findsNothing);
+  // Можно добавить дополнительные проверки в зависимости от того, куда происходит переход
+}
+
+/// Проверяет, что валидация полей работает корректно
+void verifyValidationErrors(WidgetTester tester) {
+  // Проверяем, что остались на экране создания рецепта (валидация не прошла)
+  expect(find.byType(RecipeCreateScreen), findsOneWidget);
+  expect(find.byKey(AppKeys.recipeCreateScreenPublishButton), findsOneWidget);
+}
+
+/// Создает тестовые данные для рецепта
+Map<String, dynamic> createTestRecipeData() {
+  return {
+    'title': 'Интеграционный Тестовый Рецепт',
+    'type': TypeOfRecipe.salads,
+    'portions': 4,
+    'calories': 250.0,
+    'totalHours': 1,
+    'totalMinutes': 30,
+    'activeHours': 0,
+    'activeMinutes': 45,
+    'description': 'Этот рецепт создан для интеграционного тестирования. Он содержит все необходимые ингредиенты и пошаговую инструкцию приготовления.',
+    'tags': ['здоровое питание', 'быстро', 'легко'],
+    'ingredients': [
+      {'name': 'Помидоры', 'quantity': '200'},
+      {'name': 'Огурцы', 'quantity': '150'},
+      {'name': 'Лук', 'quantity': '50'},
+    ],
+    'steps': [
+      {'description': 'Помойте и нарежьте помидоры и огурцы кубиками среднего размера.', 'hasImage': 'true'},
+      {'description': 'Нарежьте лук полукольцами и добавьте к овощам.', 'hasImage': 'false'},
+      {'description': 'Смешайте все ингредиенты в большой миске, добавьте соль и перец по вкусу.', 'hasImage': 'true'},
+    ],
+  };
+}

integration_test/create_recipe/create_recipe_test.dart

@@ -0,0 +1,128 @@
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.dart';
+import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
+import 'package:eatvio_app/main.dart' as app;
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+import '../common_cases/skip_welcome_screen.dart';
+import '../common_cases/skip_sign_in.dart';
+import 'create_recipe_helpers.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() async {
+    await AppInitializer.initialize(buildType: AppBuildType.tests);
+  });
+
+  group('Create Recipe Integration Tests', () {
+    testWidgets('should create and publish a new recipe successfully', (tester) async {
+      // 1. Запустить приложение
+      await tester.pumpWidget(const app.MyApp());
+      await tester.pumpAndSettle(const Duration(seconds: 20));
+
+      // 2. Пропустить онбординг и войти в систему
+      await skipWelcomeScreen(tester);
+      await skipSignIn(tester);
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+
+      // 3. Перейти на экран создания рецепта
+      await navigateToCreateRecipeScreen(tester);
+
+      // Проверяем, что мы на экране создания рецепта
+      expect(find.byType(RecipeCreateScreen), findsOneWidget);
+
+      // 4. Заполнить все поля формы
+      final testData = createTestRecipeData();
+      await fillRecipeBasicInfo(
+        tester,
+        title: testData['title'] as String,
+        type: testData['type'] as TypeOfRecipe,
+        portions: testData['portions'] as int,
+        calories: testData['calories'] as double,
+        totalHours: testData['totalHours'] as int,
+        totalMinutes: testData['totalMinutes'] as int,
+        activeHours: testData['activeHours'] as int,
+        activeMinutes: testData['activeMinutes'] as int,
+        description: testData['description'] as String,
+      );
+
+      // 5. Добавить теги
+      await addTags(tester, testData['tags'] as List<String>);
+
+      // 6. Добавить ингредиенты
+      await addIngredients(tester, testData['ingredients'] as List<Map<String, String>>);
+
+      // 7. Добавить шаги приготовления
+      await addCookingSteps(tester, testData['steps'] as List<Map<String, String>>);
+
+      // 8. Симулировать добавление изображения
+      await mockImageSelection(tester);
+
+      // 9. Нажать "Опубликовать"
+      await publishRecipe(tester);
+
+      // 10. Проверить результат
+      verifyRecipePublished(tester);
+    });
+
+    testWidgets('should validate required fields before publishing', (tester) async {
+      // 1. Запустить приложение и войти в систему
+      await tester.pumpWidget(const app.MyApp());
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+      await skipWelcomeScreen(tester);
+      await skipSignIn(tester);
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+
+      // 2. Перейти на экран создания рецепта
+      await navigateToCreateRecipeScreen(tester);
+
+      // 3. Попытаться опубликовать без заполнения полей
+      await publishRecipe(tester);
+
+      // 4. Проверить, что валидация сработала
+      verifyValidationErrors(tester);
+    });
+
+    testWidgets('should create recipe with minimal required fields', (tester) async {
+      // 1. Запустить приложение и войти в систему
+      await tester.pumpWidget(const app.MyApp());
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+      await skipWelcomeScreen(tester);
+      await skipSignIn(tester);
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+
+      // 2. Перейти на экран создания рецепта
+      await navigateToCreateRecipeScreen(tester);
+
+      // 3. Заполнить только обязательные поля
+      await fillRecipeBasicInfo(
+        tester,
+        title: 'Минимальный тестовый рецепт',
+        type: TypeOfRecipe.firstMeals,
+        portions: 2,
+        calories: 300.0,
+        totalHours: 0,
+        totalMinutes: 30,
+        activeHours: 0,
+        activeMinutes: 15,
+        description: 'Простой рецепт для тестирования.',
+      );
+
+      // 4. Добавить минимум ингредиентов
+      await addIngredients(tester, [
+        {'name': 'Тестовый ингредиент', 'quantity': '100'},
+      ]);
+
+      // 5. Симулировать добавление изображения
+      await mockImageSelection(tester);
+
+      // 6. Опубликовать рецепт
+      await publishRecipe(tester);
+
+      // 7. Проверить результат
+      verifyRecipePublished(tester);
+    });
+  });
+}

integration_test/feed_screen/blog_post_creation_screen_test.dart

@@ -0,0 +1,31 @@
+import 'package:eatvio_app/app_keys.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/main.dart' as app;
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+import '../common_cases/skip_sign_in.dart';
+import '../common_cases/skip_welcome_screen.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() async {
+    await AppInitializer.initialize(buildType: AppBuildType.tests);
+  });
+
+  testWidgets('qwe', (WidgetTester tester) async {
+    await tester.pumpWidget(const app.MyApp());
+    await tester.pumpAndSettle(const Duration(seconds: 3));
+    await skipWelcomeScreen(tester);
+    await skipSignIn(tester);
+
+    final blogPostCreationFinder = find.byKey(AppKeys.feedScreenBlogPostCreationButton);
+
+    expect(blogPostCreationFinder, findsOneWidget, reason: 'Blog post creation button should be found.');
+
+    await tester.tap(blogPostCreationFinder);
+
+    await tester.pumpAndSettle();
+  });
+}

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>16.0</string>
 </dict>
 </plist>

ios/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane", "~> 2.217"

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '16.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -39,7 +39,7 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
     target.build_configurations.each do |config|
         config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
         config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',        
         ## dart: PermissionGroup.camera

ios/Runner.xcodeproj/project.pbxproj

@@ -370,7 +370,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -388,7 +388,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 39;
+				CURRENT_PROJECT_VERSION = 81;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -406,10 +406,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -466,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -518,7 +519,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -538,7 +539,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 39;
+				CURRENT_PROJECT_VERSION = 81;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -556,10 +557,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -576,7 +578,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 39;
+				CURRENT_PROJECT_VERSION = 81;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -594,10 +596,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"

ios/Runner/AppDelegate.swift

@@ -1,5 +1,6 @@
-import UIKit
 import Flutter
+import UIKit
+import YandexLoginSDK
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -10,4 +11,20 @@ import Flutter
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  @available(iOS 8.0, *)
+  func application(
+    _ application: UIApplication, continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([Any]?) -> Void
+  ) -> Bool {
+    YXLSdk.shared.processUserActivity(userActivity)
+    return true
+  }
+
+  override public func application(
+    _ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+  ) -> Bool {
+    return YXLSdk.shared.handleOpen(
+      url, sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String)
+  }
 }

ios/Runner/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>eatvio_app</string>
+	<string>Итвио</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>39</string>
+	<string>82</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -67,5 +67,24 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>yandexauth</string>
+		<string>yandexauth2</string>
+		<string>yandexauth4</string>
+	</array>
+	<key>YAClientId</key>
+	<string>5399b03636104c6d920b87c1ad329254</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>YandexLoginSDK</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>yx5399b03636104c6d920b87c1ad329254</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -8,6 +8,7 @@
 	<array>
 		<string>applinks:eatvio.ru</string>
 		<string>applinks:www.eatvio.ru</string>
+		<string>applinks:5399b03636104c6d920b87c1ad329254.oauth.yandex.ru</string>
 	</array>
 </dict>
 </plist>

ios/fastlane/Fastfile

@@ -18,9 +18,69 @@ default_platform(:ios)
 platform :ios do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    match(type: "appstore")
+    UI.message "Current working directory: #{Dir.pwd}"
+    UI.message "Checking API key file..."
+    
+    possible_paths = [
+      "../AuthKey.p8",
+      "./AuthKey.p8", 
+      "../../AuthKey.p8",
+      File.expand_path("../AuthKey.p8"),
+      File.expand_path("./AuthKey.p8")
+    ]
+    
+    auth_key_path = nil
+    possible_paths.each do |path|
+      if File.exist?(path)
+        UI.message "Found AuthKey.p8 at: #{path}"
+        auth_key_path = File.expand_path(path)
+        break
+      end
+    end
+    
+    if auth_key_path.nil?
+      UI.user_error!("API key file not found. Tried paths: #{possible_paths.join(', ')}")
+    end
+    
+    UI.message "Using auth_key_path: #{auth_key_path}"
+    
+    # Configure Flutter for release mode
+    UI.message "Configuring Flutter for release mode..."
+    sh("cd .. && flutter build ios --config-only --release")
+    
+    match(type: "appstore", readonly: true)
     increment_build_number(xcodeproj: "Runner.xcodeproj")
-    build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store", codesigning_identity: "Apple Distribution")
+    
-    upload_to_testflight
+    build_app(
+      workspace: "Runner.xcworkspace", 
+      scheme: "Runner", 
+      export_method: "app-store", 
+      codesigning_identity: "Apple Distribution",
+    )
+    
+
+    
+    app_store_connect_api_key(
+      key_id: "325JS9JCZH", 
+      issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
+      key_filepath: auth_key_path,
+      duration: 1200,
+      in_house: false
+    )
+    
+    begin
+      upload_to_testflight(
+        skip_waiting_for_build_processing: true,
+        skip_submission: true,
+        distribute_external: false,
+        notify_external_testers: false,
+        changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
+        verbose: true
+      )
+    rescue => ex
+      UI.error "Upload to TestFlight failed: #{ex.message}"
+      UI.error "Full error: #{ex.backtrace.join("\n")}"
+      raise ex
+    end
   end
 end

ios/fastlane/report.xml

@@ -5,22 +5,24 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000206">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000227">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.195115">
+      <testcase classname="fastlane.lanes" name="1: match" time="8.292217">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="116.686863">
+      <testcase classname="fastlane.lanes" name="2: increment_build_number" time="0.201631">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_testflight" time="338.642203">
+      <testcase classname="fastlane.lanes" name="3: build_app" time="9.870647">
+        
+          <failure message="/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/actions/actions_helper.rb:67:in &apos;Fastlane::Actions.execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:255:in &apos;block in Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:229:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:229:in &apos;Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:157:in &apos;Fastlane::Runner#trigger_action_by_name&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/fast_file.rb:159:in &apos;Fastlane::FastFile#method_missing&apos;&#10;Fastfile:23:in &apos;block (2 levels) in Fastlane::FastFile#parsing_binding&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/lane.rb:41:in &apos;Fastlane::Lane#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:49:in &apos;block in Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:45:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:45:in &apos;Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/lane_manager.rb:46:in &apos;Fastlane::LaneManager.cruise_lane&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/command_line_handler.rb:34:in &apos;Fastlane::CommandLineHandler.handle&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:110:in &apos;block (2 levels) in Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/command.rb:187:in &apos;Commander::Command#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/command.rb:157:in &apos;Commander::Command#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/runner.rb:444:in &apos;Commander::Runner#run_active_command&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in &apos;Commander::Runner#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/delegates.rb:18:in &apos;Commander::Delegates#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:363:in &apos;Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:43:in &apos;Fastlane::CommandsGenerator.start&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in &apos;Fastlane::CLIToolsDistributor.take_off&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/bin/fastlane:23:in &apos;&lt;top (required)&gt;&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/bin/fastlane:25:in &apos;Kernel#load&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/bin/fastlane:25:in &apos;&lt;main&gt;&apos;&#10;&#10;Error building the application - see the log above" />
         
       </testcase>
     

lib/app_keys.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+
+class AppKeys {
+  // Auth Screen
+  static const hiddenLogoButtonAuthScreen = ValueKey('hiddenLogoButtonAuthScreen');
+  static const emailTextFieldAuthScreen = ValueKey('emailTextFieldAuthScreen');
+  static const passwordTextFieldAuthScreen = ValueKey('passwordTextFieldAuthScreen');
+  static const signInButtonAuthScreen = ValueKey('signInButtonAuthScreen');
+
+  // Welcome Screen
+  static const welcomeScreenButton = ValueKey('welcomeScreenButton');
+
+  // Feed Screen
+  static const feedScreenBlogPostCreationButton = ValueKey('feedScreenBlogPostCreationButton');
+
+  // BlogPostCreateScreen
+  static const blogPostCreateScreenTitleTextField = ValueKey('blogPostCreateScreenTitleTextField');
+  static const blogPostCreateScreenContentTextField = ValueKey('blogPostCreateScreenContentTextField');
+  static const blogPostCreateScreenVideoLinkTextField = ValueKey('blogPostCreateScreenVideoLinkTextField');
+  static const blogPostCreateScreenCreateButton = ValueKey('blogPostCreateScreenCreateButton');
+  static const imageWidget = ValueKey('imageWidget');
+
+  // Recipe Create Screen
+  static const recipeCreateScreenTitleField = ValueKey('recipeCreateScreenTitleField');
+  static const recipeCreateScreenDescriptionField = ValueKey('recipeCreateScreenDescriptionField');
+  static const recipeCreateScreenTypeDropdown = ValueKey('recipeCreateScreenTypeDropdown');
+  static const recipeCreateScreenPortionsField = ValueKey('recipeCreateScreenPortionsField');
+  static const recipeCreateScreenCaloriesField = ValueKey('recipeCreateScreenCaloriesField');
+  static const recipeCreateScreenTotalHoursField = ValueKey('recipeCreateScreenTotalHoursField');
+  static const recipeCreateScreenTotalMinutesField = ValueKey('recipeCreateScreenTotalMinutesField');
+  static const recipeCreateScreenActiveHoursField = ValueKey('recipeCreateScreenActiveHoursField');
+  static const recipeCreateScreenActiveMinutesField = ValueKey('recipeCreateScreenActiveMinutesField');
+  static const recipeCreateScreenTagField = ValueKey('recipeCreateScreenTagField');
+  static const recipeCreateScreenAddTagButton = ValueKey('recipeCreateScreenAddTagButton');
+  static const recipeCreateScreenAddIngredientButton = ValueKey('recipeCreateScreenAddIngredientButton');
+  static const recipeCreateScreenAddStepButton = ValueKey('recipeCreateScreenAddStepButton');
+  static const recipeCreateScreenPublishButton = ValueKey('recipeCreateScreenPublishButton');
+  static const recipeCreateScreenImageWidget = ValueKey('recipeCreateScreenImageWidget');
+  static const recipeCreateScreenStepDescriptionField = ValueKey('recipeCreateScreenStepDescriptionField');
+  static const recipeCreateScreenStepImageWidget = ValueKey('recipeCreateScreenStepImageWidget');
+  static const recipeCreateScreenIngredientNameField = ValueKey('recipeCreateScreenIngredientNameField');
+  static const recipeCreateScreenIngredientQuantityField = ValueKey('recipeCreateScreenIngredientQuantityField');
+  static const recipeCreateScreenIngredientAddButton = ValueKey('recipeCreateScreenIngredientAddButton');
+}

lib/common/widgets/markdown_editor.dart

@@ -0,0 +1,502 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+
+class MarkdownEditor extends StatefulWidget {
+  const MarkdownEditor({
+    super.key,
+    this.initialText,
+    this.hintText,
+    this.hasError = false,
+    this.minLines = 4,
+    this.maxLines = 6,
+    this.heightPreview = 120,
+    this.onChanged,
+    this.onToolbarVisibilityChanged,
+    this.showInlineToolbar = true,
+  });
+
+  final String? initialText;
+  final String? hintText;
+  final bool hasError;
+  final int minLines;
+  final int maxLines;
+  final double heightPreview;
+  final void Function(String value)? onChanged;
+  final void Function(bool visible)? onToolbarVisibilityChanged;
+  final bool showInlineToolbar;
+
+  @override
+  State<MarkdownEditor> createState() => MarkdownEditorState();
+}
+
+class MarkdownEditorState extends State<MarkdownEditor> {
+  late final TextEditingController _controller;
+  final FocusNode _focusNode = FocusNode();
+  bool _isPreview = false;
+  bool _enablePanel = false;
+  late final KeyboardVisibilityController _keyboardVisibilityController;
+  late final StreamSubscription<bool> _keyboardSubscription;
+
+  bool get isToolbarVisible => _enablePanel || _isPreview;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(text: widget.initialText ?? '');
+    _keyboardVisibilityController = KeyboardVisibilityController();
+    _keyboardSubscription = _keyboardVisibilityController.onChange.listen((visible) {
+      setState(() {
+        _enablePanel = visible;
+      });
+      widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+    });
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+    });
+  }
+
+  @override
+  void dispose() {
+    _keyboardSubscription.cancel();
+    _focusNode.dispose();
+    _controller.dispose();
+    super.dispose();
+  }
+
+  bool _hasFormatting(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      return selectedText.startsWith(prefix) && selectedText.endsWith(suffix);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(cursorPosition - prefix.length, cursorPosition);
+        final afterCursor = text.substring(cursorPosition, cursorPosition + suffix.length);
+        return beforeCursor == prefix && afterCursor == suffix;
+      }
+    }
+    return false;
+  }
+
+  void _removeFormatting(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final unformattedText = selectedText.substring(prefix.length, selectedText.length - suffix.length);
+      final newText = text.replaceRange(selection.start, selection.end, unformattedText);
+      _controller.text = newText;
+      _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + unformattedText.length);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(0, cursorPosition - prefix.length);
+        final afterCursor = text.substring(cursorPosition + suffix.length);
+        final newText = beforeCursor + afterCursor;
+        _controller.text = newText;
+        _controller.selection = TextSelection.collapsed(offset: cursorPosition - prefix.length);
+      }
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyMarkdownFormat(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final formattedText = '$prefix$selectedText$suffix';
+      final newText = text.replaceRange(selection.start, selection.end, formattedText);
+      _controller.text = newText;
+      _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + formattedText.length);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      final newText = '${text.substring(0, cursorPosition)}$prefix$suffix${text.substring(cursorPosition)}';
+      _controller.text = newText;
+      _controller.selection = TextSelection.collapsed(offset: cursorPosition + prefix.length);
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyHeading() {
+    if (_hasFormatting('# ', '')) {
+      _removeFormatting('# ', '');
+    } else {
+      _applyMarkdownFormat('# ', '');
+    }
+  }
+
+  void _applyBold() {
+    if (_hasFormatting('**', '**')) {
+      _removeFormatting('**', '**');
+    } else {
+      _applyMarkdownFormat('**', '**');
+    }
+  }
+
+  void _applyItalic() {
+    if (_hasFormatting('*', '*')) {
+      _removeFormatting('*', '*');
+    } else {
+      _applyMarkdownFormat('*', '*');
+    }
+  }
+
+  void _applyNumberedList() {
+    if (_hasFormatting('1. ', '')) {
+      _removeFormatting('1. ', '');
+    } else {
+      _applyMarkdownFormat('1. ', '');
+    }
+  }
+
+  void _applyBulletedList() {
+    if (_hasFormatting('- ', '')) {
+      _removeFormatting('- ', '');
+    } else {
+      _applyMarkdownFormat('- ', '');
+    }
+  }
+
+  void _applyLink() {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final linkRegex = RegExp(r'^\[(.*?)\]\((.*?)\)$');
+      if (linkRegex.hasMatch(selectedText)) {
+        final match = linkRegex.firstMatch(selectedText);
+        final linkText = match?.group(1) ?? selectedText;
+        final newText = text.replaceRange(selection.start, selection.end, linkText);
+        _controller.text = newText;
+        _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + linkText.length);
+      } else {
+        final formattedText = '[$selectedText](url)';
+        final newText = text.replaceRange(selection.start, selection.end, formattedText);
+        _controller.text = newText;
+        _controller.selection = TextSelection(baseOffset: selection.start + selectedText.length + 2, extentOffset: selection.start + selectedText.length + 5);
+      }
+    } else {
+      _applyMarkdownFormat('[', '](url)');
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyHorizontalRule() {
+    final cursorPosition = _controller.selection.baseOffset;
+    final text = _controller.text;
+    final newText = '${text.substring(0, cursorPosition)}\n---\n${text.substring(cursorPosition)}';
+    _controller.text = newText;
+    _controller.selection = TextSelection.collapsed(offset: cursorPosition + 5);
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _togglePreview() {
+    setState(() {
+      _isPreview = !_isPreview;
+    });
+    if (!_isPreview) {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        _focusNode.requestFocus();
+      });
+    } else {
+      _focusNode.unfocus();
+    }
+    widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+  }
+
+  Widget _mdButton(IconData icon, VoidCallback onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Icon(icon),
+        ),
+      ),
+    );
+  }
+
+  Widget _mdTextButton(String text, VoidCallback onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Center(
+            child: Text(
+              text,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w900, color: Colors.black87),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildMarkdownPreview(BuildContext context) {
+    return Container(
+      height: widget.heightPreview,
+      padding: const EdgeInsets.all(16),
+      width: MediaQuery.of(context).size.width - 32,
+      decoration: BoxDecoration(
+        color: const Color(0xFFF6F6F6),
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(color: const Color(0xFFE0E0E0)),
+      ),
+      child: SingleChildScrollView(child: _parseMarkdown(_controller.text)),
+    );
+  }
+
+  Widget buildToolbar(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Container(
+          width: MediaQuery.of(context).size.width - 76,
+          height: 52,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(20),
+            boxShadow: [BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+          ),
+          child: Row(
+            children: [
+              const SizedBox(width: 8),
+              _mdTextButton('H', _applyHeading),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_bold, _applyBold),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_italic, _applyItalic),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_list_numbered, _applyNumberedList),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+              const SizedBox(width: 8),
+              _mdButton(Icons.link, _applyLink),
+              const SizedBox(width: 8),
+              _mdButton(Icons.horizontal_rule, _applyHorizontalRule),
+              const SizedBox(width: 8),
+            ],
+          ),
+        ),
+        const SizedBox(width: 8),
+        Container(
+          width: 52,
+          height: 52,
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(20),
+            boxShadow: [BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+          ),
+          child: Row(children: [_mdButton(_isPreview ? Icons.edit : Icons.visibility, _togglePreview)]),
+        ),
+      ],
+    );
+  }
+
+  Widget _parseMarkdown(String text) {
+    if (text.isEmpty) {
+      return Text(widget.hintText ?? '');
+    }
+    final lines = text.split('\n');
+    final widgets = <Widget>[];
+    for (int i = 0; i < lines.length; i++) {
+      final line = lines[i];
+      if (line.trim().isEmpty) {
+        widgets.add(const SizedBox(height: 8));
+        continue;
+      }
+      if (line.startsWith('# ')) {
+        widgets.add(
+          Text(
+            line.substring(2),
+            style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('## ')) {
+        widgets.add(
+          Text(
+            line.substring(3),
+            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('### ')) {
+        widgets.add(
+          Text(
+            line.substring(4),
+            style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('- ') || line.startsWith('* ')) {
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Text('• ', style: TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(2))),
+              ],
+            ),
+          ),
+        );
+      } else if (RegExp(r'^\d+\. ').hasMatch(line)) {
+        final match = RegExp(r'^(\d+)\. ').firstMatch(line);
+        final number = match?.group(1) ?? '1';
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('$number. ', style: const TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(number.length + 2))),
+              ],
+            ),
+          ),
+        );
+      } else if (line.trim() == '---') {
+        widgets.add(const Divider(color: Colors.grey, thickness: 1));
+      } else {
+        widgets.add(_parseInlineMarkdown(line));
+      }
+      if (i < lines.length - 1) {
+        widgets.add(const SizedBox(height: 4));
+      }
+    }
+    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: widgets);
+  }
+
+  Widget _parseInlineMarkdown(String text) {
+    final spans = <TextSpan>[];
+    final regex = RegExp(r'(\*\*.*?\*\*|\*.*?\*|\[.*?\]\(.*?\))');
+    int lastEnd = 0;
+    for (final match in regex.allMatches(text)) {
+      if (match.start > lastEnd) {
+        spans.add(
+          TextSpan(
+            text: text.substring(lastEnd, match.start),
+            style: const TextStyle(fontSize: 16, color: Colors.black),
+          ),
+        );
+      }
+      final matchedText = match.group(0)!;
+      if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(2, matchedText.length - 2),
+            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('*') && matchedText.endsWith('*')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(1, matchedText.length - 1),
+            style: const TextStyle(fontSize: 16, fontStyle: FontStyle.italic, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('[') && matchedText.contains('](')) {
+        final linkMatch = RegExp(r'\[(.*?)\]\((.*?)\)').firstMatch(matchedText);
+        if (linkMatch != null) {
+          final linkText = linkMatch.group(1)!;
+          spans.add(
+            TextSpan(
+              text: linkText,
+              style: const TextStyle(fontSize: 16, color: Colors.blue, decoration: TextDecoration.underline),
+            ),
+          );
+        }
+      }
+      lastEnd = match.end;
+    }
+    if (lastEnd < text.length) {
+      spans.add(
+        TextSpan(
+          text: text.substring(lastEnd),
+          style: const TextStyle(fontSize: 16, color: Colors.black),
+        ),
+      );
+    }
+    return RichText(text: TextSpan(children: spans));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (_isPreview)
+          _buildMarkdownPreview(context)
+        else
+          CustomTextFormField(
+            controller: _controller,
+            focusNode: _focusNode,
+            maxLines: widget.maxLines,
+            minLines: widget.minLines,
+            hintText: widget.hintText,
+            hasError: widget.hasError,
+            onChanged: (value) => widget.onChanged?.call(value),
+          ),
+        const SizedBox(height: 8),
+        if (widget.showInlineToolbar && (isToolbarVisible || !_isPreview))
+          Row(
+            children: [
+              Expanded(
+                child: Container(
+                  height: 52,
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(20),
+                    boxShadow: [
+                      BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                    ],
+                  ),
+                  child: Row(
+                    children: [
+                      const SizedBox(width: 8),
+                      _mdTextButton('H', _applyHeading),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_bold, _applyBold),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_italic, _applyItalic),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_list_numbered, _applyNumberedList),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.link, _applyLink),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.horizontal_rule, _applyHorizontalRule),
+                      const SizedBox(width: 8),
+                    ],
+                  ),
+                ),
+              ),
+              const SizedBox(width: 8),
+              Container(
+                width: 52,
+                height: 52,
+                padding: const EdgeInsets.symmetric(horizontal: 8),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(20),
+                  boxShadow: [
+                    BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                  ],
+                ),
+                child: Row(children: [_mdButton(_isPreview ? Icons.edit : Icons.visibility, _togglePreview)]),
+              ),
+            ],
+          ),
+      ],
+    );
+  }
+}

lib/core/app_config.dart

@@ -0,0 +1,57 @@
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/cubit/marketing/marketing_cubit.dart';
+import 'package:eatvio_app/core/env_config.dart';
+import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_cubit.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/views/cubit/views_cubit.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
+import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
+import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+
+/// Конфигурация приложения
+class AppConfig {
+  AppConfig({required this.buildType}) {
+    _baseUrl = switch (buildType) {
+      AppBuildType.prod => EnvConfig.baseUrl,
+      AppBuildType.tests => EnvConfig.devBaseUrl,
+      AppBuildType.dev => EnvConfig.devBaseUrl,
+    };
+  }
+
+  final AppBuildType buildType;
+  late String _baseUrl;
+  String get baseUrl => _baseUrl;
+
+  void setBaseUrl(String baseUrls) {
+    _baseUrl = baseUrls;
+  }
+
+  /// Список глобальных BlocProvider'ов
+  List<BlocProvider> get globalBlocProviders => [
+    BlocProvider<NewMessagesCubit>(create: (context) => sl<NewMessagesCubit>()),
+    BlocProvider<NotificationsCubit>(create: (context) => sl<NotificationsCubit>()..getNotifications()),
+    BlocProvider<FeedCubit>(create: (context) => sl<FeedCubit>()..loadFeedBlogPostList()),
+    BlocProvider<ProfileAvatarCubit>(create: (context) => sl<ProfileAvatarCubit>()..getMyProfile()),
+    BlocProvider<ChatsCubit>(create: (context) => sl<ChatsCubit>()..getChatRoomsWithLoading()),
+    BlocProvider<ViewsCubit>(create: (context) => sl<ViewsCubit>()),
+    BlocProvider<InternetConnectionCubit>(lazy: false, create: (context) => sl<InternetConnectionCubit>()),
+    BlocProvider<MarketingCubit>(create: (context) => sl<MarketingCubit>()),
+  ];
+
+  /// Делегаты локализации
+  List<LocalizationsDelegate> get localizationDelegates => [
+    S.delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+  ];
+
+  /// Поддерживаемые локали
+  List<Locale> get supportedLocales => [const Locale.fromSubtags(languageCode: 'ru')];
+}

lib/core/app_initializer.dart

@@ -0,0 +1,74 @@
+import 'dart:io' as io;
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/env_config.dart';
+import 'package:eatvio_app/core/locator_service.dart' as di;
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/firebase_options.dart';
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:appmetrica_plugin/appmetrica_plugin.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+/// Класс для инициализации приложения
+class AppInitializer {
+  /// Инициализация всех сервисов приложения
+  static Future<void> initialize({required AppBuildType buildType}) async {
+    await _initializeEnvironment();
+    await _initializeDependencyInjection(buildType: buildType);
+    await _initializeSentry();
+    await _initializeFirebase();
+    await _initializeDebugMode();
+    await _initializeAnalytics();
+  }
+
+  /// Инициализация Sentry
+  static Future<void> _initializeSentry() async {
+    final widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized();
+    FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
+  }
+
+  /// Загрузка переменных окружения
+  static Future<void> _initializeEnvironment() async {
+    await dotenv.load(fileName: ".env");
+  }
+
+  /// Инициализация Firebase
+  static Future<void> _initializeFirebase() async {
+    await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+    if (sl<AppConfig>().buildType == AppBuildType.prod) {
+      await FirebaseMessaging.instance.requestPermission();
+    }
+  }
+
+  /// Инициализация системы внедрения зависимостей
+  static Future<void> _initializeDependencyInjection({required AppBuildType buildType}) async {
+    await di.init(buildType: buildType);
+  }
+
+  /// Настройка режима отладки
+  static Future<void> _initializeDebugMode() async {
+    if (kDebugMode) {
+      io.HttpClient.enableTimelineLogging = true;
+    }
+  }
+
+  /// Инициализация аналитики
+  static Future<void> _initializeAnalytics() async {
+    AppMetrica.activate(AppMetricaConfig(EnvConfig.appMetricaApiKey));
+    AppMetrica.reportEvent('Application started');
+  }
+
+  /// Запуск приложения с Sentry
+  static Future<void> runAppWithSentry(VoidCallback appRunner) async {
+    await SentryFlutter.init((options) {
+      options.dsn = EnvConfig.sentryDsn;
+      options.tracesSampleRate = 1.0;
+      options.debug = false;
+    }, appRunner: appRunner);
+  }
+}
+
+enum AppBuildType { prod, tests, dev }

lib/core/app_router.dart

@@ -1,520 +1,80 @@
-import 'dart:io';
+import 'package:eatvio_app/core/routing/auth_routes.dart';
-import 'package:device_info_plus/device_info_plus.dart';
+import 'package:eatvio_app/core/routing/content_routes.dart';
-import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/routing/main_navigation_routes.dart';
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/routing/other_routes.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
-import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/core/routing/settings_routes.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.dart';
+import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/features/auth/presentation/pages/auth_screen.dart';
-import 'package:eatvio_app/features/auth/presentation/pages/forget_password_screen.dart';
-import 'package:eatvio_app/features/auth/presentation/pages/scan_qr_code_screen.dart';
-import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_screen.dart';
-import 'package:eatvio_app/features/blog_post_create/presentation/pages/blog_post_create_screen.dart';
-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/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart';
-import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/empty_chat_screen.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
-import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
-import 'package:eatvio_app/features/menu/presentation/pages/blocked_users_screen.dart';
-import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
-import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
-import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
-import 'package:eatvio_app/features/create_plan/presentation/create_plan_screen.dart';
-import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
-import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
-import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
-import 'package:eatvio_app/features/diets/presentation/pages/about_diet_screen.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/recipes_model.dart';
-import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
-import 'package:eatvio_app/features/glossary/presentation/pages/glossary_screen.dart';
-import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.dart';
-import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
-import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart';
-import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart';
-import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
-import 'package:eatvio_app/features/notifications/presentation/notifications_screen.dart';
-import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
-import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
-import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
-import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_screen.dart';
-import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
-import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/verify_email_screen.dart';
-import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart';
-import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/change_password_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/general_info_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/other_info_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/physical_activity_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/physical_form_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/pressure_screen.dart';
-import 'package:eatvio_app/features/settings/presentation/pages/settings_screen.dart';
-import 'package:eatvio_app/features/support/presentation/pages/support_screen.dart';
-import 'package:eatvio_app/features/update_screen/presentation/update_screen.dart';
-import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
-import 'package:eatvio_app/features/welcome/presentation/pages/welcome_screen.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:go_router/go_router.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:version/version.dart';
-import 'dart:developer';
 
+/// Главный роутер приложения
 class AppRouter {
   static GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
   static GoRouter appRouter = GoRouter(
-    initialLocation: '/update-screen',
+    initialLocation: RouteConstants.updateScreen,
     navigatorKey: navigatorKey,
-    redirect: (context, state) {
+    redirect: _handleRedirect,
-      final segments = state.uri.pathSegments;
-      if (segments.length >= 3) {
-        final type = segments[1];
-        final contentIdentifier = segments[2];
-
-        switch (type) {
-          case 'recipe':
-            FlutterNativeSplash.remove();
-            return '/about-recipes-screen?slug=$contentIdentifier';
-          case 'blog_post':
-            FlutterNativeSplash.remove();
-            return '/blog-post-screen?id=$contentIdentifier';
-          case 'plan':
-            FlutterNativeSplash.remove();
-            return '/about-plan-screen?slug=$contentIdentifier';
-          case 'diet':
-            FlutterNativeSplash.remove();
-            return '/about-diet-screen?slug=$contentIdentifier';
-        }
-      }
-
-      return null;
-    },
     routes: [
-      GoRoute(
+      ...AuthRoutes.createRoutes(),
-        path: '/auth-screen',
+      ...MainNavigationRoutes.createRoutes(),
-        name: 'authScreen',
+      ...ContentRoutes.createRoutes(),
-        builder: (context, state) => const AuthScreen(),
+      ...SettingsRoutes.createRoutes(),
-        routes: [
+      ...OtherRoutes.createRoutes(),
-          GoRoute(
-            path: 'registration-screen',
-            name: 'registrationScreen',
-            builder: (context, state) => const RegistrationScreen(),
-          ),
-          GoRoute(
-            path: 'forget-password-screen',
-            name: 'forgetPasswordScreen',
-            builder: (context, state) => ForgetPasswordScreen(isAuth: state.extra as bool,),
-          ),
-          GoRoute(
-            path: 'scan-qr-code-screen',
-            name: 'scanQRCodeScreen',
-            builder: (context, state) => const ScanQRCodeScreen(),
-          ),
-        ],
-      ),
-      ShellRoute(
-        builder: (context, state, child) {
-          return BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
-            builder: (BuildContext context, ProfileAvatarState state) {
-              if (state is ProfileAvatarStateLoaded) {
-                return BottomNavigationBarWidget(profileModel: state.profile, child: child);
-              }
-              return const SizedBox.shrink();
-            },
-          );
-        },
-        routes: [
-          GoRoute(
-            path: '/my-profile-screen',
-            name: 'myProfileScreen',
-            pageBuilder: (context, state) {
-              return const NoTransitionPage(child: ProfileScreen());
-            },
-          ),
-          GoRoute(
-            path: '/feed-screen',
-            name: 'feedScreen',
-            pageBuilder: (context, state) => const NoTransitionPage(child: FeedScreen()),
-            redirect: (context, state) async {
-              try {
-                await sl<WsManager>().initialize();
-              } catch (e, st) {
-                log(e.toString(), stackTrace: st);
-              }
-              return null;
-            },
-          ),
-          GoRoute(
-            path: '/diary-screen',
-            name: 'diaryScreen',
-            pageBuilder: (context, state) => const NoTransitionPage(
-              child: DiaryScreen(),
-            ),
-          ),
-          GoRoute(
-              path: ConsultationsScreen.path,
-              name: ConsultationsScreen.name,
-              pageBuilder: (context, state) => const NoTransitionPage(child: ConsultationsScreen())),
-          GoRoute(path: '/chat-select-screen', name: 'chatSelectScreen', pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen())),
-          GoRoute(
-              path: '/notifications-screen',
-              name: 'notificationsScreen',
-              pageBuilder: (context, state) => const NoTransitionPage(child: NotificationsScreen())),
-          GoRoute(
-            path: '/menu-screen',
-            name: 'menuScreen',
-            pageBuilder: (context, state) => NoTransitionPage(
-              child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
-                builder: (BuildContext context, ProfileAvatarState state) {
-                  if (state is ProfileAvatarStateLoaded) {
-                    return MenuScreen(profileModel: state.profile);
-                  }
-                  return const SizedBox.shrink();
-                },
-              ),
-            ),
-          ),
-        ],
-      ),
-      GoRoute(
-        name: 'blockedUsersScreen',
-        path: '/blocked-users-screen',
-        builder: (context, state) => const BlockedUsersScreen(),
-      ),
-      GoRoute(
-        path: '/welcome-screen',
-        name: 'welcomeScreen',
-        builder: (context, state) => const WelcomeScreen(),
-        redirect: (context, state) async {
-          try {
-            if (await TokenStorage.haveTokenInStorage()) {
-              final firebaseApi = sl<FirebaseApi>();
-              final fbToken = await firebaseApi.getToken();
-              final deviceInfo = DeviceInfoPlugin();
-              await sl<Dio>().post(
-                '/api/profile/notification/token/register',
-                data: {
-                  'platform': Platform.isIOS ? 'ios' : 'android',
-                  'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
-                  'token': fbToken,
-                },
-              );
-            }
-            final sharedPreferences = await SharedPreferences.getInstance();
-            final welcomeScreenWasShowed = sharedPreferences.getBool('welcomeScreenWasShowed') ?? false;
-            if (welcomeScreenWasShowed == false) {
-              return null;
-            } else if (await TokenStorage.haveTokenInStorage()) {
-              return '/feed-screen';
-            } else {
-              return '/auth-screen';
-            }
-          } catch (e) {
-            rethrow;
-          }
-        },
-      ),
-      GoRoute(
-        path: '/update-screen',
-        name: 'updateScreen',
-        builder: (context, state) => const UpdateScreen(),
-        redirect: (context, state) async {
-          try {
-            final versions = (await sl<Dio>().get('$baseUrl/api/app_versions')).data;
-            PackageInfo packageInfo = await PackageInfo.fromPlatform();
-            String version = packageInfo.version;
-            Version currentVersion = Version.parse(version);
-            Version latestVersion = Version.parse(versions['min_version']);
-            if (latestVersion > currentVersion) {
-              return null;
-            } else {
-              return '/welcome-screen';
-            }
-          } catch (e) {
-            return '/welcome-screen';
-          }
-        },
-      ),
-      GoRoute(
-        path: ConsultationsArchiveScreen.path,
-        name: ConsultationsArchiveScreen.name,
-        builder: (context, state) => const ConsultationsArchiveScreen(),
-      ),
-      GoRoute(
-        path: ConsultantFinancesScreen.path,
-        name: ConsultantFinancesScreen.name,
-        builder: (context, state) => const ConsultantFinancesScreen(),
-      ),
-      GoRoute(
-        path: UserPurchasesScreen.path,
-        name: UserPurchasesScreen.name,
-        builder: (context, state) => const UserPurchasesScreen(),
-      ),
-      GoRoute(
-        path: '/user-finance-screen',
-        name: 'userFinanceScreen',
-        builder: (context, state) => const UserFinanceScreen(),
-      ),
-      GoRoute(
-        path: CardSettingsScreen.path,
-        name: CardSettingsScreen.name,
-        builder: (context, state) {
-          final chosenPlanId = state.extra as int?;
-          return CardSettingsScreen(chosenPlanId: chosenPlanId);
-        },
-      ),
-      GoRoute(
-        path: '/about-plan-screen',
-        name: 'aboutPlanScreen',
-        builder: (context, state) {
-          final slug = state.uri.queryParameters['slug'];
-          if (slug != null) {
-            return AboutPlanScreen(
-              slug: slug,
-              navigateToComments: false,
-              index: null,
-            );
-          }
-
-          final data = state.extra as Map<String, dynamic>;
-          return AboutPlanScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
-        },
-      ),
-      GoRoute(path: '/glossary-screen', name: 'glossaryScreen', builder: (context, state) => const GlossaryScreen()),
-      GoRoute(
-        path: '/about-recipes-screen',
-        name: 'aboutRecipesScreen',
-        builder: (context, state) {
-          final slug = state.uri.queryParameters['slug'];
-          if (slug != null) {
-            return AboutRecipeScreen(
-              recipeSlug: slug,
-              navigateToComments: false,
-              index: null,
-            );
-          }
-
-          final data = state.extra as Map<String, dynamic>;
-          return AboutRecipeScreen(
-            recipeSlug: data['recipe'] as String,
-            index: data['index'] as int?,
-            navigateToComments: data['navigateToComments'] as bool,
-          );
-        },
-      ),
-      GoRoute(
-        path: RecipeCreateScreen.path,
-        name: RecipeCreateScreen.name,
-        builder: (context, state) => RecipeCreateScreen(
-          recipe: state.extra != null ? state.extra as Recipe : null,
-        ),
-      ),
-      GoRoute(path: '/profile-screen', name: 'profileScreen', builder: (context, state) => ProfileScreen(author: state.extra as Author)),
-      GoRoute(
-        path: '/subs-screen/:slug',
-        name: 'subsScreen',
-        builder: (context, state) => SubsScreen(slug: state.pathParameters['slug']!, subType: state.extra as SubType),
-      ),
-      GoRoute(
-        path: '/about-diet-screen',
-        name: 'aboutDietScreen',
-        builder: (context, state) {
-          final slug = state.uri.queryParameters['slug'];
-          if (slug != null) {
-            return AboutDietScreen(
-              slug: slug,
-              index: null,
-              navigateToComments: false,
-            );
-          }
-          final data = state.extra as Map<String, dynamic>;
-          return AboutDietScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
-        },
-      ),
-      GoRoute(
-        path: '/blog-post-create-screen',
-        name: 'blogPostCreateScreen',
-        builder: (context, state) => BlogPostCreateScreen(feedBlogPostModel: state.extra != null ? state.extra as FeedBlogPostModel : null),
-      ),
-      GoRoute(
-          path: '/blog-post-screen',
-          name: 'blogPostScreen',
-          builder: (context, state) {
-            final id = state.uri.queryParameters['id'];
-            final parsedId = int.tryParse(id ?? '');
-            if (parsedId != null) {
-              return BlogPostScreen(
-                id: parsedId,
-              );
-            }
-
-            return BlogPostScreen(id: state.extra as int);
-          }),
-      GoRoute(
-        path: '/chat-screen',
-        name: 'chatScreen',
-        builder: (context, state) {
-          final data = state.extra as Map<String, dynamic>;
-          final chatId = data['chatId'] as String;
-          final sendInitialMessage = data['sendInitialMessage'] as bool?;
-          return ChatScreen(
-            chatId: chatId,
-            sendInitialMessage: sendInitialMessage,
-          );
-        },
-      ),
-      GoRoute(
-        path: '/empty-chat-screen',
-        name: 'emptyChatScreen',
-        builder: (context, state) => EmptyChatScreen(author: state.extra as Author),
-      ),
-      GoRoute(
-        path: '/settings-screen',
-        name: 'settingsScreen',
-        builder: (context, state) => const SettingsScreen(),
-        routes: [
-          GoRoute(
-            path: 'general-info-screen',
-            name: 'generalInfoScreen',
-            builder: (context, state) => GeneralInfoScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-          GoRoute(
-            path: 'other-info-screen',
-            name: 'otherInfoScreen',
-            builder: (context, state) => OtherInfoScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-          GoRoute(
-            path: 'physical-activity-screen',
-            name: 'physicalActivityScreen',
-            builder: (context, state) => PhysicalActivityScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-          GoRoute(
-            path: 'physical-form-screen',
-            name: 'physicalFormScreen',
-            builder: (context, state) => PhysicalFormScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-          GoRoute(path: 'pressure-screen', name: 'pressureScreen', builder: (context, state) => PressureScreen(settingsEntity: state.extra as SettingsEntity)),
-          GoRoute(
-            path: 'change-password-screen',
-            name: 'changePasswordScreen',
-            builder: (context, state) => ChangePasswordScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-          GoRoute(
-            path: 'change-email-screen',
-            name: 'changeEmailScreen',
-            builder: (context, state) => ChangeEmailScreen(settingsEntity: state.extra as SettingsEntity),
-          ),
-        ],
-      ),
-      GoRoute(path: '/become-consultant-screen', name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
-      GoRoute(
-        path: '/stepper-become-consultant-screen',
-        name: 'stepperBecomeConsultantScreen',
-        builder: (context, state) => StepperBecomeConsultantScreen(
-          slug: state.extra == null ? null : state.extra as String,
-        ),
-      ),
-      GoRoute(path: '/calendar-screen', name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
-      GoRoute(path: '/support-screen', name: 'supportScreen', builder: (context, state) => const SupportScreen()),
-      GoRoute(
-        path: '/photo-view-screen/:index',
-        name: 'photoViewScreen',
-        builder: (context, state) => PhotoViewScreen(imageUrls: state.extra as List<String>, index: int.parse(state.pathParameters['index']!)),
-      ),
-      GoRoute(
-        path: CreateDietScreen.path,
-        name: CreateDietScreen.name,
-        builder: (context, state) {
-          final diet = state.extra as Diet?;
-          return CreateDietScreen(diet: diet);
-        },
-      ),
-      GoRoute(
-        path: DietPreviewScreen.path,
-        name: DietPreviewScreen.name,
-        builder: (context, state) {
-          final data = state.extra as Diet;
-          return DietPreviewScreen(diet: data);
-        },
-      ),
-      GoRoute(path: CreatePlanScreen.path, name: CreatePlanScreen.name, builder: (context, state) => const CreatePlanScreen()),
-      GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
-      GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
-      GoRoute(path: UserDetailsScreen.path, name: UserDetailsScreen.name, builder: (context, state) => UserDetailsScreen(slug: state.extra as String)),
-      GoRoute(path: DevToolsScreen.path, name: DevToolsScreen.name, builder: (context, state) => const DevToolsScreen()),
-      GoRoute(path: ConsultantRatingScreen.path, name: ConsultantRatingScreen.name, builder: (context, state) => const ConsultantRatingScreen()),
-      GoRoute(
-        path: InfoByOrderScreen.path,
-        name: InfoByOrderScreen.name,
-        builder: (context, state) {
-          final data = state.extra as Map<String, dynamic>;
-          final planId = data['planId'] as int;
-          final successfulPayment = data['successfulPayment'] as bool?;
-          return InfoByOrderScreen(
-            planId: planId,
-            successfulPayment: successfulPayment,
-          );
-        },
-      ),
-      GoRoute(
-        path: PaymentScreen.path,
-        name: PaymentScreen.name,
-        builder: (context, state) {
-          final data = state.extra as Map<String, dynamic>;
-          final planId = data['planId'] as int;
-          final url = data['url'] as String;
-          return PaymentScreen(
-            url: url,
-            planId: planId,
-          );
-        },
-      ),
-      GoRoute(
-        path: UserDiaryScreen.path,
-        name: UserDiaryScreen.name,
-        builder: (context, state) {
-          final data = state.extra as Map<String, int>;
-          final diaryId = data['diaryId'] as int;
-          final currentPlanDay = data['currentDiaryDay'] as int;
-          return UserDiaryScreen(
-            diaryId: diaryId,
-            currentPlanDay: currentPlanDay,
-          );
-        },
-      ),
-      GoRoute(
-        path: '/verify-screen',
-        name: 'verifyScreen',
-        builder: (context, state) => VerifyScreen(passKey: state.extra as String),
-      ),
-      GoRoute(
-        path: '/verify-email-screen',
-        name: 'verifyEmailScreen',
-        builder: (context, state) => const VerifyEmailScreen(),
-      ),
-      GoRoute(
-        path: MyRecipesScreen.path,
-        name: MyRecipesScreen.name,
-        builder: (context, state) => const MyRecipesScreen(),
-      ),
     ],
   );
+
+  /// Обработка редиректов для deep links
+  static String? _handleRedirect(BuildContext context, GoRouterState state) {
+    final segments = state.uri.pathSegments;
+    if (segments.length == 4) {
+      final type = segments[1];
+      switch (type) {
+        case 'diary':
+          FlutterNativeSplash.remove();
+          return '/diary-screen';
+      }
+    }
+    if (segments.length == 3) {
+      final type = segments[1];
+      final contentIdentifier = segments[2];
+
+      switch (type) {
+        case 'recipe':
+          FlutterNativeSplash.remove();
+          return '/about-recipes-screen?slug=$contentIdentifier';
+        case 'blog_post':
+          FlutterNativeSplash.remove();
+          return '/blog-post-screen?id=$contentIdentifier';
+        case 'plan':
+          FlutterNativeSplash.remove();
+          return '/about-plan-screen?slug=$contentIdentifier';
+        case 'diet':
+          FlutterNativeSplash.remove();
+          return '/about-diet-screen?slug=$contentIdentifier';
+        case 'chat':
+          FlutterNativeSplash.remove();
+          return '/chat-select-screen';
+        case 'profile':
+          FlutterNativeSplash.remove();
+          return '/profile-screen?slug=$contentIdentifier';
+      }
+    }
+    if (segments.length == 2) {
+      final type = segments[1];
+      switch (type) {
+        case 'chat':
+          FlutterNativeSplash.remove();
+          return '/chat-select-screen';
+      }
+    }
+
+    return null;
+  }
+
+  static void navigateToRegisterViaSocial({required AuthResultEntity authResult, required String provider}) {
+    appRouter.pushNamed('registerViaSocialScreen', extra: {'authResult': authResult, 'provider': provider});
+  }
 }

lib/core/comments/presentation/comments_actions_bottom_sheet.dart

@@ -1,11 +1,10 @@
-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/bottom_sheet_action_widget.dart';
 import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 
 void showCommentsActionsBottomSheet(
@@ -19,25 +18,23 @@ void showCommentsActionsBottomSheet(
   required bool isMyComment,
 }) {
   showModalBottomSheet(
-      context: context,
+    context: context,
-      isScrollControlled: true,
+    isScrollControlled: true,
-      backgroundColor: Colors.transparent,
+    backgroundColor: Colors.transparent,
-      builder: (context) => Container(
+    builder: (context) => Container(
-            margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).padding.bottom),
+      margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom + 20),
-            decoration: BoxDecoration(
+      decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: appTheme.whiteA700),
-              borderRadius: BorderRadius.circular(12),
+      child: CommentsActionsBottomSheet(
-              color: appTheme.whiteA700,
+        isMyComment: isMyComment,
-            ),
+        reply: reply,
-            child: CommentsActionsBottomSheet(
+        copy: copy,
-              isMyComment: isMyComment,
+        edit: edit,
-              reply: reply,
+        delete: delete,
-              copy: copy,
+        complain: complain,
-              edit: edit,
+        commentText: commentText,
-              delete: delete,
+      ),
-              complain: complain,
+    ),
-              commentText: commentText,
+  );
-            ),
-          ));
 }
 
 class CommentsActionsBottomSheet extends StatefulWidget {
@@ -83,47 +80,36 @@ class _CommentsActionsBottomSheetState extends State<CommentsActionsBottomSheet>
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Row(children: [
+                  Row(
-                    Expanded(
+                    children: [
-                      child: CustomTextFormField(
+                      Expanded(
-                        autofocus: true,
+                        child: CustomTextFormField(autofocus: true, controller: controller, onChanged: (value) => setState(() {})),
-                        controller: controller,
-                        onChanged: (value) => setState(() {}),
                       ),
-                    ),
+                      const SizedBox(width: 8),
-                    const SizedBox(width: 8),
+                      GestureDetector(
-                    GestureDetector(
+                        onTap: () {
-                      onTap: () {
+                          widget.edit(controller.text);
-                        widget.edit(controller.text);
+                          GoRouter.of(context).pop();
-                        GoRouter.of(context).pop();
+                        },
-                      },
+                        child: Container(
-                      child: Container(
+                          decoration: BoxDecoration(color: controller.text.length > 2 ? appTheme.blueA400 : appTheme.gray50, shape: BoxShape.circle),
-                        decoration: BoxDecoration(
+                          height: 32,
-                          color: controller.text.length > 2 ? appTheme.blueA400 : appTheme.gray50,
+                          width: 32,
-                          shape: BoxShape.circle,
+                          child: Icon(Icons.send_rounded, size: 18, color: controller.text.length > 2 ? appTheme.whiteA700 : appTheme.black),
-                        ),
-                        height: 32,
-                        width: 32,
-                        child: Icon(
-                          Icons.send_rounded,
-                          size: 18,
-                          color: controller.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
                         ),
                       ),
-                    )
+                    ],
-                  ])
+                  ),
                 ],
               ),
             )
           : Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const SizedBox(
+                const SizedBox(height: 7),
-                  height: 7,
-                ),
                 const BottomSheetHandlerBar(),
                 if (widget.isMyComment)
-                  _ActionWidget(
+                  BottomSheetActionWidget(
                     text: s.edit,
                     iconPath: 'assets/icons/edit_paint.svg',
                     needToPop: false,
@@ -132,72 +118,22 @@ class _CommentsActionsBottomSheetState extends State<CommentsActionsBottomSheet>
                     }),
                   )
                 else if (widget.reply != null)
-                  _ActionWidget(
+                  BottomSheetActionWidget(text: s.reply, iconPath: 'assets/icons/reply.svg', onTap: widget.reply!),
-                    text: s.reply,
-                    iconPath: 'assets/icons/reply.svg',
-                    onTap: widget.reply!,
-                  ),
                 if (widget.reply != null) const CustomDivider(),
-                _ActionWidget(
+                BottomSheetActionWidget(text: s.copy, iconPath: 'assets/icons/copy2.svg', onTap: widget.copy),
-                  text: s.copy,
-                  iconPath: 'assets/icons/copy2.svg',
-                  onTap: widget.copy,
-                ),
                 if (widget.isMyComment) ...[
                   if (widget.reply != null) ...[
                     const CustomDivider(),
-                    _ActionWidget(
+                    BottomSheetActionWidget(text: s.reply, iconPath: 'assets/icons/reply.svg', onTap: widget.reply!),
-                      text: s.reply,
-                      iconPath: 'assets/icons/reply.svg',
-                      onTap: widget.reply!,
-                    ),
                   ],
                   const CustomDivider(),
-                  _ActionWidget(
+                  BottomSheetActionWidget(text: s.deleteComment, iconPath: 'assets/icons/red_trash.svg', onTap: widget.delete),
-                    text: s.deleteComment,
-                    iconPath: 'assets/icons/red_trash.svg',
-                    onTap: widget.delete,
-                  ),
                 ] else ...[
                   const CustomDivider(),
-                  _ActionWidget(
+                  BottomSheetActionWidget(text: s.complain, iconPath: 'assets/icons/complain.svg', onTap: widget.complain),
-                    text: s.complain,
+                ],
-                    iconPath: 'assets/icons/complain.svg',
-                    onTap: widget.complain,
-                  ),
-                ]
               ],
             ),
     );
   }
 }
-
-class _ActionWidget extends StatelessWidget {
-  const _ActionWidget({required this.text, required this.iconPath, required this.onTap, this.needToPop = true});
-  final String text;
-  final String iconPath;
-  final void Function() onTap;
-  final bool needToPop;
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        if (needToPop) Navigator.pop(context);
-        onTap();
-      },
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 12),
-        child: Row(
-          children: [
-            Text(
-              text,
-              style: TextStyles.textLMedium.copyWith(color: appTheme.black),
-            ),
-            const Spacer(),
-            SvgPicture.asset(iconPath)
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/core/const.dart

@@ -1,5 +1,5 @@
-String baseUrl = 'https://eatvio.ru';
+bool hidePlans = const bool.fromEnvironment('HIDE_PLANS', defaultValue: false);
-// String baseUrl = 'https://dev2.eatvio.com';
+const buildDate = String.fromEnvironment('BUILD_DATE', defaultValue: '');
 
 const List<int> durationValues = [7, 14, 21];
 

lib/core/constants/app_constants.dart

@@ -0,0 +1,72 @@
+/// Константы приложения
+class AppConstants {
+  // Размеры
+  static const double defaultPadding = 16.0;
+  static const double smallPadding = 8.0;
+  static const double largePadding = 24.0;
+  static const double extraLargePadding = 32.0;
+
+  // Радиусы
+  static const double defaultBorderRadius = 8.0;
+  static const double smallBorderRadius = 4.0;
+  static const double largeBorderRadius = 16.0;
+
+  // Высоты
+  static const double defaultButtonHeight = 48.0;
+  static const double smallButtonHeight = 36.0;
+  static const double largeButtonHeight = 56.0;
+
+  // Ширины
+  static const double maxContentWidth = 400.0;
+  static const double minContentWidth = 280.0;
+
+  // Анимации
+  static const Duration defaultAnimationDuration = Duration(milliseconds: 300);
+  static const Duration fastAnimationDuration = Duration(milliseconds: 150);
+  static const Duration slowAnimationDuration = Duration(milliseconds: 500);
+
+  // Таймауты
+  static const Duration defaultTimeout = Duration(seconds: 30);
+  static const Duration shortTimeout = Duration(seconds: 10);
+  static const Duration longTimeout = Duration(minutes: 2);
+
+  // Лимиты
+  static const int maxImageSize = 5 * 1024 * 1024; // 5MB
+  static const int maxVideoSize = 100 * 1024 * 1024; // 100MB
+  static const int maxTextLength = 1000;
+  static const int maxTitleLength = 100;
+  static const int maxDescriptionLength = 500;
+
+  // Пагинация
+  static const int defaultPageSize = 20;
+  static const int smallPageSize = 10;
+  static const int largePageSize = 50;
+
+  // Форматы
+  static const List<String> supportedImageFormats = ['jpg', 'jpeg', 'png', 'webp'];
+  static const List<String> supportedVideoFormats = ['mp4', 'mov', 'avi'];
+
+  // Регулярные выражения
+  static const String emailRegex = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$';
+  static const String phoneRegex = r'^\+?[1-9]\d{1,14}$';
+  static const String urlRegex = r'^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$';
+
+  // Сообщения
+  static const String defaultErrorMessage = 'Произошла ошибка. Попробуйте еще раз.';
+  static const String networkErrorMessage = 'Проблема с подключением к интернету.';
+  static const String timeoutErrorMessage = 'Превышено время ожидания.';
+  static const String unknownErrorMessage = 'Неизвестная ошибка.';
+
+  // Ключи для SharedPreferences
+  static const String welcomeScreenShownKey = 'welcomeScreenWasShowed';
+  static const String userTokenKey = 'userToken';
+  static const String userDataKey = 'userData';
+  static const String settingsKey = 'settings';
+
+  // API endpoints
+  static const String apiVersion = '/api';
+  static const String authEndpoint = '/auth';
+  static const String usersEndpoint = '/users';
+  static const String postsEndpoint = '/posts';
+  static const String commentsEndpoint = '/comments';
+}

lib/core/credentials_storage.dart

@@ -1,32 +0,0 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-abstract class CredentialsStorage {
-  static Future<bool> haveCredentialsInStorage() async {
-    try {
-      if (await const FlutterSecureStorage().read(key: 'email') == null || await const FlutterSecureStorage().read(key: 'password') == null) {
-        return false;
-      } else {
-        return true;
-      }
-    } catch (e) {
-      return false;
-    }
-  }
-
-  static Future<Map<String, String>> getCredentialsFromStorage() async {
-    return {
-      'email': (await const FlutterSecureStorage().read(key: 'email'))!,
-      'password': (await const FlutterSecureStorage().read(key: 'password'))!,
-    };
-  }
-
-  static Future<void> saveCredentials(String email, String password) async {
-    await const FlutterSecureStorage().write(key: 'email', value: email);
-    await const FlutterSecureStorage().write(key: 'password', value: password);
-  }
-
-  static Future<void> removeCredentials() async {
-    await const FlutterSecureStorage().delete(key: 'email');
-    await const FlutterSecureStorage().delete(key: 'password');
-  }
-}

lib/core/cubit/base_cubit.dart

@@ -0,0 +1,42 @@
+import 'dart:developer';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+/// Базовый класс для всех Cubit'ов с унифицированной обработкой ошибок
+abstract class BaseCubit<State> extends Cubit<State> {
+  BaseCubit(super.initialState);
+
+  /// Унифицированная обработка ошибок
+  void handleError(Object error, [StackTrace? stackTrace]) {
+    log('Error in $runtimeType: $error', stackTrace: stackTrace);
+    // Здесь можно добавить отправку ошибок в Sentry или другую систему мониторинга
+  }
+
+  /// Безопасное выполнение асинхронных операций
+  Future<T?> safeExecute<T>(Future<T> Function() operation) async {
+    try {
+      return await operation();
+    } catch (error, stackTrace) {
+      handleError(error, stackTrace);
+      return null;
+    }
+  }
+
+  /// Безопасное выполнение асинхронных операций с обработкой состояния
+  Future<T?> safeExecuteWithState<T>(
+    Future<T> Function() operation, {
+    required State loadingState,
+    required State Function(T result) successState,
+    required State Function(Object error) errorState,
+  }) async {
+    try {
+      emit(loadingState);
+      final result = await operation();
+      emit(successState(result));
+      return result;
+    } catch (error, stackTrace) {
+      handleError(error, stackTrace);
+      emit(errorState(error));
+      return null;
+    }
+  }
+}

lib/core/cubit/marketing/marketing_cubit.dart

@@ -0,0 +1,29 @@
+import 'package:eatvio_app/core/cubit/marketing/marketing_cubit_state.dart';
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class MarketingCubit extends Cubit<MarketingCubitState> {
+  final Prefs prefs;
+  MarketingCubit(this.prefs) : super(const MarketingCubitState());
+
+  Future<bool> checkRegistrationDate() async {
+    try {
+      final milliseconds = prefs.getInt(PrefsKeys.registrationDate);
+      final marketingBottomSheetHasBeenShown = prefs.getBool(PrefsKeys.marketingBottomSheetHasBeenShown);
+      if (milliseconds == null || marketingBottomSheetHasBeenShown == true) {
+        return false;
+      }
+      final date = DateTime.fromMillisecondsSinceEpoch(milliseconds);
+      final today = DateTime.now();
+      final daysCount = today.difference(date).inDays;
+      final needToShowMarketingBottomSheet = daysCount >= 14;
+      if (needToShowMarketingBottomSheet) {
+        await prefs.setBool(PrefsKeys.marketingBottomSheetHasBeenShown, true);
+      }
+      return needToShowMarketingBottomSheet;
+    } catch (e) {
+      rethrow;
+    }
+  }
+}

lib/core/cubit/marketing/marketing_cubit_state.dart

@@ -0,0 +1,3 @@
+class MarketingCubitState {
+  const MarketingCubitState();
+}

lib/core/cubit/state_utils.dart

@@ -0,0 +1,28 @@
+/// Утилиты для работы с состояниями Cubit'ов
+class StateUtils {
+  /// Проверяет, является ли состояние загрузочным
+  static bool isLoading(dynamic state) {
+    return state.toString().contains('loading') || state.toString().contains('Loading');
+  }
+
+  /// Проверяет, является ли состояние загруженным
+  static bool isLoaded(dynamic state) {
+    return state.toString().contains('loaded') || state.toString().contains('Loaded');
+  }
+
+  /// Проверяет, является ли состояние ошибочным
+  static bool isError(dynamic state) {
+    return state.toString().contains('error') || state.toString().contains('Error');
+  }
+
+  /// Получает сообщение об ошибке из состояния
+  static String? getErrorMessage(dynamic state) {
+    if (isError(state)) {
+      // Попытка извлечь сообщение об ошибке из состояния
+      final stateString = state.toString();
+      final errorMatch = RegExp(r'error[:\s]+([^,}]+)').firstMatch(stateString);
+      return errorMatch?.group(1)?.trim();
+    }
+    return null;
+  }
+}

lib/core/di/app_config_registration.dart

@@ -0,0 +1,12 @@
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:get_it/get_it.dart';
+
+class AppConfigRegistration {
+  static final sl = GetIt.instance;
+
+  /// Регистрация AppConfig
+  static void registerAppConfig({required AppBuildType buildType}) {
+    sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: buildType));
+  }
+}

lib/core/di/cubit_registrations.dart

@@ -0,0 +1,151 @@
+import 'package:eatvio_app/core/cubit/marketing/marketing_cubit.dart';
+import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_cubit.dart';
+import 'package:eatvio_app/core/views/cubit/views_cubit.dart';
+import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
+import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart';
+import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
+import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
+import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
+import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
+import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart';
+import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
+import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
+import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart';
+import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart';
+import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
+import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
+import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
+import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
+import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
+import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_cubit.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart';
+import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart';
+import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_cubit.dart';
+import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
+import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
+import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
+import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart';
+import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
+import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
+import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
+import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
+import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
+import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart';
+import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
+import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
+import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
+import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:get_it/get_it.dart';
+
+/// Регистрация всех Cubit'ов в системе внедрения зависимостей
+class CubitRegistrations {
+  static final sl = GetIt.instance;
+
+  /// Регистрация всех Cubit'ов
+  static void registerAll() {
+    _registerSingletonCubits();
+    _registerFactoryCubits();
+  }
+
+  /// Регистрация Cubit'ов как синглтонов
+  static void _registerSingletonCubits() {
+    sl.registerLazySingleton<NewMessagesCubit>(() => NewMessagesCubit());
+    sl.registerLazySingleton<NotificationsCubit>(() => NotificationsCubit(wsManager: sl(), notificationsRepository: sl()));
+    sl.registerLazySingleton<ProfileAvatarCubit>(() => ProfileAvatarCubit(profileRepository: sl()));
+    sl.registerLazySingleton<ChatsCubit>(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()));
+    sl.registerLazySingleton<InternetConnectionCubit>(() => InternetConnectionCubit());
+  }
+
+  /// Регистрация Cubit'ов как фабрик
+  static void _registerFactoryCubits() {
+    // Auth related cubits
+    sl.registerFactory<AuthCubit>(() => AuthCubit(authRepository: sl()));
+    sl.registerFactory<RegistrationCubit>(() => RegistrationCubit(registrationRepository: sl(), prefs: sl()));
+    sl.registerFactory<ResetPasswordCubit>(() => ResetPasswordCubit(resetPasswordRepository: sl()));
+    sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
+    sl.registerFactory<OAuthCubit>(() => OAuthCubit(authRepository: sl(), prefs: sl()));
+    // Feed related cubits
+    sl.registerFactory<FeedCubit>(() => FeedCubit(feedRepository: sl()));
+    sl.registerFactory<RecipesCubit>(() => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl()));
+    sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
+    sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
+    sl.registerFactory<ConsultantsCubit>(() => ConsultantsCubit(feedRepository: sl()));
+    sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl()));
+    sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
+
+    // Chat related cubits
+    sl.registerFactory<ChatRoomCubit>(() => ChatRoomCubit(cardsRepository: sl(), chatRepository: sl(), wsManager: sl()));
+
+    // Profile related cubits
+    sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()));
+    sl.registerFactory<profile_plans.PlansCubit>(() => profile_plans.PlansCubit(plansRepository: sl()));
+    sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
+
+    // Content creation cubits
+    sl.registerFactory<CreateDietCubit>(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()));
+    sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit(createPlanRepository: sl()));
+    sl.registerFactory<CreateRecipeCubit>(() => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl()));
+    sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
+
+    // Content viewing cubits
+    sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl()));
+    sl.registerFactory<AboutRecipeCubit>(() => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<BlogPostCubit>(() => BlogPostCubit(sl()));
+
+    // User content cubits
+    sl.registerFactory<MyDietsCubit>(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl()));
+    sl.registerFactory<MyPlansCubit>(() => MyPlansCubit(myPlansRepository: sl()));
+    sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl()));
+
+    // Other feature cubits
+    sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
+    sl.registerFactory<DiaryCubit>(
+      () => DiaryCubit(
+        chatRepository: sl(),
+        diaryRepository: sl(),
+        glossaryRepository: sl(),
+        profileRepository: sl(),
+        dietRepository: sl(),
+        settingsRepository: sl(),
+      ),
+    );
+    sl.registerFactory<SettingsCubit>(
+      () => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl(), consultationsRepository: sl()),
+    );
+    sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
+    sl.registerFactory<ComplainingCubit>(() => ComplainingCubit(repository: sl()));
+    sl.registerFactory<UserCardsCubit>(() => UserCardsCubit(cardsRepository: sl()));
+    sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
+    sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
+    sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));
+    sl.registerFactory<ConsultationsArchiveCubit>(() => ConsultationsArchiveCubit(consultationsRepository: sl()));
+    sl.registerFactory<ConsultantFinancesCubit>(() => ConsultantFinancesCubit(consultationsRepository: sl()));
+    sl.registerFactory<UserPurchasesCubit>(() => UserPurchasesCubit(consultationsRepository: sl()));
+    sl.registerFactory<BlockedUsersCubit>(() => BlockedUsersCubit(blockedUsersRepository: sl()));
+    sl.registerFactory<NotificationSettingsCubit>(() => NotificationSettingsCubit(notificationSettingsRepository: sl()));
+    sl.registerFactory<ConsultantRatingCubit>(() => ConsultantRatingCubit(feedRepository: sl(), repository: sl(), profileRepository: sl()));
+    sl.registerFactory<ViewsCubit>(() => ViewsCubit(viewsRepository: sl()));
+    sl.registerFactory<UserDetailsCubit>(() => UserDetailsCubit(profileRepository: sl()));
+    sl.registerFactory<MenuCubit>(() => MenuCubit(sl()));
+    sl.registerFactory<MarketingCubit>(() => MarketingCubit(sl()));
+    sl.registerFactory<PersonalDietSuggestionCubit>(() => PersonalDietSuggestionCubit(dietRepository: sl(), personalDietSuggestionService: sl()));
+  }
+}

lib/core/di/external_registrations.dart

@@ -0,0 +1,32 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/interceptors/phone_verify_error_interceptor.dart';
+import 'package:eatvio_app/core/interceptors/token_interceptor.dart';
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:get_it/get_it.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Регистрация внешних зависимостей в системе внедрения зависимостей
+class ExternalRegistrations {
+  static final sl = GetIt.instance;
+
+  /// Регистрация всех внешних зависимостей
+  static void registerAll() {
+    _registerDio();
+    _registerPrefs();
+  }
+
+  /// Регистрация Dio HTTP клиента
+  static void _registerDio() {
+    sl.registerLazySingleton(
+      () =>
+          Dio(BaseOptions(baseUrl: sl<AppConfig>().baseUrl, headers: {'accept': 'application/json', 'content-type': 'application/json'}))
+            ..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()]),
+    );
+  }
+
+  /// Регистрация Prefs
+  static void _registerPrefs() {
+    sl.registerSingletonAsync<Prefs>(()async => Prefs(await SharedPreferences.getInstance()));
+  }
+}

lib/core/di/repository_registrations.dart

@@ -0,0 +1,91 @@
+import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
+import 'package:eatvio_app/core/views/repository/views_repository.dart';
+import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
+import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart';
+import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
+import 'package:eatvio_app/features/calendar/repositories/calendar_repository.dart';
+import 'package:eatvio_app/features/cancel_plan_bottom_sheet/repository/cancel_plan_repository.dart';
+import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
+import 'package:eatvio_app/features/complaining/repositories/complaining_repository.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
+import 'package:eatvio_app/features/consultant_rating/repositories/consultant_rating_repository.dart';
+import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart';
+import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart';
+import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart';
+import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
+import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
+import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
+import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
+import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
+import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart';
+import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart';
+import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
+import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
+import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
+import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart';
+import 'package:eatvio_app/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart';
+import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
+import 'package:eatvio_app/features/plans/repositories/plans_repository.dart';
+import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
+import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart';
+import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.dart';
+import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
+import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
+import 'package:get_it/get_it.dart';
+
+/// Регистрация всех Repository в системе внедрения зависимостей
+class RepositoryRegistrations {
+  static final sl = GetIt.instance;
+
+  /// Регистрация всех Repository
+  static void registerAll() {
+    _registerSingletonRepositories();
+    _registerFactoryRepositories();
+  }
+
+  /// Регистрация Repository как синглтонов
+  static void _registerSingletonRepositories() {
+    // Core repositories
+    sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
+    sl.registerLazySingleton<FeedRepository>(() => FeedRepository(feedService: sl()));
+    sl.registerLazySingleton<ProfileRepository>(() => ProfileRepository(profileService: sl()));
+    sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
+    sl.registerLazySingleton<SettingsRepository>(() => SettingsRepository(settingsService: sl()));
+    sl.registerLazySingleton<ConsultantRepository>(() => ConsultantRepository(consultantService: sl()));
+    sl.registerLazySingleton<DiaryRepository>(() => DiaryRepository(diaryService: sl()));
+    sl.registerLazySingleton<GlossaryRepository>(() => GlossaryRepository(glossaryService: sl()));
+    sl.registerLazySingleton<DietRepository>(() => DietRepository(dietsService: sl()));
+    sl.registerLazySingleton<PlansRepository>(() => PlansRepository(plansService: sl()));
+    sl.registerLazySingleton<PlanRepository>(() => PlanRepository(planService: sl()));
+    sl.registerLazySingleton<AboutRecipeRepository>(() => AboutRecipeRepository(recipeService: sl()));
+    sl.registerLazySingleton<RecipeRepository>(() => RecipeRepository(recipeService: sl()));
+    sl.registerLazySingleton<ComplainingRepository>(() => ComplainingRepository(service: sl()));
+    sl.registerLazySingleton<AuthRepository>(() => AuthRepository(authService: sl()));
+    sl.registerLazySingleton<CardsRepository>(() => CardsRepository(cardsService: sl()));
+    sl.registerLazySingleton<ConsultationsRepository>(() => ConsultationsRepository(consultationService: sl()));
+    sl.registerLazySingleton<CancelPlanRepository>(() => CancelPlanRepository(cancelService: sl()));
+    sl.registerLazySingleton<CreatePlanRepository>(() => CreatePlanRepository(createPlanService: sl()));
+    sl.registerLazySingleton<NotificationsRepository>(() => NotificationsRepository(notificationsService: sl()));
+    sl.registerLazySingleton<BlockedUsersRepository>(() => BlockedUsersRepository(blockedUserService: sl()));
+    sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
+    sl.registerLazySingleton<NotificationSettingsRepository>(() => NotificationSettingsRepository(sl()));
+    sl.registerLazySingleton<PersonalDietSuggestionRepository>(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl()));
+
+    // Content repositories
+    sl.registerLazySingleton<BlogPostRepository>(() => BlogPostRepository(blogPostService: sl()));
+    sl.registerLazySingleton<CreateDietRepository>(() => CreateDietRepository(createDietService: sl()));
+    sl.registerLazySingleton<MyDietsRepository>(() => MyDietsRepository(myDietsService: sl()));
+    sl.registerLazySingleton<MyPlansRepository>(() => MyPlansRepository(myPlansService: sl()));
+
+    // Auth repositories
+    sl.registerLazySingleton<RegistrationRepository>(() => RegistrationRepository(registrationService: sl()));
+  }
+
+  /// Регистрация Repository как фабрик
+  static void _registerFactoryRepositories() {
+    sl.registerFactory<MyRecipesRepository>(() => MyRecipesRepository(myRecipesService: sl()));
+    sl.registerFactory<ResetPasswordRepository>(() => ResetPasswordRepository(resetPasswordService: sl()));
+    sl.registerFactory<ConsultantRatingRepository>(() => ConsultantRatingRepository(sl()));
+    sl.registerFactory<ViewsRepository>(() => ViewsRepository(viewsService: sl()));
+  }
+}

lib/core/di/service_registrations.dart

@@ -0,0 +1,90 @@
+import 'package:eatvio_app/core/comments/services/comments_service.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/views/service/views_service.dart';
+import 'package:eatvio_app/core/websockets/ws_service.dart';
+import 'package:eatvio_app/features/auth/services/auth_service.dart';
+import 'package:eatvio_app/features/auth/services/reset_password_service.dart';
+import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart';
+import 'package:eatvio_app/features/calendar/services/calendar_service.dart';
+import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan_service.dart';
+import 'package:eatvio_app/features/chat/services/chat_service.dart';
+import 'package:eatvio_app/features/complaining/services/complaining_service.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart';
+import 'package:eatvio_app/features/consultant_rating/services/consultant_rating_service.dart';
+import 'package:eatvio_app/features/consultations/services/consultation_service.dart';
+import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart';
+import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart';
+import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart';
+import 'package:eatvio_app/features/diary/services/diary_service.dart';
+import 'package:eatvio_app/features/diets/services/diet_service.dart';
+import 'package:eatvio_app/features/feed/services/feed_service.dart';
+import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
+import 'package:eatvio_app/features/menu/services/blocked_users_service.dart';
+import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
+import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
+import 'package:eatvio_app/features/my_finance/services/cards_service.dart';
+import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart';
+import 'package:eatvio_app/features/notifications/service/notifications_service.dart';
+import 'package:eatvio_app/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart';
+import 'package:eatvio_app/features/plans/services/plan_service.dart';
+import 'package:eatvio_app/features/plans/services/plans_service.dart';
+import 'package:eatvio_app/features/profile/services/profile_service.dart';
+import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
+import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
+import 'package:eatvio_app/features/registration/services/registration_service.dart';
+import 'package:eatvio_app/features/settings/services/settings_service.dart';
+import 'package:get_it/get_it.dart';
+
+/// Регистрация всех Service в системе внедрения зависимостей
+class ServiceRegistrations {
+  static final sl = GetIt.instance;
+
+  /// Регистрация всех Service
+  static void registerAll() {
+    _registerSingletonServices();
+  }
+
+  /// Регистрация Service как синглтонов
+  static void _registerSingletonServices() {
+    // Core services
+    sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
+    sl.registerLazySingleton<FeedService>(() => FeedService(sl()));
+    sl.registerLazySingleton<ProfileService>(() => ProfileService(sl()));
+    sl.registerLazySingleton<CalendarService>(() => CalendarService(sl()));
+    sl.registerLazySingleton<SettingsService>(() => SettingsService(sl()));
+    sl.registerLazySingleton<ConsultantService>(() => ConsultantService(sl()));
+    sl.registerLazySingleton<DiaryService>(() => DiaryService(sl()));
+    sl.registerLazySingleton<GlossaryService>(() => GlossaryService(sl()));
+    sl.registerLazySingleton<DietService>(() => DietService(sl()));
+    sl.registerLazySingleton<PlansService>(() => PlansService(sl()));
+    sl.registerLazySingleton<PlanService>(() => PlanService(sl()));
+    sl.registerLazySingleton<MyDietsService>(() => MyDietsService(sl()));
+    sl.registerLazySingleton<MyPlansService>(() => MyPlansService(sl()));
+    sl.registerLazySingleton<WsService>(() => WsService(sl()));
+    sl.registerLazySingleton<AboutRecipeService>(() => AboutRecipeService(sl()));
+    sl.registerLazySingleton<ComplainingService>(() => ComplainingService(sl()));
+    sl.registerLazySingleton<AuthService>(() => AuthService(sl()));
+    sl.registerLazySingleton<CardsService>(() => CardsService(sl()));
+    sl.registerLazySingleton<ConsultationService>(() => ConsultationService(sl()));
+    sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
+    sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
+    sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
+    sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi());
+    sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
+    sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
+    sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
+    sl.registerLazySingleton<MyRecipesService>(() => MyRecipesService(sl()));
+    sl.registerLazySingleton<ConsultantRatingService>(() => ConsultantRatingService(sl()));
+    sl.registerLazySingleton<NotificationSettingsService>(() => NotificationSettingsService(sl()));
+    sl.registerLazySingleton<ViewsService>(() => ViewsService(sl()));
+    sl.registerLazySingleton<PersonalDietSuggestionService>(() => PersonalDietSuggestionService(sl()));
+
+    // Content services
+    sl.registerLazySingleton<CreateRecipeService>(() => CreateRecipeService(sl()));
+    sl.registerLazySingleton<BlogPostService>(() => BlogPostService(sl()));
+    sl.registerLazySingleton<CreateDietService>(() => CreateDietService(sl()));
+
+    // Auth services
+    sl.registerLazySingleton<RegistrationService>(() => RegistrationService(sl()));
+  }
+}

lib/core/env_config.dart

@@ -0,0 +1,55 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+class EnvConfig {
+  static String get baseUrl => dotenv.env['BASE_URL'] ?? '';
+  static String get devBaseUrl => dotenv.env['DEV_BASE_URL'] ?? '';
+
+  // Sentry Configuration
+  static String get sentryDsn => dotenv.env['SENTRY_DSN'] ?? '';
+
+  // AppMetrica Configuration
+  static String get appMetricaApiKey => dotenv.env['APPMETRICA_KEY'] ?? '';
+
+  // Firebase Configuration
+  static String get firebaseProjectId => dotenv.env['FIREBASE_PROJECT_ID'] ?? '';
+  static String get firebaseDatabaseUrl => dotenv.env['FIREBASE_DATABASE_URL'] ?? '';
+  static String get firebaseStorageBucket => dotenv.env['FIREBASE_STORAGE_BUCKET'] ?? '';
+  static String get firebaseMessagingSenderId => dotenv.env['FIREBASE_MESSAGING_SENDER_ID'] ?? '';
+
+  // Firebase Android Configuration
+  static String get firebaseAndroidApiKey => dotenv.env['FIREBASE_ANDROID_API_KEY'] ?? '';
+  static String get firebaseAndroidAppId => dotenv.env['FIREBASE_ANDROID_APP_ID'] ?? '';
+
+  // Firebase iOS Configuration
+  static String get firebaseIosApiKey => dotenv.env['FIREBASE_IOS_API_KEY'] ?? '';
+  static String get firebaseIosAppId => dotenv.env['FIREBASE_IOS_APP_ID'] ?? '';
+  static String get firebaseIosBundleId => dotenv.env['FIREBASE_IOS_BUNDLE_ID'] ?? '';
+
+  // App Store URLs
+  static String get appStoreUrl => dotenv.env['APP_STORE_URL'] ?? '';
+  static String get rustoreUrl => dotenv.env['RUSTORE_URL'] ?? '';
+
+  // Telegram Support
+  static String get telegramSupportUrl => dotenv.env['TELEGRAM_SUPPORT_URL'] ?? '';
+  static String get supportEmail => dotenv.env['SUPPORT_EMAIL'] ?? '';
+
+  // Test Credentials (for development only)
+  static String get testEmail => dotenv.env['TEST_EMAIL'] ?? '';
+  static String get testPassword => dotenv.env['TEST_PASSWORD'] ?? '';
+
+  // Email Validation API
+  static String get emailValidationApiUrl => dotenv.env['EMAIL_VALIDATION_API_URL'] ?? '';
+
+  // Connection Check URLs
+  static String get googleCheckUrl => dotenv.env['GOOGLE_CHECK_URL'] ?? '';
+  static String get yandexCheckUrl => dotenv.env['YANDEX_CHECK_URL'] ?? '';
+
+  // VK ID Configuration
+  static String get vkClientIdIos => dotenv.env['VK_CLIENT_ID_IOS'] ?? '';
+  static String get vkClientIdAndroid => dotenv.env['VK_CLIENT_ID_ANDROID'] ?? '';
+
+  // Yandex ID Configuration
+  static String get yandexClientId => dotenv.env['YANDEX_CLIENT_ID'] ?? '';
+  static String get yandexClientSecret => dotenv.env['YANDEX_CLIENT_SECRET'] ?? '';
+  static String get yandexRedirectUri => dotenv.env['YANDEX_REDIRECT_URI'] ?? '';
+}

lib/core/firebase_api.dart

@@ -1,10 +1,94 @@
+import 'dart:developer';
+import 'dart:io';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
+import 'package:flutter/services.dart';
+
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/token_storage.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/services.dart' show MethodChannel, PlatformException;
 
 class FirebaseApi {
   final _firebaseMessaging = FirebaseMessaging.instance;
 
   Future<String?> getToken() async {
-    await _firebaseMessaging.requestPermission();
+    String? token;
-    return await _firebaseMessaging.getToken();
+
+    if (await _isHuaweiDevice()) {
+      token = await _getHuaweiPushTokenNative();
+    } else {
+      if ((sl<AppConfig>().buildType == AppBuildType.prod)) {
+        await _firebaseMessaging.requestPermission();
+      }
+      token = await _firebaseMessaging.getToken();
+    }
+    return token;
+  }
+
+  Future<void> registerAnonymousPushToken() async {
+    try {
+      final deviceInfo = DeviceInfoPlugin();
+      await sl<Dio>().post(
+        '/api/anonymous_token',
+        data: {
+          'platform': Platform.isIOS ? 'ios' : 'android',
+          'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
+          'token': await getToken(),
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+    }
+  }
+
+  Future<void> registerPushToken() async {
+    if (await TokenStorage.haveTokenInStorage()) {
+      try {
+        final deviceInfo = DeviceInfoPlugin();
+        final isHuawei = Platform.isAndroid ? await _isHuaweiDevice() : false;
+        await sl<Dio>().post(
+          '/api/profile/notification/token/register',
+          data: {
+            'platform': Platform.isIOS ? 'ios' : (isHuawei ? 'huawei' : 'android'),
+            'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
+            'token': await getToken(),
+          },
+        );
+      } catch (e, st) {
+        log(e.toString(), stackTrace: st);
+      }
+    }
+  }
+
+  Future<bool> _isHuaweiDevice() async {
+    if (!Platform.isAndroid) return false;
+    try {
+      final info = await DeviceInfoPlugin().androidInfo;
+      final brand = info.brand.toLowerCase();
+      final manufacturer = info.manufacturer.toLowerCase();
+      return brand.contains('huawei') || brand.contains('honor') || manufacturer.contains('huawei') || manufacturer.contains('honor');
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<String?> _getHuaweiPushTokenNative() async {
+    try {
+      const channel = MethodChannel('com.eatvioapp/hms_push');
+      final String? token = await channel.invokeMethod<String>('getHuaweiToken');
+      return token;
+    } on PlatformException catch (e, st) {
+      showErrorToast('$e $st');
+      log(e.toString(), stackTrace: st);
+      return null;
+    } catch (e, st) {
+      showErrorToast('$e $st');
+      log(e.toString(), stackTrace: st);
+      return null;
+    }
   }
 }

lib/core/interceptors/phone_verify_error_interceptor.dart

@@ -12,8 +12,8 @@ class PhoneVerifyErrorInterceptor extends Interceptor {
       final data = err.response?.data;
 
       if (data is Map<String, dynamic> && data['type'] == 'unverificated_phone') {
-        final String phone = await sl<ProfileRepository>().getMyPhone();
+        final String phone = await sl<ProfileRepository>().getMyPhone();         
-        final String passKey = await sl<ProfileRepository>().getPassKey(phone);
+        final String passKey = await sl<ProfileRepository>().getPassKey(routeName: 'user_detailz.change-phone-verify', routeParams: {"phone": phone});
         await showErrorDialog(AppRouter.navigatorKey.currentContext!,
             title: 'Привяжите номер телефона', description: 'Для того, что бы выполнить это действие необходимо привязать номер телефона');
         AppRouter.navigatorKey.currentContext?.pushNamed('verifyScreen', extra: passKey);

lib/core/internet_connection_cubit/internet_connection_cubit.dart

@@ -0,0 +1,73 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:eatvio_app/core/env_config.dart';
+import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_state.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:http/http.dart' as http;
+
+class InternetConnectionCubit extends Cubit<InternetConnectionState> {
+  InternetConnectionCubit() : super(InternetConnectionState()) {
+    checkConnection();
+    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateAccessStatus);
+    _listener = AppLifecycleListener(
+      onResume: () async {
+        _connectivitySubscription.resume();
+        await checkConnection();
+      },
+      onHide: _connectivitySubscription.pause,
+      onPause: _connectivitySubscription.pause,
+    );
+  }
+
+  final Connectivity _connectivity = Connectivity();
+  late StreamSubscription<List<ConnectivityResult>> _connectivitySubscription;
+  late final AppLifecycleListener _listener;
+
+  Future<void> checkConnection() async {
+    late List<ConnectivityResult> result;
+
+    try {
+      result = await _connectivity.checkConnectivity();
+    } on PlatformException catch (e) {
+      log('Couldn\'t check connectivity status', error: e);
+      return;
+    }
+
+    return _updateAccessStatus(result);
+  }
+
+  Future<void> _updateAccessStatus(List<ConnectivityResult> result) async {
+    final hasInternet = await _checkInternetAccess(result);
+    if (!hasInternet) showInternetConnectionToast();
+    emit(state.copyWith(isInternetAvailable: hasInternet));
+  }
+
+  Future<bool> _checkInternetAccess(List<ConnectivityResult> result) async {
+    if (result.contains(ConnectivityResult.none)) {
+      return false;
+    }
+
+    final uris = [Uri.parse(EnvConfig.googleCheckUrl), Uri.parse(EnvConfig.yandexCheckUrl), Uri.parse(EnvConfig.devBaseUrl), Uri.parse(EnvConfig.baseUrl)];
+    for (final uri in uris) {
+      try {
+        final response = await http.get(uri).timeout(const Duration(seconds: 3));
+        return response.statusCode >= 100 && response.statusCode < 600;
+      } catch (e) {
+        continue;
+      }
+    }
+    return false;
+  }
+
+  @override
+  Future<void> close() {
+    _connectivitySubscription.cancel();
+    _listener.dispose();
+    return super.close();
+  }
+}

lib/core/internet_connection_cubit/internet_connection_state.dart

@@ -0,0 +1,13 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'internet_connection_state.freezed.dart';
+
+
+@freezed
+abstract class InternetConnectionState with _$InternetConnectionState {
+
+  factory InternetConnectionState({
+    @Default(true) bool isInternetAvailable,
+  }) = _InternetConnectionState;
+  
+}

lib/core/locator_service.dart

@@ -1,257 +1,32 @@
-import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
-import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
+import 'package:eatvio_app/core/di/app_config_registration.dart';
-import 'package:eatvio_app/core/comments/services/comments_service.dart';
+import 'package:eatvio_app/core/di/cubit_registrations.dart';
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/di/external_registrations.dart';
-import 'package:eatvio_app/core/dio/phone_verify_error_interceptor.dart';
+import 'package:eatvio_app/core/di/repository_registrations.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/di/service_registrations.dart';
-import 'package:eatvio_app/core/interceptors/token_interceptor.dart';
 import 'package:eatvio_app/core/websockets/ws_manager.dart';
-import 'package:eatvio_app/core/websockets/ws_service.dart';
-import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
-import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
-import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
-import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart';
-import 'package:eatvio_app/features/auth/services/auth_service.dart';
-import 'package:eatvio_app/features/auth/services/reset_password_service.dart';
-import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
-import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart';
-import 'package:eatvio_app/features/cancel_plan_bottom_sheet/repository/cancel_plan_repository.dart';
-import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan_service.dart';
-import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart';
-import 'package:eatvio_app/features/complaining/repositories/complaining_repository.dart';
-import 'package:eatvio_app/features/complaining/services/complaining_service.dart';
-import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart';
-import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart';
-import 'package:eatvio_app/features/consultations/services/consultation_service.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart';
-import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
-import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart';
-import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart';
-import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
-import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart';
-import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart';
-import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
-import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
-import 'package:eatvio_app/features/diets/services/diet_service.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/repositories/blog_post_repository.dart';
-import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart';
-import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_cubit.dart';
-import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_cubit.dart';
-import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
-import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart';
-import 'package:eatvio_app/features/menu/services/blocked_users_service.dart';
-import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
-import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
-import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
-import 'package:eatvio_app/features/calendar/repositories/calendar_repository.dart';
-import 'package:eatvio_app/features/calendar/services/calendar_service.dart';
-import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
-import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
-import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
-import 'package:eatvio_app/features/chat/services/chat_service.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart';
-import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
-import 'package:eatvio_app/features/diary/services/diary_service.dart';
-import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
-import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
-import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
-import 'package:eatvio_app/features/feed/services/feed_service.dart';
-import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
-import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
-import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart';
-import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
-import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
-import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_cubit.dart';
-import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
-import 'package:eatvio_app/features/my_finance/services/cards_service.dart';
-import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
-import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
-import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart';
-import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart';
-import 'package:eatvio_app/features/notifications/service/notifications_service.dart';
-import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
-import 'package:eatvio_app/features/plans/repositories/plans_repository.dart';
-import 'package:eatvio_app/features/plans/services/plans_service.dart';
-import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
-import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
-import 'package:eatvio_app/features/plans/services/plan_service.dart';
-import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
-import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
-import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:eatvio_app/features/profile/services/profile_service.dart';
-import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
-import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
-import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart';
-import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
-import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart';
-import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart';
-import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.dart';
-import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
-import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
-import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
-import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
-import 'package:eatvio_app/features/registration/services/registration_service.dart';
-import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
-import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
-import 'package:eatvio_app/features/settings/services/settings_service.dart';
-import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get_it/get_it.dart';
-import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
 
+/// Глобальный экземпляр GetIt для внедрения зависимостей
 final sl = GetIt.instance;
 
-Future<void> init() async {
+/// Инициализация системы внедрения зависимостей
-  // Cubit singletons
+Future<void> init({required AppBuildType buildType}) async {
+  // Регистрация AppConfig
+  AppConfigRegistration.registerAppConfig(buildType: buildType);
+
+  // Регистрация внешних зависимостей (Dio, etc.)
+  ExternalRegistrations.registerAll();
+
+  // Регистрация сервисов
+  ServiceRegistrations.registerAll();
+
+  // Регистрация репозиториев
+  RepositoryRegistrations.registerAll();
+
+  // Регистрация Cubit'ов
+  CubitRegistrations.registerAll();
+
+  // Регистрация WebSocket менеджера
   sl.registerLazySingleton<WsManager>(() => WsManager(wsService: sl()));
-  sl.registerLazySingleton<NewMessagesCubit>(() => NewMessagesCubit());
-  sl.registerLazySingleton<NotificationsCubit>(() => NotificationsCubit(wsManager: sl(), notificationsRepository: sl()));
-  sl.registerLazySingleton<ProfileAvatarCubit>(() => ProfileAvatarCubit(profileRepository: sl()));
-  sl.registerLazySingleton<ChatsCubit>(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()));
-
-  // Cubit factories
-  sl.registerFactory<FeedCubit>(() => FeedCubit(feedRepository: sl()));
-  sl.registerFactory<RegistrationCubit>(() => RegistrationCubit(registrationRepository: sl()));
-  sl.registerFactory<ChatRoomCubit>(() => ChatRoomCubit(cardsRepository: sl(), chatRepository: sl(), wsManager: sl()));
-  sl.registerFactory<RecipesCubit>(() => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl()));
-  sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
-  sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()));
-  sl.registerFactory<profile_plans.PlansCubit>(() => profile_plans.PlansCubit(plansRepository: sl()));
-  sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
-  sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl()));
-  sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
-  sl.registerFactory<SettingsCubit>(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl()));
-  sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
-  sl.registerFactory<DiaryCubit>(() => DiaryCubit(
-        chatRepository: sl(),
-        diaryRepository: sl(),
-        glossaryRepository: sl(),
-        profileRepository: sl(),
-        dietRepository: sl(),
-        settingsRepository: sl(),
-      ));
-  sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
-  sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
-  sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
-  sl.registerFactory<CreateDietCubit>(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()));
-  sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit(createPlanRepository: sl()));
-  sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
-  sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl()));
-  sl.registerFactory<CreateRecipeCubit>(() => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl()));
-  sl.registerFactory<MyDietsCubit>(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl()));
-  sl.registerFactory<MyPlansCubit>(() => MyPlansCubit(myPlansRepository: sl()));
-  sl.registerFactory<UserDetailsCubit>(() => UserDetailsCubit(profileRepository: sl()));
-  sl.registerFactory<ConsultantsCubit>(() => ConsultantsCubit(feedRepository: sl()));
-  sl.registerFactory<AboutRecipeCubit>(() => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl()));
-  sl.registerFactory<AuthCubit>(() => AuthCubit(authRepository: sl()));
-  sl.registerFactory<ComplainingCubit>(() => ComplainingCubit(repository: sl()));
-  sl.registerFactory<UserCardsCubit>(() => UserCardsCubit(cardsRepository: sl()));
-  sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl()));
-  sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
-  sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
-  sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));
-  sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
-  sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl()));
-  sl.registerFactory<ConsultationsArchiveCubit>(() => ConsultationsArchiveCubit(consultationsRepository: sl()));
-  sl.registerFactory<ConsultantFinancesCubit>(() => ConsultantFinancesCubit(consultationsRepository: sl()));
-  sl.registerFactory<UserPurchasesCubit>(() => UserPurchasesCubit(consultationsRepository: sl()));
-  sl.registerFactory<ResetPasswordCubit>(() => ResetPasswordCubit(resetPasswordRepository: sl()));
-  sl.registerFactory<BlogPostCubit>(() => BlogPostCubit(sl()));
-  sl.registerFactory<BlockedUsersCubit>(() => BlockedUsersCubit(blockedUsersRepository: sl()));
-
-  // Repository
-  sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
-  sl.registerLazySingleton<FeedRepository>(() => FeedRepository(feedService: sl()));
-  sl.registerLazySingleton<RegistrationRepository>(() => RegistrationRepository(registrationService: sl()));
-  sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
-  sl.registerLazySingleton<ProfileRepository>(() => ProfileRepository(profileService: sl()));
-  sl.registerLazySingleton<RecipeRepository>(() => RecipeRepository(recipeService: sl()));
-  sl.registerLazySingleton<SettingsRepository>(() => SettingsRepository(settingsService: sl()));
-  sl.registerLazySingleton<ConsultantRepository>(() => ConsultantRepository(consultantService: sl()));
-  sl.registerLazySingleton<DiaryRepository>(() => DiaryRepository(diaryService: sl()));
-  sl.registerLazySingleton<GlossaryRepository>(() => GlossaryRepository(glossaryService: sl()));
-  sl.registerLazySingleton<DietRepository>(() => DietRepository(dietsService: sl()));
-  sl.registerLazySingleton<BlogPostRepository>(() => BlogPostRepository(blogPostService: sl()));
-  sl.registerLazySingleton<CreateDietRepository>(() => CreateDietRepository(createDietService: sl()));
-  sl.registerLazySingleton<PlansRepository>(() => PlansRepository(plansService: sl()));
-  sl.registerLazySingleton<PlanRepository>(() => PlanRepository(planService: sl()));
-  sl.registerLazySingleton<MyDietsRepository>(() => MyDietsRepository(myDietsService: sl()));
-  sl.registerLazySingleton<MyPlansRepository>(() => MyPlansRepository(myPlansService: sl()));
-  sl.registerLazySingleton<AboutRecipeRepository>(() => AboutRecipeRepository(recipeService: sl()));
-  sl.registerLazySingleton<ComplainingRepository>(() => ComplainingRepository(service: sl()));
-  sl.registerLazySingleton<AuthRepository>(() => AuthRepository(authService: sl()));
-  sl.registerLazySingleton<CardsRepository>(() => CardsRepository(cardsService: sl()));
-  sl.registerLazySingleton<ConsultationsRepository>(() => ConsultationsRepository(consultationService: sl()));
-  sl.registerLazySingleton<CancelPlanRepository>(() => CancelPlanRepository(cancelService: sl()));
-  sl.registerLazySingleton<CreatePlanRepository>(() => CreatePlanRepository(createPlanService: sl()));
-  sl.registerLazySingleton<NotificationsRepository>(() => NotificationsRepository(notificationsService: sl()));
-  sl.registerFactory<MyRecipesRepository>(() => MyRecipesRepository(myRecipesService: sl()));
-  sl.registerFactory<ResetPasswordRepository>(() => ResetPasswordRepository(resetPasswordService: sl()));
-  sl.registerLazySingleton<BlockedUsersRepository>(() => BlockedUsersRepository(blockedUserService: sl()));
-  sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
-
-  // Services
-  sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
-  sl.registerLazySingleton<FeedService>(() => FeedService(sl()));
-  sl.registerLazySingleton<RegistrationService>(() => RegistrationService(sl()));
-  sl.registerLazySingleton<CalendarService>(() => CalendarService(sl()));
-  sl.registerLazySingleton<ProfileService>(() => ProfileService(sl()));
-  sl.registerLazySingleton<CreateRecipeService>(() => CreateRecipeService(sl()));
-  sl.registerLazySingleton<SettingsService>(() => SettingsService(sl()));
-  sl.registerLazySingleton<ConsultantService>(() => ConsultantService(sl()));
-  sl.registerLazySingleton<DiaryService>(() => DiaryService(sl()));
-  sl.registerLazySingleton<GlossaryService>(() => GlossaryService(sl()));
-  sl.registerLazySingleton<DietService>(() => DietService(sl()));
-  sl.registerLazySingleton<BlogPostService>(() => BlogPostService(sl()));
-  sl.registerLazySingleton<CreateDietService>(() => CreateDietService(sl()));
-  sl.registerLazySingleton<PlansService>(() => PlansService(sl()));
-  sl.registerLazySingleton<PlanService>(() => PlanService(sl()));
-  sl.registerLazySingleton<MyDietsService>(() => MyDietsService(sl()));
-  sl.registerLazySingleton<MyPlansService>(() => MyPlansService(sl()));
-  sl.registerLazySingleton<WsService>(() => WsService(sl()));
-  sl.registerLazySingleton<AboutRecipeService>(() => AboutRecipeService(sl()));
-  sl.registerLazySingleton<ComplainingService>(() => ComplainingService(sl()));
-  sl.registerLazySingleton<AuthService>(() => AuthService(sl()));
-  sl.registerLazySingleton<CardsService>(() => CardsService(sl()));
-  sl.registerLazySingleton<ConsultationService>(() => ConsultationService(sl()));
-  sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
-  sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
-  sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
-  sl.registerLazySingleton<MyRecipesService>(() => MyRecipesService(sl()));
-  sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi());
-  sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
-  sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
-  sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
-
-  // External
-  sl.registerLazySingleton(
-    () => Dio(
-      BaseOptions(
-        baseUrl: baseUrl,
-        headers: {
-          'accept': 'application/json',
-          'content-type': 'application/json',
-        },
-        validateStatus: (status) => status != null && status < 500,
-      ),
-    )..interceptors.addAll(
-        [
-          TokenInterceptor(),
-          PhoneVerifyErrorInterceptor(),
-        ],
-      ),
-  );
-  sl.registerLazySingleton(() async => const FlutterSecureStorage());
 }

lib/core/mixins/registration_date_cache_mixin.dart

@@ -0,0 +1,11 @@
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/prefs_keys.dart';
+
+mixin RegistrationDateCacheMixin {
+  late final Prefs prefs;
+
+
+  Future<void> cacheRegistrationDate(DateTime date) async {
+    await prefs.setInt(PrefsKeys.registrationDate, date.millisecondsSinceEpoch);
+  }
+}

lib/core/permission_handler/permission_handler.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
@@ -11,6 +13,10 @@ class PermissionHandler {
     required Future<void> Function() onGranted,
     required BuildContext context,
   }) async {
+    if (Platform.isAndroid) {
+      await onGranted();
+      return;
+    }
     final permissionState = await permission.request();
     if (permissionState.isGranted) {
       await onGranted();

lib/core/prefs.dart

@@ -0,0 +1,43 @@
+import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+
+class Prefs {
+  final SharedPreferences _prefs;
+
+  Prefs(this._prefs);
+
+  String _key(PrefsKeys key) => key.name; 
+
+  Future<void> setString(PrefsKeys key, String value) async {
+    await _prefs.setString(_key(key), value);
+  }
+
+  String? getString(PrefsKeys key) {
+    return _prefs.getString(_key(key));
+  }
+
+  Future<void> setInt(PrefsKeys key, int value) async {
+    await _prefs.setInt(_key(key), value);
+  }
+
+  int? getInt(PrefsKeys key) {
+    return _prefs.getInt(_key(key));
+  }
+
+  Future<void> setBool(PrefsKeys key, bool value) async {
+    await _prefs.setBool(_key(key), value);
+  }
+
+  bool? getBool(PrefsKeys key) {
+    return _prefs.getBool(_key(key));
+  }
+
+  Future<void> remove(PrefsKeys key) async {
+    await _prefs.remove(_key(key));
+  }
+
+  Future<void> clear() async {
+    await _prefs.clear();
+  }
+}

lib/core/prefs_keys.dart

@@ -0,0 +1 @@
+enum PrefsKeys { hasAnonymousTokenBeenSent, welcomeScreenWasShowed, registrationDate, marketingBottomSheetHasBeenShown }

lib/core/routing/auth_routes.dart

@@ -0,0 +1,53 @@
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
+import 'package:eatvio_app/features/auth/presentation/pages/auth_screen.dart';
+import 'package:eatvio_app/features/auth/presentation/pages/forget_password_screen.dart';
+import 'package:eatvio_app/features/auth/presentation/pages/register_via_social_screen.dart';
+import 'package:eatvio_app/features/auth/presentation/pages/scan_qr_code_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/verify_email_screen.dart';
+import 'package:go_router/go_router.dart';
+
+/// Маршруты для аутентификации
+class AuthRoutes {
+  /// Создание маршрутов аутентификации
+  static List<RouteBase> createRoutes() {
+    return [
+      GoRoute(
+        path: RouteConstants.authScreen,
+        name: 'authScreen',
+        builder: (context, state) => const AuthScreen(),
+        redirect: (context, state) {
+          sl<FirebaseApi>().registerAnonymousPushToken();
+          return null;
+        },
+        routes: [
+          GoRoute(path: RouteConstants.registrationScreen, name: 'registrationScreen', builder: (context, state) => const RegistrationScreen()),
+          GoRoute(
+            path: RouteConstants.forgetPasswordScreen,
+            name: 'forgetPasswordScreen',
+            builder: (context, state) => ForgetPasswordScreen(isAuth: state.extra as bool),
+          ),
+          GoRoute(path: RouteConstants.scanQRCodeScreen, name: 'scanQRCodeScreen', builder: (context, state) => const ScanQRCodeScreen()),
+        ],
+      ),
+      GoRoute(
+        path: RouteConstants.verifyScreen,
+        name: 'verifyScreen',
+        builder: (context, state) => VerifyScreen(passKey: state.extra as String),
+      ),
+      GoRoute(path: RouteConstants.verifyEmailScreen, name: 'verifyEmailScreen', builder: (context, state) => const VerifyEmailScreen()),
+      GoRoute(
+        path: RouteConstants.registerViaSocialScreen,
+        name: 'registerViaSocialScreen',
+        builder: (context, state) {
+          final extra = state.extra as Map<String, dynamic>?;
+          return RegisterViaSocialScreen(authResult: extra?['authResult'] as AuthResultEntity?, provider: extra?['provider'] as String?);
+        },
+      ),
+    ];
+  }
+}

lib/core/routing/content_routes.dart

@@ -0,0 +1,78 @@
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_screen.dart';
+import 'package:eatvio_app/features/blog_post_create/presentation/pages/blog_post_create_screen.dart';
+import 'package:eatvio_app/features/diets/presentation/pages/about_diet_screen.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
+import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_screen.dart';
+import 'package:go_router/go_router.dart';
+
+/// Маршруты для контента
+class ContentRoutes {
+  /// Создание маршрутов контента
+  static List<RouteBase> createRoutes() {
+    return [
+      GoRoute(
+        path: RouteConstants.aboutPlanScreen,
+        name: 'aboutPlanScreen',
+        builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutPlanScreen(slug: slug, navigateToComments: false, index: null);
+          }
+
+          final data = state.extra as Map<String, dynamic>;
+          return AboutPlanScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.aboutRecipesScreen,
+        name: 'aboutRecipesScreen',
+        builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutRecipeScreen(recipeSlug: slug, navigateToComments: false, index: null);
+          }
+
+          final data = state.extra as Map<String, dynamic>;
+          return AboutRecipeScreen(recipeSlug: data['recipe'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.aboutDietScreen,
+        name: 'aboutDietScreen',
+        builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutDietScreen(id: null, slug: slug, index: null, navigateToComments: false);
+          }
+          final data = state.extra as Map<String, dynamic>;
+          return AboutDietScreen(
+            id: data['id'] as int?,
+            slug: data['slug'] as String?,
+            index: data['index'] as int?,
+            navigateToComments: data['navigateToComments'] as bool,
+          );
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.blogPostCreateScreen,
+        name: 'blogPostCreateScreen',
+        builder: (context, state) => BlogPostCreateScreen(feedBlogPostModel: state.extra != null ? state.extra as FeedBlogPostModel : null),
+      ),
+      GoRoute(
+        path: RouteConstants.blogPostScreen,
+        name: 'blogPostScreen',
+        builder: (context, state) {
+          final id = state.uri.queryParameters['id'];
+          final parsedId = int.tryParse(id ?? '');
+          if (parsedId != null) {
+            return BlogPostScreen(id: parsedId);
+          }
+
+          return BlogPostScreen(id: state.extra as int);
+        },
+      ),
+    ];
+  }
+}

lib/core/routing/main_navigation_routes.dart

@@ -0,0 +1,94 @@
+import 'package:eatvio_app/core/routing/route_constants.dart';
+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/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
+import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
+import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
+import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
+import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.dart';
+import 'package:eatvio_app/features/notifications/presentation/notifications_screen.dart';
+import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'dart:developer';
+
+/// Маршруты для основной навигации
+class MainNavigationRoutes {
+  /// Создание маршрутов основной навигации
+  static List<RouteBase> createRoutes() {
+    return [
+      ShellRoute(
+        builder: (context, state, child) {
+          return BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
+            builder: (BuildContext context, ProfileAvatarState state) {
+              if (state is ProfileAvatarStateLoaded) {
+                return BottomNavigationBarWidget(profileModel: state.profile, child: child);
+              }
+              return const SizedBox.shrink();
+            },
+          );
+        },
+        routes: [
+          GoRoute(
+            path: RouteConstants.myProfileScreen,
+            name: 'myProfileScreen',
+            pageBuilder: (context, state) {
+              return const NoTransitionPage(child: ProfileScreen());
+            },
+          ),
+          GoRoute(
+            path: RouteConstants.feedScreen,
+            name: 'feedScreen',
+            pageBuilder: (context, state) => const NoTransitionPage(child: FeedScreen()),
+            redirect: (context, state) async {
+              try {
+                await sl<WsManager>().initialize();
+              } catch (e, st) {
+                log(e.toString(), stackTrace: st);
+              }
+              return null;
+            },
+          ),
+          GoRoute(
+            path: RouteConstants.diaryScreen,
+            name: 'diaryScreen',
+            pageBuilder: (context, state) => const NoTransitionPage(child: DiaryScreen()),
+          ),
+          GoRoute(
+            path: ConsultationsScreen.path,
+            name: ConsultationsScreen.name,
+            pageBuilder: (context, state) => const NoTransitionPage(child: ConsultationsScreen()),
+          ),
+          GoRoute(
+            path: RouteConstants.chatSelectScreen,
+            name: 'chatSelectScreen',
+            pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen()),
+          ),
+          GoRoute(
+            path: RouteConstants.notificationsScreen,
+            name: 'notificationsScreen',
+            pageBuilder: (context, state) => const NoTransitionPage(child: NotificationsScreen()),
+          ),
+          GoRoute(
+            path: RouteConstants.menuScreen,
+            name: 'menuScreen',
+            pageBuilder: (context, state) => NoTransitionPage(
+              child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
+                builder: (BuildContext context, ProfileAvatarState state) {
+                  if (state is ProfileAvatarStateLoaded) {
+                    return MenuScreen(profileModel: state.profile);
+                  }
+                  return const SizedBox.shrink();
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    ];
+  }
+}

lib/core/routing/other_routes.dart

@@ -0,0 +1,250 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
+import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/empty_chat_screen.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
+import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
+import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
+import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
+import 'package:eatvio_app/features/create_plan/presentation/create_plan_screen.dart';
+import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
+import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
+import 'package:eatvio_app/features/feed/models/recipes_model.dart';
+import 'package:eatvio_app/features/glossary/presentation/pages/glossary_screen.dart';
+import 'package:eatvio_app/features/menu/presentation/pages/blocked_users_screen.dart';
+import 'package:eatvio_app/features/menu/presentation/pages/notifications_settings_screen.dart';
+import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
+import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
+import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart';
+import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
+import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
+import 'package:eatvio_app/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
+import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
+import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
+import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
+import 'package:eatvio_app/features/support/presentation/pages/support_screen.dart';
+import 'package:eatvio_app/features/update_screen/presentation/update_screen.dart';
+import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
+import 'package:eatvio_app/features/welcome/presentation/pages/welcome_screen.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart';
+import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
+import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:go_router/go_router.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:version/version.dart';
+
+/// Остальные маршруты приложения
+class OtherRoutes {
+  /// Создание остальных маршрутов
+  static List<RouteBase> createRoutes() {
+    return [
+      // Welcome and update screens
+      GoRoute(
+        path: RouteConstants.welcomeScreen,
+        name: 'welcomeScreen',
+        builder: (context, state) => const WelcomeScreen(),
+        redirect: (context, state) async {
+          try {
+            final prefs = sl<Prefs>();
+            final firebaseApi = sl<FirebaseApi>();
+            final welcomeScreenWasShowed = prefs.getBool(PrefsKeys.welcomeScreenWasShowed) ?? false;
+            await firebaseApi.registerPushToken();
+            if (!welcomeScreenWasShowed) {
+              return null;
+            } else if (await TokenStorage.haveTokenInStorage()) {
+              return '/feed-screen';
+            } else {
+              final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
+              if (!hasAnonymousTokenBeenSent) {
+                await firebaseApi.registerAnonymousPushToken();
+                prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
+              }
+              return '/auth-screen';
+            }
+          } catch (e) {
+            return '/feed-screen';
+          }
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.updateScreen,
+        name: 'updateScreen',
+        builder: (context, state) => const UpdateScreen(),
+        redirect: (context, state) async {
+          try {
+            final versions = (await sl<Dio>().get('${sl<AppConfig>().baseUrl}/api/app_versions')).data;
+            PackageInfo packageInfo = await PackageInfo.fromPlatform();
+            String version = packageInfo.version;
+            Version currentVersion = Version.parse(version);
+            Version latestVersion = Version.parse(versions['min_version']);
+            if (latestVersion > currentVersion) {
+              return null;
+            } else {
+              return RouteConstants.welcomeScreen;
+            }
+          } catch (e) {
+            return RouteConstants.welcomeScreen;
+          }
+        },
+      ),
+
+      // Archive routes
+      GoRoute(path: ConsultationsArchiveScreen.path, name: ConsultationsArchiveScreen.name, builder: (context, state) => const ConsultationsArchiveScreen()),
+      GoRoute(path: ConsultantFinancesScreen.path, name: ConsultantFinancesScreen.name, builder: (context, state) => const ConsultantFinancesScreen()),
+      GoRoute(path: UserPurchasesScreen.path, name: UserPurchasesScreen.name, builder: (context, state) => const UserPurchasesScreen()),
+
+      // Finance routes
+      GoRoute(path: RouteConstants.userFinanceScreen, name: 'userFinanceScreen', builder: (context, state) => const UserFinanceScreen()),
+      GoRoute(
+        path: CardSettingsScreen.path,
+        name: CardSettingsScreen.name,
+        builder: (context, state) {
+          final chosenPlanId = state.extra as int?;
+          return CardSettingsScreen(chosenPlanId: chosenPlanId);
+        },
+      ),
+
+      // Content creation routes
+      GoRoute(
+        path: RecipeCreateScreen.path,
+        name: RecipeCreateScreen.name,
+        builder: (context, state) => RecipeCreateScreen(recipe: state.extra != null ? state.extra as Recipe : null),
+      ),
+      GoRoute(
+        path: CreateDietScreen.path,
+        name: CreateDietScreen.name,
+        builder: (context, state) {
+          final diet = state.extra as Diet?;
+          return CreateDietScreen(diet: diet);
+        },
+      ),
+      GoRoute(
+        path: DietPreviewScreen.path,
+        name: DietPreviewScreen.name,
+        builder: (context, state) {
+          final data = state.extra as Diet;
+          return DietPreviewScreen(diet: data);
+        },
+      ),
+      GoRoute(path: RouteConstants.createPlanScreen, name: 'createPlanScreen', builder: (context, state) => const CreatePlanScreen()),
+      GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
+      GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
+      GoRoute(path: MyRecipesScreen.path, name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen()),
+
+      // Profile routes
+      GoRoute(
+        path: RouteConstants.profileScreen,
+        name: 'profileScreen',
+        builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return ProfileScreen(slug: slug);
+          }
+          return ProfileScreen(slug: state.extra as String);
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.subsScreen,
+        name: 'subsScreen',
+        builder: (context, state) => SubsScreen(slug: state.pathParameters['slug']!, subType: state.extra as SubType),
+      ),
+
+      // Chat routes
+      GoRoute(
+        path: RouteConstants.chatScreen,
+        name: 'chatScreen',
+        builder: (context, state) {
+          final data = state.extra as Map<String, dynamic>;
+          final uuid = data['uuid'] as String;
+          final sendInitialMessage = data['sendInitialMessage'] as bool?;
+          return ChatScreen(uuid: uuid, sendInitialMessage: sendInitialMessage);
+        },
+      ),
+      GoRoute(
+        path: RouteConstants.emptyChatScreen,
+        name: 'emptyChatScreen',
+        builder: (context, state) => EmptyChatScreen(user: state.extra as ProfileModel),
+      ),
+
+      // Consultant routes
+      GoRoute(path: RouteConstants.becomeConsultantScreen, name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
+      GoRoute(
+        path: RouteConstants.stepperBecomeConsultantScreen,
+        name: 'stepperBecomeConsultantScreen',
+        builder: (context, state) => StepperBecomeConsultantScreen(slug: state.extra == null ? null : state.extra as String),
+      ),
+      GoRoute(path: RouteConstants.calendarScreen, name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
+      GoRoute(path: RouteConstants.supportScreen, name: 'supportScreen', builder: (context, state) => const SupportScreen()),
+      GoRoute(
+        path: RouteConstants.photoViewScreen,
+        name: 'photoViewScreen',
+        builder: (context, state) => PhotoViewScreen(imageUrls: state.extra as List<String>, index: int.parse(state.pathParameters['index']!)),
+      ),
+
+      // Other routes
+      GoRoute(path: RouteConstants.glossaryScreen, name: 'glossaryScreen', builder: (context, state) =>  GlossaryScreen(passKey: state.extra as String)),
+      GoRoute(path: RouteConstants.blockedUsersScreen, name: 'blockedUsersScreen', builder: (context, state) => const BlockedUsersScreen()),
+      GoRoute(
+        path: RouteConstants.notificationsSettingsScreen,
+        name: 'notificationsSettingsScreen',
+        builder: (context, state) => const NotificationsSettingsScreen(),
+      ),
+      GoRoute(
+        path: UserDetailsScreen.path,
+        name: UserDetailsScreen.name,
+        builder: (context, state) => UserDetailsScreen(slug: state.extra as String),
+      ),
+      GoRoute(path: DevToolsScreen.path, name: DevToolsScreen.name, builder: (context, state) => const DevToolsScreen()),
+      GoRoute(path: ConsultantRatingScreen.path, name: ConsultantRatingScreen.name, builder: (context, state) => const ConsultantRatingScreen()),
+      GoRoute(
+        path: InfoByOrderScreen.path,
+        name: InfoByOrderScreen.name,
+        builder: (context, state) {
+          final data = state.extra as Map<String, dynamic>;
+          final planId = data['planId'] as int;
+          final successfulPayment = data['successfulPayment'] as bool?;
+          final customerSlug = data['customerSlug'] as String?;
+          return InfoByOrderScreen(planId: planId, successfulPayment: successfulPayment, customerSlug: customerSlug);
+        },
+      ),
+      GoRoute(
+        path: PaymentScreen.path,
+        name: PaymentScreen.name,
+        builder: (context, state) {
+          final data = state.extra as Map<String, dynamic>;
+          final planId = data['planId'] as int;
+          final url = data['url'] as String;
+          return PaymentScreen(url: url, planId: planId);
+        },
+      ),
+      GoRoute(
+        path: UserDiaryScreen.path,
+        name: UserDiaryScreen.name,
+        builder: (context, state) {
+          final data = state.extra as Map<String, int>;
+          final diaryId = data['diaryId'] as int;
+          final currentPlanDay = data['currentDiaryDay'] as int;
+          return UserDiaryScreen(diaryId: diaryId, currentPlanDay: currentPlanDay);
+        },
+      ),
+      GoRoute(
+        path: PersonalDietSuggestionScreen.path,
+        name: PersonalDietSuggestionScreen.name,
+        builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int,),
+      ),
+    ];
+  }
+}

lib/core/routing/route_constants.dart

@@ -0,0 +1,85 @@
+/// Константы маршрутов приложения
+class RouteConstants {
+  // Auth routes
+  static const String authScreen = '/auth-screen';
+  static const String registrationScreen = 'registration-screen';
+  static const String forgetPasswordScreen = 'forget-password-screen';
+  static const String scanQRCodeScreen = 'scan-qr-code-screen';
+  static const String verifyScreen = '/verify-screen';
+  static const String verifyEmailScreen = '/verify-email-screen';
+  static const String registerViaSocialScreen = '/register-via-social-screen';
+
+  // Main navigation routes
+  static const String myProfileScreen = '/my-profile-screen';
+  static const String feedScreen = '/feed-screen';
+  static const String diaryScreen = '/diary-screen';
+  static const String consultationsScreen = '/consultations-screen';
+  static const String chatSelectScreen = '/chat-select-screen';
+  static const String notificationsScreen = '/notifications-screen';
+  static const String menuScreen = '/menu-screen';
+
+  // Content routes
+  static const String aboutPlanScreen = '/about-plan-screen';
+  static const String aboutRecipesScreen = '/about-recipes-screen';
+  static const String aboutDietScreen = '/about-diet-screen';
+  static const String blogPostScreen = '/blog-post-screen';
+  static const String blogPostCreateScreen = '/blog-post-create-screen';
+
+  // Profile routes
+  static const String profileScreen = '/profile-screen';
+  static const String subsScreen = '/subs-screen';
+
+  // Settings routes
+  static const String settingsScreen = '/settings-screen';
+  static const String generalInfoScreen = 'general-info-screen';
+  static const String otherInfoScreen = 'other-info-screen';
+  static const String physicalActivityScreen = 'physical-activity-screen';
+  static const String physicalFormScreen = 'physical-form-screen';
+  static const String pressureScreen = 'pressure-screen';
+  static const String changePasswordScreen = 'change-password-screen';
+  static const String changeEmailScreen = 'change-email-screen';
+
+  // Consultant routes
+  static const String becomeConsultantScreen = '/become-consultant-screen';
+  static const String stepperBecomeConsultantScreen = '/stepper-become-consultant-screen';
+  static const String consultantRatingScreen = '/consultant-rating-screen';
+
+  // Other routes
+  static const String welcomeScreen = '/welcome-screen';
+  static const String updateScreen = '/update-screen';
+  static const String calendarScreen = '/calendar-screen';
+  static const String supportScreen = '/support-screen';
+  static const String photoViewScreen = '/photo-view-screen';
+  static const String chatScreen = '/chat-screen';
+  static const String emptyChatScreen = '/empty-chat-screen';
+  static const String glossaryScreen = '/glossary-screen';
+  static const String blockedUsersScreen = '/blocked-users-screen';
+  static const String notificationsSettingsScreen = '/notifications-settings-screen';
+
+  // Finance routes
+  static const String userFinanceScreen = '/user-finance-screen';
+  static const String cardSettingsScreen = '/card-settings-screen';
+  static const String orderInfoScreen = '/order-info-screen';
+  static const String paymentScreen = '/payment-screen';
+
+  // Content creation routes
+  static const String recipeCreateScreen = '/recipe-create-screen';
+  static const String createDietScreen = '/create-diet-screen';
+  static const String dietPreviewScreen = '/diet-preview-screen';
+  static const String createPlanScreen = '/create-plan-screen';
+  static const String myDietsScreen = '/my-diets-screen';
+  static const String myPlansScreen = '/my-plans-screen';
+  static const String myRecipesScreen = '/my-recipes-screen';
+
+  // User details
+  static const String userDetailsScreen = '/user-details-screen';
+  static const String userDiaryScreen = '/user-diary-screen';
+
+  // Dev tools
+  static const String devToolsScreen = '/dev-tools-screen';
+
+  // Archive routes
+  static const String consultationsArchiveScreen = '/consultations-archive-screen';
+  static const String consultantFinancesScreen = '/consultant-finances-screen';
+  static const String userPurchasesScreen = '/user-purchases-screen';
+}

lib/core/routing/settings_routes.dart

@@ -0,0 +1,62 @@
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/change_password_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/general_info_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/other_info_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/physical_activity_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/physical_form_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/pressure_screen.dart';
+import 'package:eatvio_app/features/settings/presentation/pages/settings_screen.dart';
+import 'package:go_router/go_router.dart';
+
+/// Маршруты для настроек
+class SettingsRoutes {
+  /// Создание маршрутов настроек
+  static List<RouteBase> createRoutes() {
+    return [
+      GoRoute(
+        path: RouteConstants.settingsScreen,
+        name: 'settingsScreen',
+        builder: (context, state) => const SettingsScreen(),
+        routes: [
+          GoRoute(
+            path: RouteConstants.generalInfoScreen,
+            name: 'generalInfoScreen',
+            builder: (context, state) => GeneralInfoScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.otherInfoScreen,
+            name: 'otherInfoScreen',
+            builder: (context, state) => OtherInfoScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.physicalActivityScreen,
+            name: 'physicalActivityScreen',
+            builder: (context, state) => PhysicalActivityScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.physicalFormScreen,
+            name: 'physicalFormScreen',
+            builder: (context, state) => PhysicalFormScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.pressureScreen,
+            name: 'pressureScreen',
+            builder: (context, state) => PressureScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.changePasswordScreen,
+            name: 'changePasswordScreen',
+            builder: (context, state) => ChangePasswordScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+          GoRoute(
+            path: RouteConstants.changeEmailScreen,
+            name: 'changeEmailScreen',
+            builder: (context, state) => ChangeEmailScreen(settingsEntity: state.extra as SettingsEntity),
+          ),
+        ],
+      ),
+    ];
+  }
+}

lib/core/theme/custom_text_style.dart

@@ -249,4 +249,10 @@ abstract class TextStyles {
     fontWeight: FontWeight.w500,
     height: 1.255,
   );
+
+  static const textFS24FW700 = TextStyle(
+    fontSize: 24,
+    fontWeight: FontWeight.w700,
+    height: 1.255,
+  );
 }

lib/core/theme/theme_helper.dart

@@ -101,7 +101,7 @@ class PrimaryColors {
   // Blue
   Color get blue400 => const Color(0XFF43A6F2);
 
-  Color get blueA400 => const Color(0XFF2F80ED);  
+  Color get blueA400 => const Color(0XFF2F80ED);
   // BlueGray
   Color get blueGray400 => const Color(0XFF7B8794);
 
@@ -141,6 +141,8 @@ class PrimaryColors {
 
   Color get gray60003 => const Color(0XFF707070);
 
+  Color get gray60005 => const Color(0xFF6C7C93);
+
   // Green
   Color get greenA700 => const Color(0XFF019A3E);
 
@@ -148,6 +150,8 @@ class PrimaryColors {
 
   Color get green => const Color(0XFF0BB450);
 
+  Color get transparentGreen => const Color.fromARGB(12, 1, 154, 63);
+
   // LightGreen
   Color get lightGreen300 => const Color(0XFFB2DF8A);
 
@@ -202,6 +206,10 @@ class PrimaryColors {
   Color get darkGray => const Color(0XFFBBBCC0);
 
   Color get commentBg => const Color(0XFFFFFDD8);
+
+  Color get cardNotificationsBG => const Color(0xFFA4A4A4);
+
+  Color get grey7B => const Color(0xFF7B7B7B);
 }
 
 PrimaryColors get appTheme => ThemeHelper().themeColor();

lib/core/token_storage.dart

@@ -1,9 +1,10 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 abstract class TokenStorage {
   static Future<bool> haveTokenInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
     try {
-      if (await const FlutterSecureStorage().read(key: 'token') == null) {
+      if (sharedPreferences.getString('token') == null) {
         return false;
       } else {
         return true;
@@ -13,11 +14,48 @@ abstract class TokenStorage {
     }
   }
 
-  static Future<String?> getTokenFromStorage() async => await const FlutterSecureStorage().read(key: 'token');
+  static Future<String?> getTokenFromStorage() async {
-
+    final sharedPreferences = await SharedPreferences.getInstance();
-  static Future<void> saveTokenInStorage(String token) async {
+    return sharedPreferences.getString('token');
-    await const FlutterSecureStorage().write(key: 'token', value: token);
   }
 
-  static Future<void> removeTokenInStorage() async => (await const FlutterSecureStorage().delete(key: 'token'));
+  static Future<void> saveTokenInStorage(String token) async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.setString('token', token);
+  }
+
+  static Future<void> removeTokenInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.remove('token');
+  }
+}
+
+abstract class SocketIdStorage {
+  static Future<bool> haveSocketIdInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    try {
+      if (sharedPreferences.getString('socketId') == null) {
+        return false;
+      } else {
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
+  }
+
+  static Future<String?> getSocketIdFromStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    return sharedPreferences.getString('socketId');
+  }
+
+  static Future<void> saveSocketIdInStorage(String socketId) async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.setString('socketId', socketId);
+  }
+
+  static Future<void> removeSocketIdInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.remove('socketId');
+  }
 }

lib/core/utils/date_time_utils.dart

@@ -3,11 +3,30 @@ import 'package:intl/intl.dart';
 
 const String dateTimeFormatPattern = 'dd/MM/yyyy';
 
+/// Преобразует дату из формата гггг-мм-дд чч:мм:сс в дд.мм.гггг
+String formatBuildDate(String dateString) {
+  if (dateString.isEmpty) return '';
+
+  try {
+    final dateTimeParts = dateString.split(' ');
+    if (dateTimeParts.isNotEmpty) {
+      final datePart = dateTimeParts[0];
+      final dateParts = datePart.split('-');
+      if (dateParts.length == 3) {
+        final year = dateParts[0];
+        final month = dateParts[1];
+        final day = dateParts[2];
+        return '$day.$month.$year';
+      }
+    }
+  } catch (e) {
+    return dateString;
+  }
+  return dateString;
+}
+
 extension DateTimeExtension on DateTime {
-  String format([
+  String format([String pattern = dateTimeFormatPattern, String? locale]) {
-    String pattern = dateTimeFormatPattern,
-    String? locale,
-  ]) {
     final localDate = isUtc ? toLocal() : this;
     if (locale != null && locale.isNotEmpty) {
       initializeDateFormatting(locale);
@@ -19,17 +38,24 @@ extension DateTimeExtension on DateTime {
     final localDate = isUtc ? toLocal() : this;
     final now = DateTime.now();
     final yesterday = DateTime(now.year, now.month, now.day).subtract(const Duration(days: 1));
-    return localDate.year == yesterday.year &&
+    return localDate.year == yesterday.year && localDate.month == yesterday.month && localDate.day == yesterday.day;
-        localDate.month == yesterday.month &&
-        localDate.day == yesterday.day;
   }
 
   bool isToday() {
     final localDate = isUtc ? toLocal() : this;
     final now = DateTime.now();
-    return now.year == localDate.year &&
+    return now.year == localDate.year && now.month == localDate.month && now.day == localDate.day;
-        now.month == localDate.month &&
+  }
-        now.day == localDate.day;
+
+  String toISO8601WithTimeZoneOffset() {
+    final formatter = DateFormat("yyyy-MM-ddTHH:mm:ss");
+      final formatted = formatter.format(this);            
+      final offset = timeZoneOffset;
+      final hours = offset.inHours.abs().toString().padLeft(2, '0');
+      final minutes = (offset.inMinutes.abs() % 60).toString().padLeft(2, '0');
+      final sign = offset.isNegative ? '-' : '+';
+
+      return "$formatted$sign$hours:$minutes";
   }
 }
 

lib/core/utils/toasts.dart

@@ -38,4 +38,16 @@ void showSuccessToast(String message) {
     textColor: appTheme.whiteA700,
     fontSize: 16.0,
   );
-}
+}
+
+void showInternetConnectionToast() {
+  Fluttertoast.showToast(
+    msg: 'Проверьте подключение к интернету',
+    toastLength: Toast.LENGTH_LONG,
+    gravity: ToastGravity.TOP,
+    timeInSecForIosWeb: 3,
+    backgroundColor: appTheme.red,
+    textColor: Colors.white,
+    fontSize: 16.0,
+  );
+}

lib/core/utils/validation_utils.dart

@@ -0,0 +1,87 @@
+import 'package:eatvio_app/core/constants/app_constants.dart';
+
+/// Утилиты для валидации
+class ValidationUtils {
+  /// Валидация email
+  static bool isValidEmail(String email) {
+    if (email.isEmpty) return false;
+    final regex = RegExp(AppConstants.emailRegex);
+    return regex.hasMatch(email);
+  }
+
+  /// Валидация телефона
+  static bool isValidPhone(String phone) {
+    if (phone.isEmpty) return false;
+    final regex = RegExp(AppConstants.phoneRegex);
+    return regex.hasMatch(phone);
+  }
+
+  /// Валидация URL
+  static bool isValidUrl(String url) {
+    if (url.isEmpty) return false;
+    final regex = RegExp(AppConstants.urlRegex);
+    return regex.hasMatch(url);
+  }
+
+  /// Валидация длины текста
+  static bool isValidTextLength(String text, {int? maxLength}) {
+    final length = maxLength ?? AppConstants.maxTextLength;
+    return text.length <= length;
+  }
+
+  /// Валидация длины заголовка
+  static bool isValidTitleLength(String title) {
+    return title.isNotEmpty && title.length <= AppConstants.maxTitleLength;
+  }
+
+  /// Валидация длины описания
+  static bool isValidDescriptionLength(String description) {
+    return description.length <= AppConstants.maxDescriptionLength;
+  }
+
+  /// Валидация пароля
+  static bool isValidPassword(String password) {
+    // Минимум 8 символов, хотя бы одна буква и одна цифра
+    if (password.length < 8) return false;
+    final hasLetter = RegExp(r'[a-zA-Z]').hasMatch(password);
+    final hasDigit = RegExp(r'[0-9]').hasMatch(password);
+    return hasLetter && hasDigit;
+  }
+
+  /// Валидация имени пользователя
+  static bool isValidUsername(String username) {
+    // От 3 до 20 символов, только буквы, цифры и подчеркивания
+    if (username.length < 3 || username.length > 20) return false;
+    final regex = RegExp(r'^[a-zA-Z0-9_]+$');
+    return regex.hasMatch(username);
+  }
+
+  /// Получение сообщения об ошибке валидации
+  static String? getValidationErrorMessage(String? value, ValidationType type) {
+    if (value == null || value.isEmpty) {
+      return 'Поле не может быть пустым';
+    }
+
+    switch (type) {
+      case ValidationType.email:
+        return isValidEmail(value) ? null : 'Введите корректный email';
+      case ValidationType.phone:
+        return isValidPhone(value) ? null : 'Введите корректный номер телефона';
+      case ValidationType.url:
+        return isValidUrl(value) ? null : 'Введите корректный URL';
+      case ValidationType.password:
+        return isValidPassword(value) ? null : 'Пароль должен содержать минимум 8 символов, включая буквы и цифры';
+      case ValidationType.username:
+        return isValidUsername(value) ? null : 'Имя пользователя должно содержать от 3 до 20 символов (буквы, цифры, подчеркивания)';
+      case ValidationType.title:
+        return isValidTitleLength(value) ? null : 'Заголовок не может быть пустым и должен содержать не более ${AppConstants.maxTitleLength} символов';
+      case ValidationType.description:
+        return isValidDescriptionLength(value) ? null : 'Описание не может содержать более ${AppConstants.maxDescriptionLength} символов';
+      case ValidationType.text:
+        return isValidTextLength(value) ? null : 'Текст не может содержать более ${AppConstants.maxTextLength} символов';
+    }
+  }
+}
+
+/// Типы валидации
+enum ValidationType { email, phone, url, password, username, title, description, text }

lib/core/views/cubit/views_cubit.dart

@@ -0,0 +1,128 @@
+import 'dart:async';
+import 'package:eatvio_app/core/views/cubit/views_state.dart';
+import 'package:eatvio_app/core/views/repository/views_repository.dart';
+import 'package:eatvio_app/features/feed/models/view_model.dart';
+import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class ViewsCubit extends Cubit<ViewsCubitState> {
+  final ViewsRepository viewsRepository;
+  ViewsCubit({required this.viewsRepository}) : super(ViewsCubitState()) {
+    _listener = AppLifecycleListener(onPause: _sendViews, onInactive: _sendViews);
+  }
+
+  late final AppLifecycleListener _listener;
+
+  final Set<int> postsIds = <int>{};
+  final Set<int> plansIds = <int>{};
+  final Set<int> dietsIds = <int>{};
+  final Set<int> recipesIds = <int>{};
+
+  final Set<int> _sentPosts = <int>{};
+  final Set<int> _sentPlans = <int>{};
+  final Set<int> _sentDiets = <int>{};
+  final Set<int> _sentRecipes = <int>{};
+
+  final Map<ViewableContentType, Map<int, Timer>> _visibilityTimers = {
+    ViewableContentType.posts: <int, Timer>{},
+    ViewableContentType.plans: <int, Timer>{},
+    ViewableContentType.diets: <int, Timer>{},
+    ViewableContentType.recipes: <int, Timer>{},
+  };
+
+  Timer? _debounceTimer;
+
+  Set<int> _idsForType(ViewableContentType type) {
+    switch (type) {
+      case ViewableContentType.posts:
+        return postsIds;
+      case ViewableContentType.plans:
+        return plansIds;
+      case ViewableContentType.diets:
+        return dietsIds;
+      case ViewableContentType.recipes:
+        return recipesIds;
+    }
+  }
+
+  Set<int> _sentIdsForType(ViewableContentType type) {
+    switch (type) {
+      case ViewableContentType.posts:
+        return _sentPosts;
+      case ViewableContentType.plans:
+        return _sentPlans;
+      case ViewableContentType.diets:
+        return _sentDiets;
+      case ViewableContentType.recipes:
+        return _sentRecipes;
+    }
+  }
+
+  void handleVisibility({required double visibleFraction, required int id, required ViewableContentType type}) {
+    final timers = _visibilityTimers[type]!;
+    final ids = _idsForType(type);
+    final sent = _sentIdsForType(type);
+
+    if (sent.contains(id)) {
+      timers[id]?.cancel();
+      timers.remove(id);
+      return;
+    }
+
+    if (ids.contains(id)) return;
+
+    if (visibleFraction >= 0.5) {
+      if (timers.containsKey(id)) return;
+      timers[id] = Timer(const Duration(seconds: 1), () {
+        ids.add(id);
+        timers.remove(id);
+        _scheduleDebouncedSend();
+      });
+    } else {
+      timers[id]?.cancel();
+      timers.remove(id);
+    }
+  }
+
+  Future<void> _viewContent({required ViewableContentType type, required List<int> ids}) async {
+    await viewsRepository.viewContent(
+      viewModel: ViewModel(type: type.getStringifiedVersion(), ids: ids),
+    );
+  }
+
+  void _scheduleDebouncedSend() {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(seconds: 4), _sendViews);
+  }
+
+  void _send(Set<int> ids, Set<int> sent, ViewableContentType type) {
+    final newIds = ids.difference(sent);
+    if (newIds.isNotEmpty) {
+      _viewContent(type: type, ids: newIds.toList());
+      sent.addAll(newIds);
+      ids.removeAll(newIds);
+    }
+  }
+
+  void _sendViews() {
+    _send(postsIds, _sentPosts, ViewableContentType.posts);
+    _send(plansIds, _sentPlans, ViewableContentType.plans);
+    _send(dietsIds, _sentDiets, ViewableContentType.diets);
+    _send(recipesIds, _sentRecipes, ViewableContentType.recipes);
+  }
+
+  @override
+  Future<void> close() async {
+    for (final map in _visibilityTimers.values) {
+      for (final t in map.values) {
+        t.cancel();
+      }
+      map.clear();
+    }
+    _debounceTimer?.cancel();
+    _listener.dispose();
+    _sendViews();
+    await super.close();
+  }
+}

lib/core/views/cubit/views_state.dart

@@ -0,0 +1,3 @@
+class ViewsCubitState {
+  ViewsCubitState();
+}

lib/core/views/repository/views_repository.dart

@@ -0,0 +1,16 @@
+import 'package:eatvio_app/core/views/service/views_service.dart';
+import 'package:eatvio_app/features/feed/models/view_model.dart';
+
+class ViewsRepository {
+  final ViewsService viewsService;
+
+  ViewsRepository({required this.viewsService});
+
+  Future<void> viewContent({required ViewModel viewModel}) async {
+    try {
+      await viewsService.viewContent(viewModel: viewModel);
+    } catch (e) {
+      rethrow;
+    }
+  }
+}

lib/core/views/service/views_service.dart

@@ -0,0 +1,15 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/feed/models/view_model.dart';
+import 'package:retrofit/retrofit.dart';
+
+part 'views_service.g.dart';
+
+@RestApi()
+abstract class ViewsService {
+  factory ViewsService(Dio dio, {String baseUrl}) = _ViewsService;
+
+  @POST('/api/views')
+  Future<void> viewContent({
+    @Body() required ViewModel viewModel,
+  });
+}

lib/core/websockets/ws_manager.dart

@@ -1,7 +1,9 @@
+import 'dart:convert';
 import 'dart:developer';
 
 import 'package:dart_pusher_channels/dart_pusher_channels.dart';
 import 'package:easy_debounce/easy_debounce.dart';
+import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/websockets/ws_service.dart';
@@ -59,6 +61,24 @@ class WsManager {
           ),
         );
 
+        String? extractSocketId(String? data) {
+          if (data == null) return null;
+          try {
+            final decoded = jsonDecode(data);
+            return decoded['socket_id'] as String?;
+          } catch (_) {
+            return null;
+          }
+        }
+
+        client?.eventStream.listen((event) async {
+          if (event.name == 'pusher:connection_established') {
+            final data = event.data;
+            final socketId = extractSocketId(data);
+            await SocketIdStorage.saveSocketIdInStorage(socketId!);
+          }
+        });
+
         await client?.connect();
 
         client = client;
@@ -77,9 +97,8 @@ class WsManager {
           EasyDebounce.debounce(
             'searchChatRoom',
             const Duration(milliseconds: 300),
-                () => sl<ChatsCubit>().getChatRooms(),
+            () => sl<ChatsCubit>().getChatRooms(),
           );
-          log(event.rootObject.toString());
         });
         _subscribe();
       } catch (e, st) {
@@ -93,7 +112,7 @@ class WsManager {
     _privateNotificationChannel = client?.privateChannel(
       '$newNotificationsChannelName.$userId',
       authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
+        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
         headers: {
           'Authorization': 'Bearer $token',
         },
@@ -106,7 +125,7 @@ class WsManager {
     _privateMessagesChannel = client?.privateChannel(
       '$newMessagesChannelName.$userId',
       authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
+        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
         headers: {
           'Authorization': 'Bearer $token',
         },
@@ -119,7 +138,7 @@ class WsManager {
     _privateDirectChatChannel = client?.privateChannel(
       '$directChatChannelName.$chatId',
       authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
+        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
         headers: {
           'Authorization': 'Bearer $token',
         },

lib/core/widgets/bottom_sheet_action_widget.dart

@@ -0,0 +1,33 @@
+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';
+
+class BottomSheetActionWidget extends StatelessWidget {
+  const BottomSheetActionWidget({super.key, required this.text, required this.iconPath, required this.onTap, this.needToPop = true, this.color});
+  final String text;
+  final String iconPath;
+  final void Function() onTap;
+  final bool needToPop;
+  final Color? color;
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () {
+        if (needToPop) Navigator.pop(context);
+        onTap();
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 12),
+        child: Row(
+          children: [
+            Expanded(
+              child: Text(text, style: TextStyles.textLMedium.copyWith(color: appTheme.black)),
+            ),
+            SvgPicture.asset(iconPath, colorFilter: color != null ? ColorFilter.mode(color!, BlendMode.srcIn) : null),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/core/widgets/custom_drop_down.dart

@@ -2,7 +2,8 @@ import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.d
 import 'package:flutter/material.dart';
 
 class CustomDropDown extends StatelessWidget {
-  const CustomDropDown({super.key, 
+  const CustomDropDown({
+    super.key,
     this.alignment,
     this.width,
     this.focusNode,
@@ -48,12 +49,7 @@ class CustomDropDown extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return alignment != null
+    return alignment != null ? Align(alignment: alignment ?? Alignment.center, child: _buildDropDownWidget(context)) : _buildDropDownWidget(context);
-        ? Align(
-            alignment: alignment ?? Alignment.center,
-            child: _buildDropDownWidget(context),
-          )
-        : _buildDropDownWidget(context);
   }
 
   DropdownButtonFormField<SelectionPopupModel> _buildDropDownWidget(BuildContext context) {
@@ -61,7 +57,7 @@ class CustomDropDown extends StatelessWidget {
       focusNode: focusNode ?? FocusNode(),
       icon: const Icon(Icons.keyboard_arrow_down_rounded),
       autofocus: autofocus!,
-      value: value,
+      initialValue: value,
       isDense: true,
       isExpanded: true,
       items: items?.map((SelectionPopupModel item) {
@@ -69,12 +65,7 @@ class CustomDropDown extends StatelessWidget {
           value: item,
           child: Text(
             item.title,
-            style: hintStyle ??
+            style: hintStyle ?? const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black),
-                const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w400,
-                  color: Colors.black,
-                ),
           ),
         );
       }).toList(),
@@ -90,19 +81,9 @@ class CustomDropDown extends StatelessWidget {
 
   InputDecoration _buildInputDecoration(BuildContext context) {
     return InputDecoration(
-      labelStyle: const TextStyle(
+      labelStyle: const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w400),
-        fontSize: 16,
-        color: Colors.black,
-        fontWeight: FontWeight.w400,
-      ),
       hintText: hintText ?? "",
-      hintStyle: hintStyle ??
+      hintStyle: hintStyle ?? TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.grey.shade400, height: 1),
-          TextStyle(
-            fontSize: 16,
-            fontWeight: FontWeight.w400,
-            color: Colors.grey.shade400,
-            height: 1,
-          ),
       prefixIcon: prefix,
       prefixIconConstraints: prefixConstraints,
       suffixIcon: suffix,
@@ -111,18 +92,9 @@ class CustomDropDown extends StatelessWidget {
       contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
       fillColor: const Color(0xFFF6F6F6),
       filled: filled,
-      border: const OutlineInputBorder(
+      border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
-        borderRadius: BorderRadius.all(Radius.circular(20)),
+      enabledBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
-        borderSide: BorderSide.none,
+      focusedBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
-      ),
-      enabledBorder: const OutlineInputBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
-        borderSide: BorderSide.none,
-      ),
-      focusedBorder: const OutlineInputBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
-        borderSide: BorderSide.none,
-      ),
     );
   }
 }

lib/core/widgets/custom_drop_down_button.dart

@@ -3,14 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
 class CustomDropDownButton<T> extends StatelessWidget {
-  const CustomDropDownButton({
+  const CustomDropDownButton({super.key, required this.items, required this.onChanged, this.value, this.hint, this.hasError = false});
-    super.key,
-    required this.items,
-    required this.onChanged,
-    this.value,
-    this.hint,
-    this.hasError = false,
-  });
   final T? value;
   final List<DropdownMenuItem<T>> items;
   final void Function(T?)? onChanged;
@@ -20,11 +13,7 @@ class CustomDropDownButton<T> extends StatelessWidget {
   Widget build(BuildContext context) {
     return DropdownButtonFormField(
       hint: hint,
-      icon: SvgPicture.asset(
+      icon: SvgPicture.asset('assets/icons/arrow_down2.svg', width: 12, height: 8),
-        'assets/icons/arrow_down2.svg',
-        width: 12,
-        height: 8,
-      ),
       borderRadius: BorderRadius.circular(20),
       dropdownColor: appTheme.lightGray0,
       decoration: InputDecoration(
@@ -43,7 +32,7 @@ class CustomDropDownButton<T> extends StatelessWidget {
         fillColor: appTheme.lightGray0,
         filled: true,
       ),
-      value: value,
+      initialValue: value,
       items: items,
       onChanged: onChanged,
     );

lib/core/widgets/custom_popup.dart

@@ -1,4 +1,4 @@
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -86,7 +86,7 @@ class CustomPopup extends StatelessWidget {
 
     if (isAuthor) {
       addItem('assets/icons/copy2.svg', 'Скопировать ссылку', () {
-        Clipboard.setData(ClipboardData(text: '$baseUrl/ru/$path'));
+        Clipboard.setData(ClipboardData(text: '${sl<AppConfig>().baseUrl}/ru/$path'));
         showInfoToast(s.link_was_copied);
       });
       addItem('assets/icons/share2.svg', 'Поделиться', () {
@@ -94,7 +94,7 @@ class CustomPopup extends StatelessWidget {
         SharePlus.instance.share(
           ShareParams(
             uri: Uri.parse(
-              '$baseUrl/ru/$path',
+              '${sl<AppConfig>().baseUrl}/ru/$path',
             ),
             sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
           ),
@@ -140,7 +140,7 @@ class CustomPopup extends StatelessWidget {
       });
     } else {
       addItem('assets/icons/copy2.svg', 'Скопировать ссылку', () {
-        Clipboard.setData(ClipboardData(text: '$baseUrl/ru/$path'));
+        Clipboard.setData(ClipboardData(text: '${sl<AppConfig>().baseUrl}/ru/$path'));
         showInfoToast(s.link_was_copied);
       });
       addItem('assets/icons/share2.svg', 'Поделиться', () {
@@ -148,7 +148,7 @@ class CustomPopup extends StatelessWidget {
         SharePlus.instance.share(
           ShareParams(
             uri: Uri.parse(
-              '$baseUrl/ru/$path',
+              '${sl<AppConfig>().baseUrl}/ru/$path',
             ),
             sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
           ),