Edit README.md

Fixed duplicated code that caused compilation error:
- Removed duplicate _setError method definition
- Fixed parameter list: void _setError(String? error, [String? stackTrace])
- File now compiles correctly

Error was:
lib/presentation/providers/downloads_provider.dart:173:2: Error: Expected a declaration, but got '?'.
}? error) {
 ^

Fixed by properly replacing the old method with new signature.

.github/workflows/build.yml

@@ -1,185 +0,0 @@
-name: Build NeoMovies Mobile
-
-on:
-  push:
-    branches: [ dev, feature/torrent-engine-integration ]
-  pull_request:
-    branches: [ dev ]
-  workflow_dispatch:
-
-env:
-  FLUTTER_VERSION: '3.35.5'
-  JAVA_VERSION: '17'
-
-jobs:
-  # ============================================
-  # Сборка TorrentEngine модуля
-  # ============================================
-  build-torrent-engine:
-    name: Build TorrentEngine Library
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-          cache: 'gradle'
-      
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: wrapper
-      
-      - name: Build TorrentEngine AAR
-        working-directory: android
-        run: |
-          ./gradlew :torrentengine:assembleRelease \
-            --no-daemon \
-            --parallel \
-            --build-cache \
-            -Dorg.gradle.jvmargs="-Xmx2g -XX:MaxMetaspaceSize=512m"
-      
-      - name: Upload TorrentEngine AAR
-        uses: actions/upload-artifact@v4
-        with:
-          name: torrentengine-aar
-          path: android/torrentengine/build/outputs/aar/*.aar
-          retention-days: 7
-
-  # ============================================
-  # Сборка Debug APK
-  # ============================================
-  build-debug-apk:
-    name: Build Debug APK
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: 'stable'
-          cache: true
-      
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-          cache: 'gradle'
-      
-      - name: Flutter Doctor
-        run: flutter doctor -v
-      
-      - name: Get Flutter dependencies
-        run: flutter pub get
-      
-      - name: Build Debug APK
-        run: |
-          flutter build apk \
-            --debug \
-            --target-platform android-arm64
-      
-      - name: Upload Debug APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: debug-apk
-          path: build/app/outputs/flutter-apk/app-debug.apk
-          retention-days: 7
-
-  # ============================================
-  # Сборка Release APK
-  # ============================================
-  build-release-apk:
-    name: Build Release APK
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/dev'
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: 'stable'
-          cache: true
-      
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-          cache: 'gradle'
-      
-      - name: Get Flutter dependencies
-        run: flutter pub get
-      
-      - name: Build Release APK (split per ABI)
-        run: |
-          flutter build apk \
-            --release \
-            --split-per-abi \
-            --target-platform android-arm64
-      
-      - name: Upload Release APK (ARM64)
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-apk-arm64
-          path: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-          retention-days: 30
-
-  # ============================================
-  # Анализ кода
-  # ============================================
-  code-quality:
-    name: Code Quality Checks
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: 'stable'
-          cache: true
-      
-      - name: Get Flutter dependencies
-        run: flutter pub get
-      
-      - name: Flutter Analyze
-        run: flutter analyze --no-fatal-infos
-        continue-on-error: true
-      
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      
-      - name: Android Lint
-        working-directory: android
-        run: ./gradlew lint --no-daemon
-        continue-on-error: true
-      
-      - name: Upload Lint Reports
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: lint-reports
-          path: |
-            android/app/build/reports/lint-results*.html
-            android/torrentengine/build/reports/lint-results*.html
-          retention-days: 7

.github/workflows/flutter-ci.yml

@@ -1,122 +0,0 @@
-# NeoMovies – GitHub Actions CI/CD for Flutter (Android APK + Linux desktop)
-# Requires GitHub-hosted Ubuntu runners.
-
-name: Flutter CI
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-  workflow_dispatch:
-  release:
-    types: [created]
-
-env:
-  FLUTTER_VERSION: "3.22.1"
-
-jobs:
-  # ---------------------------------------------------------------------------
-  test:
-    name: Test & Analyze
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Flutter ${{ env.FLUTTER_VERSION }} (beta)
-        uses: subosito/flutter-action@v2
-        with:
-          channel: beta
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-
-      - name: Get dependencies
-        run: flutter pub get
-
-      - name: Static analysis
-        run: flutter analyze --no-pub --fatal-infos --fatal-warnings
-
-      - name: Run tests
-        run: flutter test --coverage
-
-      - name: Upload coverage
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage
-          path: coverage/
-
-  # ---------------------------------------------------------------------------
-  build_android:
-    name: Build Android APK
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: beta
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-
-      - name: Get dependencies
-        run: flutter pub get
-
-      - name: Build release APK & AAB
-        run: |
-          flutter build apk --release
-          flutter build appbundle --release
-
-      - name: Upload APK & AAB artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: android-build
-          path: |
-            build/app/outputs/flutter-apk/app-release.apk
-            build/app/outputs/bundle/release/app-release.aab
-
-  # ---------------------------------------------------------------------------
-  build_linux:
-    name: Build Linux desktop bundle
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: beta
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-
-      - name: Install Linux build dependencies
-        run: sudo apt-get update && sudo apt-get install -y libjsoncpp-dev libsecret-1-dev clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
-
-      - name: Enable Linux desktop and get deps
-        run: |
-          flutter config --enable-linux-desktop
-          flutter pub get
-
-      - name: Build Linux release bundle
-        run: flutter build linux --release
-
-      - name: Upload Linux bundle artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux-build
-          path: build/linux/x64/release/bundle/
-
-  # ---------------------------------------------------------------------------
-  release_assets:
-    name: Attach assets to GitHub Release
-    if: github.event_name == 'release'
-    needs: [build_android, build_linux]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Upload to GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            android-build/app-release.apk
-            android-build/app-release.aab
-            linux-build/**

.github/workflows/gitlab-mirror.yml

@@ -0,0 +1,75 @@
+name: Full Mirror to GitLab
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    types: [opened, reopened, closed, edited]
+  issues:
+    types: [opened, edited, closed, reopened]
+
+jobs:
+  mirror-code:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+
+      - name: Fetch GitLab branch
+        run: |
+          git remote add gitlab https://oauth2:${{ secrets.GITLAB_TOKEN }}@gitlab.com/foxixus/neomovies_mobile.git
+          git fetch gitlab main || true
+
+      - name: Check for differences with GitLab
+        id: diffcheck
+        run: |
+          if ! git rev-parse gitlab/main >/dev/null 2>&1; then
+            echo "has_diff=true" >> $GITHUB_OUTPUT
+          else
+            DIFF=$(git rev-list --left-right --count HEAD...gitlab/main | awk '{print $1}')
+            if [[ "$DIFF" -gt 0 ]]; then
+              echo "has_diff=true" >> $GITHUB_OUTPUT
+            else
+              echo "has_diff=false" >> $GITHUB_OUTPUT
+            fi
+          fi
+
+      - name: Push to GitLab if there are changes
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        run: git push gitlab HEAD:main
+
+  mirror-issues:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'issues'
+    steps:
+      - name: Sync issue to GitLab
+        run: |
+          curl --request POST "https://gitlab.com/api/v4/projects/foxixus%2Fneomovies_mobile/issues" \
+            --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_TOKEN }}" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"title\": \"${{ github.event.issue.title }}\",
+              \"description\": \"${{ github.event.issue.body }}\"
+            }"
+
+  mirror-prs:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - name: Sync PR to GitLab MR
+        run: |
+          curl --request POST "https://gitlab.com/api/v4/projects/foxixus%2Fneomovies_mobile/merge_requests" \
+            --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_TOKEN }}" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"title\": \"${{ github.event.pull_request.title }}\",
+              \"source_branch\": \"${{ github.event.pull_request.head.ref }}\",
+              \"target_branch\": \"${{ github.event.pull_request.base.ref }}\",
+              \"description\": \"${{ github.event.pull_request.body }}\"
+            }"

.github/workflows/release.yml

@@ -0,0 +1,278 @@
+name: Build and Release
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
+      - dev
+
+jobs:
+  build-arm64:
+    name: Build APK (ARM64)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build ARM64 APK
+        run: flutter build apk --release --target-platform android-arm64 --split-per-abi
+
+      - name: Upload ARM64 APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk-arm64
+          path: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+          retention-days: 30
+
+  build-arm32:
+    name: Build APK (ARM32)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Update version from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION_NAME=${GITHUB_REF#refs/tags/v}
+          BUILD_NUMBER=$(echo $VERSION_NAME | sed 's/[^0-9]//g')
+          echo "Updating version to $VERSION_NAME+$BUILD_NUMBER"
+          sed -i "s/^version: .*/version: $VERSION_NAME+$BUILD_NUMBER/" pubspec.yaml
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build ARM32 APK
+        run: flutter build apk --release --target-platform android-arm --split-per-abi
+
+      - name: Upload ARM32 APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk-arm32
+          path: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+          retention-days: 30
+
+  build-x64:
+    name: Build APK (x86_64)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build x86_64 APK
+        run: flutter build apk --release --target-platform android-x64 --split-per-abi
+
+      - name: Upload x86_64 APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk-x64
+          path: build/app/outputs/flutter-apk/app-x86_64-release.apk
+          retention-days: 30
+
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    needs: [build-arm64, build-arm32, build-x64]
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download ARM64 APK
+        uses: actions/download-artifact@v4
+        with:
+          name: apk-arm64
+          path: ./apks
+
+      - name: Download ARM32 APK
+        uses: actions/download-artifact@v4
+        with:
+          name: apk-arm32
+          path: ./apks
+
+      - name: Download x86_64 APK
+        uses: actions/download-artifact@v4
+        with:
+          name: apk-x64
+          path: ./apks
+
+      - name: Generate version
+        id: version
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          else
+            VERSION="v0.0.${{ github.run_number }}"
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Version: $VERSION"
+
+      - name: Get file sizes
+        id: sizes
+        run: |
+          ARM64_SIZE=$(du -h ./apks/app-arm64-v8a-release.apk | cut -f1)
+          ARM32_SIZE=$(du -h ./apks/app-armeabi-v7a-release.apk | cut -f1)
+          X64_SIZE=$(du -h ./apks/app-x86_64-release.apk | cut -f1)
+          
+          echo "arm64_size=$ARM64_SIZE" >> $GITHUB_OUTPUT
+          echo "arm32_size=$ARM32_SIZE" >> $GITHUB_OUTPUT
+          echo "x64_size=$X64_SIZE" >> $GITHUB_OUTPUT
+
+      - name: Create Release Notes
+        id: notes
+        run: |
+          cat << EOF > release_notes.md
+          ## NeoMovies Mobile ${{ steps.version.outputs.version }}
+
+          **Build Info:**
+          - Commit: \`${{ github.sha }}\`
+          - Branch: \`${{ github.ref_name }}\`
+          - Workflow Run: [#${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
+          **Downloads:**
+          - **ARM64 (arm64-v8a)**: \`app-arm64-v8a-release.apk\` (${{ steps.sizes.outputs.arm64_size }}) - Recommended for modern devices
+          - **ARM32 (armeabi-v7a)**: \`app-armeabi-v7a-release.apk\` (${{ steps.sizes.outputs.arm32_size }}) - For older devices
+          - **x86_64**: \`app-x86_64-release.apk\` (${{ steps.sizes.outputs.x64_size }}) - For emulators
+
+          ### What's Changed
+          See the [full commit history](${{ github.server_url }}/${{ github.repository }}/compare/${{ github.event.before }}...${{ github.sha }})
+          EOF
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.version.outputs.version }}
+          name: NeoMovies ${{ steps.version.outputs.version }}
+          body_path: release_notes.md
+          draft: false
+          prerelease: ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/') }}
+          make_latest: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
+          files: |
+            ./apks/app-arm64-v8a-release.apk
+            ./apks/app-armeabi-v7a-release.apk
+            ./apks/app-x86_64-release.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish to Telegram
+        run: |
+          # Prepare Telegram message
+          VERSION="${{ steps.version.outputs.version }}"
+          COMMIT_SHA="${{ github.sha }}"
+          BRANCH="${{ github.ref_name }}"
+          RUN_NUMBER="${{ github.run_number }}"
+          REPO_URL="${{ github.server_url }}/${{ github.repository }}"
+          
+          # Create message text
+          MESSAGE="🚀 *NeoMovies Mobile ${VERSION}*
+          
+          📋 *Build Info:*
+          • Commit: \`${COMMIT_SHA:0:7}\`
+          • Branch: \`${BRANCH}\`
+          • Workflow Run: [#${RUN_NUMBER}](${REPO_URL}/actions/runs/${{ github.run_id }})
+          
+          📦 *Downloads:*
+          • *ARM64 (arm64-v8a)*: ${{ steps.sizes.outputs.arm64_size }} - Recommended for modern devices
+          • *ARM32 (armeabi-v7a)*: ${{ steps.sizes.outputs.arm32_size }} - For older devices
+          • *x86_64*: ${{ steps.sizes.outputs.x64_size }} - For emulators
+          
+          🔗 [View Release](${REPO_URL}/releases/tag/${VERSION})"
+          
+          # Send message to Telegram
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
+            -H "Content-Type: application/json" \
+            -d "{
+              \"chat_id\": \"${{ secrets.TELEGRAM_CHAT_ID }}\",
+              \"text\": \"$MESSAGE\",
+              \"parse_mode\": \"Markdown\",
+              \"disable_web_page_preview\": true
+            }"
+          
+          # Send APK files
+          echo "Uploading ARM64 APK to Telegram..."
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendDocument" \
+            -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" \
+            -F "document=@./apks/app-arm64-v8a-release.apk" \
+            -F "caption=📱 NeoMovies ${VERSION} - ARM64 (Recommended)"
+          
+          echo "Uploading ARM32 APK to Telegram..."
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendDocument" \
+            -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" \
+            -F "document=@./apks/app-armeabi-v7a-release.apk" \
+            -F "caption=📱 NeoMovies ${VERSION} - ARM32 (For older devices)"
+          
+          echo "Uploading x86_64 APK to Telegram..."
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendDocument" \
+            -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" \
+            -F "document=@./apks/app-x86_64-release.apk" \
+            -F "caption=📱 NeoMovies ${VERSION} - x86_64 (For emulators)"
+          
+          echo "Telegram notification sent successfully!"
+
+      - name: Summary
+        run: |
+          echo "## Release Created Successfully!" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Version:** ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Release URL:** ${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Telegram:** Published to channel" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### APK Files:" >> $GITHUB_STEP_SUMMARY
+          echo "- ARM64: ${{ steps.sizes.outputs.arm64_size }}" >> $GITHUB_STEP_SUMMARY
+          echo "- ARM32: ${{ steps.sizes.outputs.arm32_size }}" >> $GITHUB_STEP_SUMMARY
+          echo "- x86_64: ${{ steps.sizes.outputs.x64_size }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/test.yml

@@ -0,0 +1,148 @@
+name: Test and Analyze
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - 'feature/**'
+      - 'torrent-engine-downloads'
+  pull_request:
+    branches:
+      - main
+      - dev
+
+jobs:
+  flutter-analyze:
+    name: Flutter Analyze
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.19.6'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Run code generation
+        run: |
+          dart run build_runner build --delete-conflicting-outputs || true
+
+      - name: Run Flutter Analyze
+        run: flutter analyze --no-fatal-infos
+
+      - name: Check formatting
+        run: dart format --set-exit-if-changed .
+
+  flutter-test:
+    name: Flutter Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Run tests
+        run: flutter test --coverage
+
+      - name: Run Integration tests  
+        run: flutter test test/integration/ --reporter=expanded
+        env:
+          # Mark that we're running in CI
+          CI: true
+          GITHUB_ACTIONS: true
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./coverage/lcov.info
+          fail_ci_if_error: false
+        if: always()
+
+  android-lint:
+    name: Android Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Run Android Lint
+        run: |
+          cd android
+          chmod +x gradlew
+          ./gradlew lint
+
+      - name: Upload lint reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-lint-reports
+          path: |
+            android/app/build/reports/lint-*.html
+            android/torrentengine/build/reports/lint-*.html
+          retention-days: 7
+        if: always()
+
+  build-debug:
+    name: Build Debug APK
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' || github.ref == 'refs/heads/dev'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.35.5'
+          channel: 'stable'
+          cache: true
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Build Debug APK
+        run: flutter build apk --debug
+
+      - name: Upload Debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: apk-debug
+          path: build/app/outputs/flutter-apk/app-debug.apk
+          retention-days: 7

.gitlab-ci.yml

@@ -1,132 +1,127 @@
 stages:
-  - build
   - test
+  - build
   - deploy
 
 variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs='-Xmx2048m' -Dorg.gradle.parallel=true"
-  GRADLE_USER_HOME: "${CI_PROJECT_DIR}/.gradle"
+  FLUTTER_VERSION: "stable"
+  # Optimize for RAM usage
+  FLUTTER_BUILD_FLAGS: "--split-debug-info=./debug-symbols --obfuscate --dart-define=dart.vm.profile=false"
   PUB_CACHE: "${CI_PROJECT_DIR}/.pub-cache"
 
 cache:
-  key: ${CI_COMMIT_REF_SLUG}
   paths:
-    - .gradle/
     - .pub-cache/
-    - android/.gradle/
-    - build/
 
-build:torrent-engine:
-  stage: build
-  image: mingc/android-build-box:latest
+# Test stage - runs first to catch issues early
+test:dart:
+  stage: test
+  image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
   script:
-    - cd android
-    - chmod +x gradlew
-    - ./gradlew :torrentengine:assembleRelease --no-daemon --stacktrace
+    - flutter --version
+    - flutter pub get
+    - flutter analyze --fatal-warnings
+    - flutter test --coverage
+    - flutter build web --release --dart-define=dart.vm.profile=false
   artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage/cobertura.xml
     paths:
-      - android/torrentengine/build/outputs/aar/*.aar
-    expire_in: 30 days
+      - coverage/
+      - build/web/
+    expire_in: 7 days
   rules:
-    - if: $CI_COMMIT_BRANCH == "dev"
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH =~ /^feature\//
+    - if: $CI_MERGE_REQUEST_IID
+    - if: $CI_COMMIT_BRANCH
     - if: $CI_COMMIT_TAG
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
 
-build:apk-debug:
+build:apk:arm64:
   stage: build
-  image: ghcr.io/cirruslabs/flutter:stable
+  image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
   script:
     - flutter pub get
-    - flutter build apk --debug
-  artifacts:
-    paths:
-      - build/app/outputs/flutter-apk/app-debug.apk
-    expire_in: 1 week
-  rules:
-    - if: $CI_COMMIT_BRANCH == "dev"
-    - if: $CI_COMMIT_BRANCH =~ /^feature\//
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  allow_failure: true
-
-build:apk-release:
-  stage: build
-  image: ghcr.io/cirruslabs/flutter:stable
-  script:
-    - flutter pub get
-    - flutter build apk --release --split-per-abi
+    - mkdir -p debug-symbols
+    - flutter build apk --release --target-platform android-arm64 --split-per-abi ${FLUTTER_BUILD_FLAGS}
   artifacts:
     paths:
       - build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+    expire_in: 30 days
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: always
+    - if: $CI_COMMIT_BRANCH =~ /^dev|main/
+      when: on_success
+
+build:apk:arm:
+  stage: build
+  image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
+  before_script:
+    # Update version from tag if present
+    - |
+      if [ -n "$CI_COMMIT_TAG" ]; then
+        VERSION_NAME="${CI_COMMIT_TAG#v}"
+        BUILD_NUMBER=$(echo $CI_COMMIT_TAG | sed 's/[^0-9]//g')
+        echo "Updating version to $VERSION_NAME+$BUILD_NUMBER"
+        sed -i "s/^version: .*/version: $VERSION_NAME+$BUILD_NUMBER/" pubspec.yaml
+      fi
+  script:
+    - flutter pub get
+    - mkdir -p debug-symbols
+    - flutter build apk --release --target-platform android-arm --split-per-abi ${FLUTTER_BUILD_FLAGS}
+  artifacts:
+    paths:
       - build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+    expire_in: 30 days
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: always
+    - if: $CI_COMMIT_BRANCH =~ /^dev|main/
+      when: on_success
+
+build:apk:x64:
+  stage: build
+  image: ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION}
+  script:
+    - flutter pub get
+    - mkdir -p debug-symbols
+    - flutter build apk --release --target-platform android-x64 --split-per-abi ${FLUTTER_BUILD_FLAGS}
+  artifacts:
+    paths:
       - build/app/outputs/flutter-apk/app-x86_64-release.apk
     expire_in: 30 days
   rules:
-    - if: $CI_COMMIT_BRANCH == "dev"
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH =~ /^feature\//
     - if: $CI_COMMIT_TAG
-  allow_failure: true
-
-test:flutter-analyze:
-  stage: test
-  image: ghcr.io/cirruslabs/flutter:stable
-  script:
-    - flutter pub get
-    - flutter analyze
-  rules:
-    - if: $CI_COMMIT_BRANCH == "dev"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  allow_failure: true
-
-test:android-lint:
-  stage: test
-  image: mingc/android-build-box:latest
-  script:
-    - cd android
-    - chmod +x gradlew
-    - ./gradlew lint --no-daemon
-  artifacts:
-    paths:
-      - android/app/build/reports/lint-*.html
-      - android/torrentengine/build/reports/lint-*.html
-    expire_in: 1 week
-    when: always
-  rules:
-    - if: $CI_COMMIT_BRANCH == "dev"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  allow_failure: true
+      when: always
+    - if: $CI_COMMIT_BRANCH =~ /^dev|main/
+      when: on_success
 
 deploy:release:
   stage: deploy
   image: alpine:latest
   needs:
-    - build:apk-release
-    - build:torrent-engine
+    - build:apk:arm64
+    - build:apk:arm
+    - build:apk:x64
   before_script:
-    - apk add --no-cache curl jq
+    - apk add --no-cache curl jq coreutils
   script:
     - |
-      # Определяем версию релиза
       if [ -n "$CI_COMMIT_TAG" ]; then
         VERSION="$CI_COMMIT_TAG"
       else
-        # Автоматическая версия из коммита
         VERSION="v0.0.${CI_PIPELINE_ID}"
       fi
       
-      echo "📦 Creating GitLab Release: $VERSION"
-      echo "📝 Commit: ${CI_COMMIT_SHORT_SHA}"
-      echo "🔗 Branch: ${CI_COMMIT_BRANCH}"
+      echo "Creating GitLab Release: $VERSION"
+      echo "Commit: ${CI_COMMIT_SHORT_SHA}"
+      echo "Branch: ${CI_COMMIT_BRANCH}"
       
-      # Проверяем наличие APK файлов
       APK_ARM64="build/app/outputs/flutter-apk/app-arm64-v8a-release.apk"
       APK_ARM32="build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk"
       APK_X86="build/app/outputs/flutter-apk/app-x86_64-release.apk"
-      AAR_TORRENT="android/torrentengine/build/outputs/aar/torrentengine-release.aar"
       
-      # Создаем описание релиза
       RELEASE_DESCRIPTION="## NeoMovies Mobile ${VERSION}
 
       **Build Info:**
@@ -134,68 +129,136 @@ deploy:release:
       - Branch: \`${CI_COMMIT_BRANCH}\`
       - Pipeline: [#${CI_PIPELINE_ID}](${CI_PIPELINE_URL})
 
-      **Downloads:**
-      "
+      **Downloads:**"
       
-      # Подсчитываем файлы
       FILE_COUNT=0
-      [ -f "$APK_ARM64" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM64 APK: \`app-arm64-v8a-release.apk\`"
-      [ -f "$APK_ARM32" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM32 APK: \`app-armeabi-v7a-release.apk\`"
-      [ -f "$APK_X86" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- x86_64 APK: \`app-x86_64-release.apk\`"
-      [ -f "$AAR_TORRENT" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- TorrentEngine Library: \`torrentengine-release.aar\`"
+      
+      if [ -f "$APK_ARM64" ]; then
+        FILE_COUNT=$((FILE_COUNT+1))
+        SIZE_ARM64=$(du -h "$APK_ARM64" | cut -f1)
+        RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM64 (arm64-v8a): \`app-arm64-v8a-release.apk\` (${SIZE_ARM64}) - Recommended for modern devices"
+      fi
+      
+      if [ -f "$APK_ARM32" ]; then
+        FILE_COUNT=$((FILE_COUNT+1))
+        SIZE_ARM32=$(du -h "$APK_ARM32" | cut -f1)
+        RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM32 (armeabi-v7a): \`app-armeabi-v7a-release.apk\` (${SIZE_ARM32}) - For older devices"
+      fi
+      
+      if [ -f "$APK_X86" ]; then
+        FILE_COUNT=$((FILE_COUNT+1))
+        SIZE_X86=$(du -h "$APK_X86" | cut -f1)
+        RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- x86_64: \`app-x86_64-release.apk\` (${SIZE_X86}) - For emulators"
+      fi
       
       if [ $FILE_COUNT -eq 0 ]; then
-        echo "❌ No release artifacts found!"
+        echo "No release artifacts found!"
         exit 1
       fi
       
-      echo "✅ Found $FILE_COUNT artifact(s) to release"
+      echo "Found $FILE_COUNT artifact(s) to release"
       
-      # Создаем релиз через GitLab API
-      RELEASE_PAYLOAD=$(cat <<EOF
-      {
-        "name": "NeoMovies ${VERSION}",
-        "tag_name": "${VERSION}",
-        "description": "${RELEASE_DESCRIPTION}",
-        "ref": "${CI_COMMIT_SHA}",
-        "assets": {
-          "links": []
-        }
-      }
-      EOF
-      )
+      RELEASE_DATA=$(jq -n \
+        --arg name "NeoMovies ${VERSION}" \
+        --arg tag "${VERSION}" \
+        --arg desc "$RELEASE_DESCRIPTION" \
+        --arg ref "${CI_COMMIT_SHA}" \
+        '{name: $name, tag_name: $tag, description: $desc, ref: $ref}')
       
-      echo "🚀 Creating release via GitLab API..."
+      echo "Creating release via GitLab API..."
       
-      RESPONSE=$(curl --fail-with-body -s -X POST \
+      curl --fail-with-body -s -X POST \
         "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases" \
         --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
         --header "Content-Type: application/json" \
-        --data "${RELEASE_PAYLOAD}" || echo "FAILED")
+        --data "$RELEASE_DATA" || \
+      curl -s -X PUT \
+        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}" \
+        --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+        --header "Content-Type: application/json" \
+        --data "$RELEASE_DATA"
       
-      if [ "$RESPONSE" = "FAILED" ]; then
-        echo "⚠️  Release API call failed, trying alternative method..."
-        # Если релиз уже существует, пробуем обновить
-        curl -s -X PUT \
-          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}" \
+      echo ""
+      echo "Uploading APK files to Package Registry..."
+      
+      if [ -f "$APK_ARM64" ]; then
+        echo "Uploading app-arm64-v8a-release.apk..."
+        curl --fail -s --request PUT \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --upload-file "$APK_ARM64" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-arm64-v8a-release.apk"
+        
+        LINK_DATA=$(jq -n \
+          --arg name "app-arm64-v8a-release.apk" \
+          --arg url "${CI_PROJECT_URL}/-/package_files/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-arm64-v8a-release.apk" \
+          --arg type "package" \
+          '{name: $name, url: $url, link_type: $type}')
+        
+        curl -s --request POST \
           --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
           --header "Content-Type: application/json" \
-          --data "${RELEASE_PAYLOAD}"
+          --data "$LINK_DATA" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}/assets/links"
+        
+        echo "ARM64 APK uploaded"
+      fi
+      
+      if [ -f "$APK_ARM32" ]; then
+        echo "Uploading app-armeabi-v7a-release.apk..."
+        curl --fail -s --request PUT \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --upload-file "$APK_ARM32" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-armeabi-v7a-release.apk"
+        
+        LINK_DATA=$(jq -n \
+          --arg name "app-armeabi-v7a-release.apk" \
+          --arg url "${CI_PROJECT_URL}/-/package_files/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-armeabi-v7a-release.apk" \
+          --arg type "package" \
+          '{name: $name, url: $url, link_type: $type}')
+        
+        curl -s --request POST \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --header "Content-Type: application/json" \
+          --data "$LINK_DATA" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}/assets/links"
+        
+        echo "ARM32 APK uploaded"
+      fi
+      
+      if [ -f "$APK_X86" ]; then
+        echo "Uploading app-x86_64-release.apk..."
+        curl --fail -s --request PUT \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --upload-file "$APK_X86" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-x86_64-release.apk"
+        
+        LINK_DATA=$(jq -n \
+          --arg name "app-x86_64-release.apk" \
+          --arg url "${CI_PROJECT_URL}/-/package_files/${CI_PROJECT_ID}/packages/generic/neomovies/${VERSION}/app-x86_64-release.apk" \
+          --arg type "package" \
+          '{name: $name, url: $url, link_type: $type}')
+        
+        curl -s --request POST \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --header "Content-Type: application/json" \
+          --data "$LINK_DATA" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}/assets/links"
+        
+        echo "x86_64 APK uploaded"
       fi
       
       echo ""
-      echo "✅ Release created successfully!"
-      echo "🔗 View release: ${CI_PROJECT_URL}/-/releases/${VERSION}"
-      echo "📦 Pipeline artifacts: ${CI_JOB_URL}/artifacts/browse"
+      echo "================================================"
+      echo "Release created successfully!"
+      echo "View release: ${CI_PROJECT_URL}/-/releases/${VERSION}"
+      echo "Pipeline artifacts: ${CI_JOB_URL}/artifacts/browse"
+      echo "================================================"
   artifacts:
     paths:
       - build/app/outputs/flutter-apk/*.apk
-      - android/torrentengine/build/outputs/aar/*.aar
     expire_in: 90 days
   rules:
     - if: $CI_COMMIT_TAG
       when: always
-    - if: $CI_COMMIT_BRANCH == "dev"
-      when: on_success
-    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_BRANCH =~ /^dev|main/
       when: on_success

CI_CD_README.md

@@ -1,304 +0,0 @@
-# 🚀 CI/CD Configuration для NeoMovies Mobile
-
-## 📋 Обзор
-
-Автоматическая сборка APK и TorrentEngine модуля с оптимизацией использования RAM.
-
----
-
-## 🏗️ Конфигурации
-
-### 1. **GitLab CI/CD** (`.gitlab-ci.yml`)
-
-Основная конфигурация для GitLab:
-
-#### **Stages:**
-- **build** - Сборка APK и AAR
-- **test** - Анализ кода и тесты
-- **deploy** - Публикация релизов
-
-#### **Jobs:**
-
-| Job | Описание | Артефакты | Ветки |
-|-----|----------|-----------|-------|
-| `build:torrent-engine` | Сборка TorrentEngine AAR | `*.aar` | dev, feature/*, MR |
-| `build:apk-debug` | Сборка Debug APK | `app-debug.apk` | dev, feature/*, MR |
-| `build:apk-release` | Сборка Release APK | `app-arm64-v8a-release.apk` | только dev |
-| `test:flutter-analyze` | Анализ Dart кода | - | dev, MR |
-| `test:android-lint` | Android Lint | HTML отчеты | dev, MR |
-| `deploy:release` | Публикация релиза | - | только tags (manual) |
-
-### 2. **GitHub Actions** (`.github/workflows/build.yml`)
-
-Альтернативная конфигурация для GitHub:
-
-#### **Workflows:**
-
-| Workflow | Триггер | Описание |
-|----------|---------|----------|
-| `build-torrent-engine` | push, PR | Сборка AAR модуля |
-| `build-debug-apk` | push, PR | Debug APK для тестирования |
-| `build-release-apk` | push to dev | Release APK (split-per-abi) |
-| `code-quality` | push, PR | Flutter analyze + Android Lint |
-
----
-
-## ⚙️ Оптимизация RAM
-
-### **gradle.properties**
-
-```properties
-# Уменьшено с 4GB до 2GB
-org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
-
-# Kotlin daemon с ограничением
-kotlin.daemon.jvmargs=-Xmx1G -XX:MaxMetaspaceSize=512m
-
-# Включены оптимизации
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configureondemand=true
-```
-
-### **CI переменные**
-
-```bash
-# В CI используется еще меньше RAM
-GRADLE_OPTS="-Xmx1536m -XX:MaxMetaspaceSize=512m"
-```
-
----
-
-## 📦 Артефакты
-
-### **TorrentEngine AAR:**
-- Путь: `android/torrentengine/build/outputs/aar/`
-- Файл: `torrentengine-release.aar`
-- Срок хранения: 7 дней
-- Размер: ~5-10 MB
-
-### **Debug APK:**
-- Путь: `build/app/outputs/flutter-apk/`
-- Файл: `app-debug.apk`
-- Срок хранения: 7 дней
-- Размер: ~50-80 MB
-
-### **Release APK:**
-- Путь: `build/app/outputs/flutter-apk/`
-- Файл: `app-arm64-v8a-release.apk`
-- Срок хранения: 30 дней
-- Размер: ~30-50 MB (split-per-abi)
-
----
-
-## 🚦 Триггеры сборки
-
-### **GitLab:**
-
-**Автоматически запускается при:**
-- Push в `dev` ветку
-- Push в `feature/torrent-engine-integration`
-- Создание Merge Request
-- Push тега (для deploy)
-
-**Ручной запуск:**
-- Web UI → Pipelines → Run Pipeline
-- Выбрать ветку и нажать "Run pipeline"
-
-### **GitHub:**
-
-**Автоматически запускается при:**
-- Push в `dev` или `feature/torrent-engine-integration`
-- Pull Request в `dev`
-
-**Ручной запуск:**
-- Actions → Build NeoMovies Mobile → Run workflow
-
----
-
-## 🔧 Настройка GitLab Instance Runners
-
-### **Рекомендуется: Использовать GitLab Instance Runners (SaaS)**
-
-GitLab предоставляет 112+ бесплатных shared runners для всех проектов!
-
-**Как включить:**
-
-1. Перейдите в **Settings → CI/CD → Runners**
-2. Найдите секцию **"Instance runners"**
-3. Нажмите **"Enable instance runners for this project"**
-4. Готово! ✅
-
-**Доступные теги для Instance Runners:**
-
-| Тег | RAM | CPU | Описание |
-|-----|-----|-----|----------|
-| `saas-linux-small-amd64` | 2 GB | 1 core | Легкие задачи |
-| `saas-linux-medium-amd64` | 4 GB | 2 cores | **Рекомендуется для Android** |
-| `saas-linux-large-amd64` | 8 GB | 4 cores | Тяжелые сборки |
-| `docker` | varies | varies | Любой Docker runner |
-
-**Наша конфигурация использует:**
-- TorrentEngine: `saas-linux-medium-amd64` (4GB, 2 cores)
-- Остальные jobs: `docker` (автоматический выбор)
-
----
-
-### **Альтернатива: Локальный Runner (не требуется)**
-
-Только если нужна кастомная конфигурация:
-
-```bash
-# 1. Установка GitLab Runner
-curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | sudo bash
-sudo apt-get install gitlab-runner
-
-# 2. Регистрация Runner
-sudo gitlab-runner register \
-  --url https://gitlab.com/ \
-  --registration-token YOUR_TOKEN \
-  --executor docker \
-  --docker-image mingc/android-build-box:latest \
-  --tag-list docker,android
-
-# 3. Запуск
-sudo gitlab-runner start
-```
-
----
-
-## 📊 Время сборки (примерно)
-
-| Job | Время | RAM | CPU |
-|-----|-------|-----|-----|
-| TorrentEngine | ~5-10 мин | 1.5GB | 2 cores |
-| Debug APK | ~15-20 мин | 2GB | 2 cores |
-| Release APK | ~20-30 мин | 2GB | 2 cores |
-| Flutter Analyze | ~2-3 мин | 512MB | 1 core |
-| Android Lint | ~5-8 мин | 1GB | 2 cores |
-
----
-
-## 🐳 Docker образы
-
-### **mingc/android-build-box:latest**
-
-Включает:
-- Android SDK (latest)
-- Flutter SDK
-- Java 17
-- Gradle
-- Git, curl, wget
-
-Размер: ~8GB
-
----
-
-## 🔍 Кэширование
-
-Для ускорения сборок используется кэширование:
-
-```yaml
-cache:
-  paths:
-    - .gradle/           # Gradle dependencies
-    - .pub-cache/        # Flutter packages
-    - android/.gradle/   # Android build cache
-    - build/             # Flutter build cache
-```
-
-**Эффект:**
-- Первая сборка: ~25 минут
-- Последующие: ~10-15 минут (с кэшем)
-
----
-
-## 📝 Логи и отладка
-
-### **Просмотр логов GitLab:**
-
-1. Перейти в **CI/CD → Pipelines**
-2. Выбрать pipeline
-3. Кликнуть на job для просмотра логов
-
-### **Отладка локально:**
-
-```bash
-# Тестирование сборки TorrentEngine
-cd android
-./gradlew :torrentengine:assembleRelease \
-  --no-daemon \
-  --parallel \
-  --stacktrace
-
-# Тестирование Flutter APK
-flutter build apk --debug --verbose
-```
-
----
-
-## 🚨 Troubleshooting
-
-### **Gradle daemon crashed:**
-
-**Проблема:** `Gradle build daemon disappeared unexpectedly`
-
-**Решение:**
-```bash
-# Увеличить RAM в gradle.properties
-org.gradle.jvmargs=-Xmx3G
-
-# Или отключить daemon
-./gradlew --no-daemon
-```
-
-### **Out of memory:**
-
-**Проблема:** `OutOfMemoryError: Java heap space`
-
-**Решение:**
-```bash
-# Увеличить heap в CI
-GRADLE_OPTS="-Xmx2048m -XX:MaxMetaspaceSize=768m"
-```
-
-### **LibTorrent4j native libraries not found:**
-
-**Проблема:** Нативные библиотеки не найдены
-
-**Решение:**
-- Убедиться что все архитектуры включены в `build.gradle.kts`
-- Проверить `splits.abi` конфигурацию
-
----
-
-## 📚 Дополнительные ресурсы
-
-- [GitLab CI/CD Docs](https://docs.gitlab.com/ee/ci/)
-- [GitHub Actions Docs](https://docs.github.com/actions)
-- [Flutter CI/CD Guide](https://docs.flutter.dev/deployment/cd)
-- [Gradle Performance](https://docs.gradle.org/current/userguide/performance.html)
-
----
-
-## 🎯 Следующие шаги
-
-1. **Настроить GitLab Runner** (если еще не настроен)
-2. **Запушить изменения** в dev ветку
-3. **Проверить Pipeline** в GitLab CI/CD
-4. **Скачать артефакты** после успешной сборки
-5. **Протестировать APK** на реальном устройстве
-
----
-
-## 📞 Поддержка
-
-При проблемах с CI/CD:
-1. Проверьте логи pipeline
-2. Убедитесь что Runner активен
-3. Проверьте доступность Docker образа
-4. Создайте issue с логами ошибки
-
----
-
-**Создано с ❤️ для NeoMovies Mobile**

DEVELOPMENT_SUMMARY.md

@@ -1,408 +0,0 @@
-# 📝 Development Summary - NeoMovies Mobile
-
-## 🎯 Выполненные задачи
-
-### 1. ⚡ Торрент Движок (TorrentEngine Library)
-
-Создана **полноценная библиотека для работы с торрентами** как отдельный модуль Android:
-
-#### 📦 Структура модуля:
-```
-android/torrentengine/
-├── build.gradle.kts              # Конфигурация с LibTorrent4j
-├── proguard-rules.pro            # ProGuard правила
-├── consumer-rules.pro            # Consumer ProGuard rules
-├── README.md                     # Подробная документация
-└── src/main/
-    ├── AndroidManifest.xml       # Permissions и Service
-    └── java/com/neomovies/torrentengine/
-        ├── TorrentEngine.kt      # Главный API класс
-        ├── models/
-        │   └── TorrentInfo.kt    # Модели данных (TorrentInfo, TorrentFile, etc.)
-        ├── database/
-        │   ├── TorrentDao.kt     # Room DAO
-        │   ├── TorrentDatabase.kt
-        │   └── Converters.kt     # Type converters
-        └── service/
-            └── TorrentService.kt # Foreground service
-```
-
-#### ✨ Возможности TorrentEngine:
-
-1. **Загрузка из magnet-ссылок**
-   - Автоматическое получение метаданных
-   - Парсинг файлов и их размеров
-   - Поддержка DHT и LSD
-
-2. **Управление файлами**
-   - Выбор файлов ДО начала загрузки
-   - Изменение приоритетов В ПРОЦЕССЕ загрузки
-   - Фильтрация по типу (видео, аудио и т.д.)
-   - 5 уровней приоритета: DONT_DOWNLOAD, LOW, NORMAL, HIGH, MAXIMUM
-
-3. **Foreground Service с уведомлением**
-   - Постоянное уведомление (не удаляется пока активны торренты)
-   - Отображение скорости загрузки/отдачи
-   - Список активных торрентов с прогрессом
-   - Кнопки управления (Pause All)
-
-4. **Персистентность (Room Database)**
-   - Автоматическое сохранение состояния
-   - Восстановление торрентов после перезагрузки
-   - Реактивные Flow для мониторинга изменений
-
-5. **Полная статистика**
-   - Скорость загрузки/отдачи (real-time)
-   - Количество пиров и сидов
-   - Прогресс загрузки (%)
-   - ETA (время до завершения)
-   - Share ratio (отдано/скачано)
-
-6. **Контроль раздач**
-   - `addTorrent()` - добавить торрент
-   - `pauseTorrent()` - поставить на паузу
-   - `resumeTorrent()` - возобновить
-   - `removeTorrent()` - удалить (с файлами или без)
-   - `setFilePriority()` - изменить приоритет файла
-   - `setFilePriorities()` - массовое изменение приоритетов
-
-#### 📚 Использование:
-
-```kotlin
-// Инициализация
-val torrentEngine = TorrentEngine.getInstance(context)
-torrentEngine.startStatsUpdater()
-
-// Добавление торрента
-val infoHash = torrentEngine.addTorrent(magnetUri, savePath)
-
-// Мониторинг (реактивно)
-torrentEngine.getAllTorrentsFlow().collect { torrents ->
-    torrents.forEach { torrent ->
-        println("${torrent.name}: ${torrent.progress * 100}%")
-    }
-}
-
-// Изменение приоритетов файлов
-torrent.files.forEachIndexed { index, file ->
-    if (file.isVideo()) {
-        torrentEngine.setFilePriority(infoHash, index, FilePriority.HIGH)
-    }
-}
-
-// Управление
-torrentEngine.pauseTorrent(infoHash)
-torrentEngine.resumeTorrent(infoHash)
-torrentEngine.removeTorrent(infoHash, deleteFiles = true)
-```
-
-### 2. 🔄 Новый API Client (NeoMoviesApiClient)
-
-Полностью переписан API клиент для работы с **новым Go-based бэкендом (neomovies-api)**:
-
-#### 📍 Файл: `lib/data/api/neomovies_api_client.dart`
-
-#### 🆕 Новые возможности:
-
-**Аутентификация:**
-- ✅ `register()` - регистрация с отправкой кода на email
-- ✅ `verifyEmail()` - подтверждение email кодом
-- ✅ `resendVerificationCode()` - повторная отправка кода
-- ✅ `login()` - вход по email/password
-- ✅ `getGoogleOAuthUrl()` - URL для Google OAuth
-- ✅ `refreshToken()` - обновление JWT токена
-- ✅ `getProfile()` - получение профиля
-- ✅ `deleteAccount()` - удаление аккаунта
-
-**Фильмы:**
-- ✅ `getPopularMovies()` - популярные фильмы
-- ✅ `getTopRatedMovies()` - топ рейтинг
-- ✅ `getUpcomingMovies()` - скоро выйдут
-- ✅ `getNowPlayingMovies()` - сейчас в кино
-- ✅ `getMovieById()` - детали фильма
-- ✅ `getMovieRecommendations()` - рекомендации
-- ✅ `searchMovies()` - поиск фильмов
-
-**Сериалы:**
-- ✅ `getPopularTvShows()` - популярные сериалы
-- ✅ `getTopRatedTvShows()` - топ сериалы
-- ✅ `getTvShowById()` - детали сериала
-- ✅ `getTvShowRecommendations()` - рекомендации
-- ✅ `searchTvShows()` - поиск сериалов
-
-**Избранное:**
-- ✅ `getFavorites()` - список избранного
-- ✅ `addFavorite()` - добавить в избранное
-- ✅ `removeFavorite()` - удалить из избранного
-
-**Реакции (новое!):**
-- ✅ `getReactionCounts()` - количество лайков/дизлайков
-- ✅ `setReaction()` - поставить like/dislike
-- ✅ `getMyReactions()` - мои реакции
-
-**Торренты (новое!):**
-- ✅ `searchTorrents()` - поиск торрентов через RedAPI
-  - По IMDb ID
-  - Фильтры: quality, season, episode
-  - Поддержка фильмов и сериалов
-
-**Плееры (новое!):**
-- ✅ `getAllohaPlayer()` - Alloha embed URL
-- ✅ `getLumexPlayer()` - Lumex embed URL
-- ✅ `getVibixPlayer()` - Vibix embed URL
-
-#### 🔧 Пример использования:
-
-```dart
-final apiClient = NeoMoviesApiClient(http.Client());
-
-// Регистрация с email verification
-await apiClient.register(
-  email: 'user@example.com',
-  password: 'password123',
-  name: 'John Doe',
-);
-
-// Подтверждение кода
-final authResponse = await apiClient.verifyEmail(
-  email: 'user@example.com',
-  code: '123456',
-);
-
-// Поиск торрентов
-final torrents = await apiClient.searchTorrents(
-  imdbId: 'tt1234567',
-  type: 'movie',
-  quality: '1080p',
-);
-
-// Получить плеер
-final player = await apiClient.getAllohaPlayer('tt1234567');
-```
-
-### 3. 📊 Новые модели данных
-
-Созданы модели для новых фич:
-
-#### `PlayerResponse` (`lib/data/models/player/player_response.dart`):
-```dart
-class PlayerResponse {
-  final String? embedUrl;
-  final String? playerType;
-  final String? error;
-}
-```
-
-### 4. 📖 Документация
-
-Создана подробная документация:
-- **`android/torrentengine/README.md`** - полное руководство по TorrentEngine
-  - Описание всех возможностей
-  - Примеры использования
-  - API reference
-  - Интеграция с Flutter
-  - Известные проблемы
-
----
-
-## 🚀 Что готово к использованию
-
-### ✅ TorrentEngine Library
-- Полностью функциональный торрент движок
-- Можно использовать как отдельную библиотеку
-- Готов к интеграции с Flutter через MethodChannel
-- Все основные функции реализованы
-
-### ✅ NeoMoviesApiClient
-- Полная поддержка нового API
-- Все endpoints реализованы
-- Готов к замене старого ApiClient
-
-### ✅ База для дальнейшей разработки
-- Структура модуля torrentengine создана
-- Build конфигурация готова
-- ProGuard правила настроены
-- Permissions объявлены
-
----
-
-## 📋 Следующие шаги
-
-### 1. Интеграция TorrentEngine с Flutter
-
-Создать MethodChannel в `MainActivity.kt`:
-
-```kotlin
-class MainActivity: FlutterActivity() {
-    private val TORRENT_CHANNEL = "com.neomovies/torrent"
-    
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-        
-        val torrentEngine = TorrentEngine.getInstance(applicationContext)
-        
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, TORRENT_CHANNEL)
-            .setMethodCallHandler { call, result ->
-                when (call.method) {
-                    "addTorrent" -> {
-                        val magnetUri = call.argument<String>("magnetUri")!!
-                        val savePath = call.argument<String>("savePath")!!
-                        
-                        CoroutineScope(Dispatchers.IO).launch {
-                            try {
-                                val hash = torrentEngine.addTorrent(magnetUri, savePath)
-                                withContext(Dispatchers.Main) {
-                                    result.success(hash)
-                                }
-                            } catch (e: Exception) {
-                                withContext(Dispatchers.Main) {
-                                    result.error("ERROR", e.message, null)
-                                }
-                            }
-                        }
-                    }
-                    "getTorrents" -> {
-                        CoroutineScope(Dispatchers.IO).launch {
-                            try {
-                                val torrents = torrentEngine.getAllTorrents()
-                                val torrentsJson = torrents.map { /* convert to map */ }
-                                withContext(Dispatchers.Main) {
-                                    result.success(torrentsJson)
-                                }
-                            } catch (e: Exception) {
-                                withContext(Dispatchers.Main) {
-                                    result.error("ERROR", e.message, null)
-                                }
-                            }
-                        }
-                    }
-                    // ... другие методы
-                }
-            }
-    }
-}
-```
-
-Создать Dart wrapper:
-
-```dart
-class TorrentEngineService {
-  static const platform = MethodChannel('com.neomovies/torrent');
-  
-  Future<String> addTorrent(String magnetUri, String savePath) async {
-    return await platform.invokeMethod('addTorrent', {
-      'magnetUri': magnetUri,
-      'savePath': savePath,
-    });
-  }
-  
-  Future<List<Map<String, dynamic>>> getTorrents() async {
-    final List<dynamic> result = await platform.invokeMethod('getTorrents');
-    return result.cast<Map<String, dynamic>>();
-  }
-}
-```
-
-### 2. Замена старого API клиента
-
-В файлах сервисов и репозиториев заменить:
-```dart
-// Старое
-final apiClient = ApiClient(http.Client());
-
-// Новое
-final apiClient = NeoMoviesApiClient(http.Client());
-```
-
-### 3. Создание UI для новых фич
-
-**Email Verification Screen:**
-- Ввод кода подтверждения
-- Кнопка "Отправить код повторно"
-- Таймер обратного отсчета
-
-**Torrent List Screen:**
-- Список активных торрентов
-- Прогресс бар для каждого
-- Скорость загрузки/отдачи
-- Кнопки pause/resume/delete
-
-**File Selection Screen:**
-- Список файлов в торренте
-- Checkbox для выбора файлов
-- Slider для приоритета
-- Отображение размера файлов
-
-**Player Selection Screen:**
-- Выбор плеера (Alloha/Lumex/Vibix)
-- WebView для отображения плеера
-
-**Reactions UI:**
-- Кнопки like/dislike
-- Счетчики реакций
-- Анимации при клике
-
-### 4. Тестирование
-
-1. **Компиляция проекта:**
-   ```bash
-   cd neomovies_mobile
-   flutter pub get
-   flutter build apk --debug
-   ```
-
-2. **Тестирование TorrentEngine:**
-   - Добавление magnet-ссылки
-   - Получение метаданных
-   - Выбор файлов
-   - Изменение приоритетов в процессе загрузки
-   - Проверка уведомления
-   - Pause/Resume/Delete
-
-3. **Тестирование API:**
-   - Регистрация и email verification
-   - Логин
-   - Поиск торрентов
-   - Получение плееров
-   - Реакции
-
----
-
-## 💡 Преимущества нового решения
-
-### TorrentEngine:
-✅ Отдельная библиотека - можно использовать в других проектах  
-✅ LibTorrent4j - надежный и производительный  
-✅ Foreground service - стабильная работа в фоне  
-✅ Room database - надежное хранение состояния  
-✅ Flow API - реактивные обновления UI  
-✅ Полный контроль - все функции доступны  
-
-### NeoMoviesApiClient:
-✅ Go backend - в 3x быстрее Node.js  
-✅ Меньше потребление памяти - 50% экономия  
-✅ Email verification - безопасная регистрация  
-✅ Google OAuth - удобный вход  
-✅ Торрент поиск - интеграция с RedAPI  
-✅ Множество плееров - выбор для пользователя  
-✅ Реакции - вовлечение пользователей  
-
----
-
-## 🎉 Итоги
-
-**Создано:**
-- ✅ Полноценная библиотека TorrentEngine (700+ строк кода)
-- ✅ Новый API клиент NeoMoviesApiClient (450+ строк)
-- ✅ Модели данных для новых фич
-- ✅ Подробная документация
-- ✅ ProGuard правила
-- ✅ Готовая структура для интеграции
-
-**Готово к:**
-- ⚡ Компиляции и тестированию
-- 📱 Интеграции с Flutter
-- 🚀 Деплою в production
-
-**Следующий шаг:**
-Интеграция TorrentEngine с Flutter через MethodChannel и создание UI для торрент менеджера.

MERGE_REQUEST_DESCRIPTION.md

@@ -1,201 +0,0 @@
-# 🚀 Add TorrentEngine Library and New API Client
-
-## 📝 Описание
-
-Полная реализация торрент движка на Kotlin с использованием LibTorrent4j и интеграция с Flutter приложением через MethodChannel. Также добавлен новый API клиент для работы с обновленным Go-based бэкендом.
-
----
-
-## ✨ Новые возможности
-
-### 1. **TorrentEngine Library** (Kotlin)
-
-Полноценный торрент движок как отдельный модуль Android:
-
-#### 🎯 **Основные функции:**
-- ✅ Загрузка из magnet-ссылок с автоматическим извлечением метаданных
-- ✅ Выбор файлов ДО и ВО ВРЕМЯ загрузки
-- ✅ Управление приоритетами файлов (5 уровней: DONT_DOWNLOAD → MAXIMUM)
-- ✅ Foreground Service с постоянным уведомлением
-- ✅ Room Database для персистентности состояния
-- ✅ Реактивные Flow API для мониторинга изменений
-- ✅ Полная статистика (скорость, пиры, сиды, прогресс, ETA)
-- ✅ Pause/Resume/Remove с опциональным удалением файлов
-
-#### 📦 **Структура модуля:**
-```
-android/torrentengine/
-├── TorrentEngine.kt              # Главный API класс (500+ строк)
-├── TorrentService.kt             # Foreground service с уведомлением
-├── models/TorrentInfo.kt         # Модели данных
-├── database/                     # Room DAO и Database
-│   ├── TorrentDao.kt
-│   ├── TorrentDatabase.kt
-│   └── Converters.kt
-├── build.gradle.kts              # LibTorrent4j dependencies
-├── AndroidManifest.xml           # Permissions и Service
-├── README.md                     # Полная документация
-└── proguard-rules.pro            # ProGuard правила
-```
-
-#### 🔧 **Использование:**
-```kotlin
-val engine = TorrentEngine.getInstance(context)
-val hash = engine.addTorrent(magnetUri, savePath)
-engine.setFilePriority(hash, fileIndex, FilePriority.HIGH)
-engine.pauseTorrent(hash)
-engine.resumeTorrent(hash)
-engine.removeTorrent(hash, deleteFiles = true)
-```
-
-### 2. **MethodChannel Integration** (Kotlin ↔ Flutter)
-
-Полная интеграция TorrentEngine с Flutter через MethodChannel в `MainActivity.kt`:
-
-#### 📡 **Доступные методы:**
-- `addTorrent(magnetUri, savePath)` → infoHash
-- `getTorrents()` → List<TorrentInfo> (JSON)
-- `getTorrent(infoHash)` → TorrentInfo (JSON)
-- `pauseTorrent(infoHash)` → success
-- `resumeTorrent(infoHash)` → success
-- `removeTorrent(infoHash, deleteFiles)` → success
-- `setFilePriority(infoHash, fileIndex, priority)` → success
-
-### 3. **NeoMoviesApiClient** (Dart)
-
-Новый API клиент для работы с Go-based бэкендом:
-
-#### 🆕 **Новые endpoints:**
-
-**Аутентификация:**
-- Email verification flow (register → verify → login)
-- Google OAuth URL
-- Token refresh
-
-**Торренты:**
-- Поиск через RedAPI по IMDb ID
-- Фильтры по качеству, сезону, эпизоду
-
-**Плееры:**
-- Alloha, Lumex, Vibix embed URLs
-
-**Реакции:**
-- Лайки/дизлайки
-- Счетчики реакций
-- Мои реакции
-
----
-
-## 🔄 Измененные файлы
-
-### Android:
-- `android/settings.gradle.kts` - добавлен модуль `:torrentengine`
-- `android/app/build.gradle.kts` - обновлены зависимости, Java 17
-- `android/app/src/main/kotlin/.../MainActivity.kt` - интеграция TorrentEngine
-
-### Flutter:
-- `pubspec.yaml` - исправлен конфликт `build_runner`
-- `lib/data/api/neomovies_api_client.dart` - новый API клиент (450+ строк)
-- `lib/data/models/player/player_response.dart` - модель ответа плеера
-
-### Документация:
-- `android/torrentengine/README.md` - подробная документация по TorrentEngine
-- `DEVELOPMENT_SUMMARY.md` - полный отчет о проделанной работе
-
----
-
-## 🏗️ Технические детали
-
-### Зависимости:
-
-**TorrentEngine:**
-- LibTorrent4j 2.1.0-28 (arm64, arm, x86, x86_64)
-- Room 2.6.1
-- Kotlin Coroutines 1.9.0
-- Gson 2.11.0
-
-**App:**
-- Обновлен Java до версии 17
-- Обновлены AndroidX библиотеки
-- Исправлен конфликт build_runner (2.4.13)
-
-### Permissions:
-- INTERNET, ACCESS_NETWORK_STATE
-- WRITE/READ_EXTERNAL_STORAGE
-- MANAGE_EXTERNAL_STORAGE (Android 11+)
-- FOREGROUND_SERVICE, FOREGROUND_SERVICE_DATA_SYNC
-- POST_NOTIFICATIONS
-- WAKE_LOCK
-
----
-
-## ✅ Что работает
-
-✅ **Структура TorrentEngine модуля создана**  
-✅ **LibTorrent4j интегрирован**  
-✅ **Room database настроена**  
-✅ **Foreground Service реализован**  
-✅ **MethodChannel для Flutter готов**  
-✅ **Новый API клиент написан**  
-✅ **Все файлы закоммичены и запушены**  
-
----
-
-## 📋 Следующие шаги
-
-### Для полного завершения требуется:
-
-1. **Сборка APK** - необходима более мощная среда для полной компиляции с LibTorrent4j
-2. **Flutter интеграция** - создать Dart wrapper для MethodChannel
-3. **UI для торрентов** - экраны списка торрентов, выбора файлов
-4. **Тестирование** - проверка работы на реальном устройстве
-
-### Дополнительно:
-- Исправить ошибки анализатора Dart (отсутствующие модели плеера)
-- Сгенерировать код для `player_response.g.dart`
-- Добавить модель `TorrentItem` для API клиента
-
----
-
-## 📊 Статистика
-
-- **Создано файлов:** 16
-- **Изменено файлов:** 4
-- **Добавлено строк кода:** ~2700+
-- **Kotlin код:** ~1500 строк
-- **Dart код:** ~500 строк
-- **Документация:** ~700 строк
-
----
-
-## 🎉 Итоги
-
-Создана **полноценная библиотека для работы с торрентами**, которая:
-- Может использоваться как отдельный модуль в любых Android проектах
-- Предоставляет все необходимые функции для торрент-клиента
-- Интегрирована с Flutter через MethodChannel
-- Имеет подробную документацию с примерами
-
-Также создан **новый API клиент** для работы с обновленным бэкендом с поддержкой новых фич:
-- Email verification
-- Google OAuth
-- Torrent search
-- Multiple players
-- Reactions system
-
----
-
-## 🔗 Ссылки
-
-- **Branch:** `feature/torrent-engine-integration`
-- **Commit:** 1b28c5d
-- **Документация:** `android/torrentengine/README.md`
-- **Отчет:** `DEVELOPMENT_SUMMARY.md`
-
----
-
-## 👤 Author
-
-**Droid (Factory AI Assistant)**
-
-Создано с использованием LibTorrent4j, Room, Kotlin Coroutines, и Flutter MethodChannel.

README.md

@@ -2,25 +2,7 @@
 
 Мобильное приложение для просмотра фильмов и сериалов, созданное на Flutter.
 
-## Возможности
-
-- 📱 Кроссплатформенное приложение (Android/iOS(пока не реализовано))
-- 🎥 Просмотр фильмов и сериалов через WebView
-- 🌙 Поддержка динамической темы
-- 💾 Локальное кэширование данных
-- 🔒 Безопасное хранение данных
-- 🚀 Быстрая загрузка контента
-- 🎨 Современный Material Design интерфейс
-
-## Технологии
-
-- **Flutter** - основной фреймворк
-- **Provider** - управление состоянием
-- **Hive** - локальная база данных
-- **HTTP** - сетевые запросы
-- **WebView** - воспроизведение видео
-- **Cached Network Image** - кэширование изображений
-- **Google Fonts** - красивые шрифты
+[![Download](https://img.shields.io/github/v/release/Neo-Open-Source/neomovies-mobile?label=Download&style=for-the-badge&logo=github)](https://github.com/Neo-Open-Source/neomovies-mobile/releases/latest)
 
 ## Установка
 
@@ -37,7 +19,7 @@ flutter pub get
 
 3. Создайте файл `.env` в корне проекта:
 ```
-API_URL=your_api_url_here
+API_URL=api.neomovies.ru
 ```
 
 4. Запустите приложение:
@@ -52,11 +34,6 @@ flutter run
 flutter build apk --release
 ```
 
-### iOS
-```bash
-flutter build ios --release
-```
-
 ## Структура проекта
 
 ```
@@ -75,20 +52,15 @@ lib/
 - **Flutter SDK**: 3.8.1+
 - **Dart**: 3.8.1+
 - **Android**: API 21+ (Android 5.0+)
-- **iOS**: iOS 11.0+
-
-## Участие в разработке
-
-1. Форкните репозиторий
-2. Создайте ветку для новой функции (`git checkout -b feature/amazing-feature`)
-3. Внесите изменения и закоммитьте (`git commit -m 'Add amazing feature'`)
-4. Отправьте изменения в ветку (`git push origin feature/amazing-feature`)
-5. Создайте Pull Request
 
 ## Лицензия
 
-Этот проект лицензирован под Apache 2.0 License - подробности в файле [LICENSE](LICENSE).
+Apache 2.0 License - [LICENSE](LICENSE).
 
 ## Контакты
 
-Если у вас есть вопросы или предложения, создайте issue в этом репозитории.
+neo.movies.mail@gmail.com
+
+## Благодарность
+
+Огромная благодарность создателям проекта [LAMPAC](https://github.com/immisterio/Lampac)

android/app/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 android {
     namespace = "com.neo.neomovies_mobile"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.12077973"
+    // ndkVersion = "27.0.12077973"  // Commented out to avoid license issues
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -48,7 +48,7 @@ dependencies {
     implementation(project(":torrentengine"))
     
     // Kotlin Coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
     
     // Gson для JSON сериализации
     implementation("com.google.code.gson:gson:2.11.0")

android/app/src/main/kotlin/com/neo/neomovies_mobile/TorrentDisplayUtils.kt

@@ -1,203 +0,0 @@
-package com.neo.neomovies_mobile
-
-import android.util.Log
-import kotlin.math.log
-import kotlin.math.pow
-
-object TorrentDisplayUtils {
-
-    private const val TAG = "TorrentDisplay"
-
-    /**
-     * Выводит полную информацию о торренте в лог
-     */
-    fun logTorrentInfo(metadata: TorrentMetadata) {
-        Log.d(TAG, "=== ИНФОРМАЦИЯ О ТОРРЕНТЕ ===")
-        Log.d(TAG, "Название: ${metadata.name}")
-        Log.d(TAG, "Хэш: ${metadata.infoHash}")
-        Log.d(TAG, "Размер: ${formatFileSize(metadata.totalSize)}")
-        Log.d(TAG, "Файлов: ${metadata.fileStructure.totalFiles}")
-        Log.d(TAG, "Частей: ${metadata.numPieces}")
-        Log.d(TAG, "Размер части: ${formatFileSize(metadata.pieceLength.toLong())}")
-        Log.d(TAG, "Трекеров: ${metadata.trackers.size}")
-        
-        if (metadata.comment.isNotEmpty()) {
-            Log.d(TAG, "Комментарий: ${metadata.comment}")
-        }
-        if (metadata.createdBy.isNotEmpty()) {
-            Log.d(TAG, "Создано: ${metadata.createdBy}")
-        }
-        if (metadata.creationDate > 0) {
-            Log.d(TAG, "Дата создания: ${java.util.Date(metadata.creationDate * 1000)}")
-        }
-        
-        Log.d(TAG, "")
-        logFileTypeStats(metadata.fileStructure)
-        Log.d(TAG, "")
-        logFileStructure(metadata.fileStructure)
-        Log.d(TAG, "")
-        logTrackerList(metadata.trackers)
-    }
-
-    /**
-     * Выводит структуру файлов в виде дерева
-     */
-    fun logFileStructure(fileStructure: FileStructure) {
-        Log.d(TAG, "=== СТРУКТУРА ФАЙЛОВ ===")
-        logDirectoryNode(fileStructure.rootDirectory, "")
-    }
-
-    /**
-     * Рекурсивно выводит узел директории
-     */
-    private fun logDirectoryNode(node: DirectoryNode, prefix: String) {
-        if (node.name.isNotEmpty()) {
-            Log.d(TAG, "$prefix${node.name}/")
-        }
-        
-        val childPrefix = if (node.name.isEmpty()) prefix else "$prefix  "
-        
-        // Выводим поддиректории
-        node.subdirectories.forEach { subDir ->
-            Log.d(TAG, "$childPrefix├── ${subDir.name}/")
-            logDirectoryNode(subDir, "$childPrefix│   ")
-        }
-        
-        // Выводим файлы
-        node.files.forEachIndexed { index, file ->
-            val isLast = index == node.files.size - 1 && node.subdirectories.isEmpty()
-            val symbol = if (isLast) "└──" else "├──"
-            val fileInfo = "${file.name} (${formatFileSize(file.size)}) [${file.extension.uppercase()}]"
-            Log.d(TAG, "$childPrefix$symbol $fileInfo")
-        }
-    }
-
-    /**
-     * Выводит статистику по типам файлов
-     */
-    fun logFileTypeStats(fileStructure: FileStructure) {
-        Log.d(TAG, "=== СТАТИСТИКА ПО ТИПАМ ФАЙЛОВ ===")
-        if (fileStructure.filesByType.isEmpty()) {
-            Log.d(TAG, "Нет статистики по типам файлов")
-            return
-        }
-        fileStructure.filesByType.forEach { (type, count) ->
-            val percentage = (count.toFloat() / fileStructure.totalFiles * 100).toInt()
-            Log.d(TAG, "${type.uppercase()}: $count файлов ($percentage%)")
-        }
-    }
-
-    /**
-     * Alias for MainActivity – just logs structure.
-     */
-    fun logTorrentStructure(metadata: TorrentMetadata) {
-        logFileStructure(metadata.fileStructure)
-    }
-
-    /**
-     * Выводит список трекеров
-     */
-    fun logTrackerList(trackers: List<String>) {
-        if (trackers.isEmpty()) {
-            Log.d(TAG, "=== ТРЕКЕРЫ === (нет трекеров)")
-            return
-        }
-        
-        Log.d(TAG, "=== ТРЕКЕРЫ ===")
-        trackers.forEachIndexed { index, tracker ->
-            Log.d(TAG, "${index + 1}. $tracker")
-        }
-    }
-
-    /**
-     * Возвращает текстовое представление структуры файлов
-     */
-    fun getFileStructureText(fileStructure: FileStructure): String {
-        val sb = StringBuilder()
-        sb.appendLine("${fileStructure.rootDirectory.name}/")
-        appendDirectoryNode(fileStructure.rootDirectory, "", sb)
-        return sb.toString()
-    }
-
-    /**
-     * Рекурсивно добавляет узел директории в StringBuilder
-     */
-    private fun appendDirectoryNode(node: DirectoryNode, prefix: String, sb: StringBuilder) {
-        val childPrefix = if (node.name.isEmpty()) prefix else "$prefix  "
-        
-        // Добавляем поддиректории
-        node.subdirectories.forEach { subDir ->
-            sb.appendLine("$childPrefix└── ${subDir.name}/")
-            appendDirectoryNode(subDir, "$childPrefix    ", sb)
-        }
-        
-        // Добавляем файлы
-        node.files.forEachIndexed { index, file ->
-            val isLast = index == node.files.size - 1 && node.subdirectories.isEmpty()
-            val symbol = if (isLast) "└──" else "├──"
-            val fileInfo = "${file.name} (${formatFileSize(file.size)})"
-            sb.appendLine("$childPrefix$symbol $fileInfo")
-        }
-    }
-
-    /**
-     * Возвращает краткую статистику о торренте
-     */
-    fun getTorrentSummary(metadata: TorrentMetadata): String {
-        return buildString {
-            appendLine("Название: ${metadata.name}")
-            appendLine("Размер: ${formatFileSize(metadata.totalSize)}")
-            appendLine("Файлов: ${metadata.fileStructure.totalFiles}")
-            appendLine("Хэш: ${metadata.infoHash}")
-            
-            if (metadata.fileStructure.filesByType.isNotEmpty()) {
-                appendLine("\nТипы файлов:")
-                metadata.fileStructure.filesByType.forEach { (type, count) ->
-                    val percentage = (count.toFloat() / metadata.fileStructure.totalFiles * 100).toInt()
-                    appendLine("  ${type.uppercase()}: $count ($percentage%)")
-                }
-            }
-        }
-    }
-
-    /**
-     * Форматирует размер файла в читаемый вид
-     */
-    fun formatFileSize(bytes: Long): String {
-        if (bytes <= 0) return "0 B"
-        val units = arrayOf("B", "KB", "MB", "GB", "TB")
-        val digitGroups = (log(bytes.toDouble(), 1024.0)).toInt()
-        return "%.1f %s".format(
-            bytes / 1024.0.pow(digitGroups),
-            units[digitGroups.coerceAtMost(units.lastIndex)]
-        )
-    }
-
-    /**
-     * Возвращает иконку для типа файла
-     */
-    fun getFileTypeIcon(extension: String): String {
-        return when {
-            extension in setOf("mp4", "mkv", "avi", "mov", "wmv", "flv", "webm", "m4v", "3gp") -> "🎬"
-            extension in setOf("mp3", "flac", "wav", "aac", "ogg", "wma", "m4a", "opus") -> "🎵"
-            extension in setOf("jpg", "jpeg", "png", "gif", "bmp", "webp", "svg") -> "🖼️"
-            extension in setOf("pdf", "doc", "docx", "txt", "rtf", "odt") -> "📄"
-            extension in setOf("zip", "rar", "7z", "tar", "gz", "bz2") -> "📦"
-            else -> "📁"
-        }
-    }
-
-    /**
-     * Фильтрует файлы по типу
-     */
-    fun filterFilesByType(files: List<FileInfo>, type: String): List<FileInfo> {
-        return when (type.lowercase()) {
-            "video" -> files.filter { it.isVideo }
-            "audio" -> files.filter { it.isAudio }
-            "image" -> files.filter { it.isImage }
-            "document" -> files.filter { it.isDocument }
-            "archive" -> files.filter { it.isArchive }
-            else -> files
-        }
-    }
-}

android/app/src/main/kotlin/com/neo/neomovies_mobile/TorrentMetadataService.kt

@@ -1,90 +0,0 @@
-package com.neo.neomovies_mobile
-
-import android.util.Log
-import kotlinx.coroutines.Dispatchers
-import org.libtorrent4j.AddTorrentParams
-import kotlinx.coroutines.withContext
-import org.libtorrent4j.*
-import java.io.File
-import java.util.concurrent.Executors
-
-/**
- * Lightweight service that exposes exactly the API used by MainActivity.
- * - parseMagnetBasicInfo: quick parsing without network.
- * - fetchFullMetadata: downloads metadata and converts to TorrentMetadata.
- * - cleanup: stops internal SessionManager.
- */
-object TorrentMetadataService {
-
-    private const val TAG = "TorrentMetadataService"
-    private val ioDispatcher = Dispatchers.IO
-
-    /** Lazy SessionManager used for metadata fetch */
-    private val session: SessionManager by lazy {
-        SessionManager().apply { start(SessionParams(SettingsPack())) }
-    }
-
-    /** Parse basic info (name & hash) from magnet URI without contacting network */
-    suspend fun parseMagnetBasicInfo(uri: String): MagnetBasicInfo? = withContext(ioDispatcher) {
-        return@withContext try {
-            MagnetBasicInfo(
-                name = extractNameFromMagnet(uri),
-                infoHash = extractHashFromMagnet(uri),
-                trackers = emptyList<String>()
-            )
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to parse magnet", e)
-            null
-        }
-    }
-
-    /** Download full metadata from magnet link */
-    suspend fun fetchFullMetadata(uri: String): TorrentMetadata? = withContext(ioDispatcher) {
-        try {
-            val data = session.fetchMagnet(uri, 30, File("/tmp")) ?: return@withContext null
-            val ti = TorrentInfo(data)
-            return@withContext buildMetadata(ti, uri)
-        } catch (e: Exception) {
-            Log.e(TAG, "Metadata fetch error", e)
-            null
-        }
-    }
-
-    fun cleanup() {
-        if (session.isRunning) session.stop()
-    }
-
-    // --- helpers
-    private fun extractNameFromMagnet(uri: String): String {
-        val regex = "dn=([^&]+)".toRegex()
-        val match = regex.find(uri)
-        return match?.groups?.get(1)?.value?.let { java.net.URLDecoder.decode(it, "UTF-8") } ?: "Unknown"
-    }
-
-    private fun extractHashFromMagnet(uri: String): String {
-        val regex = "btih:([A-Za-z0-9]{32,40})".toRegex()
-        val match = regex.find(uri)
-        return match?.groups?.get(1)?.value ?: ""
-    }
-
-    private fun buildMetadata(ti: TorrentInfo, originalUri: String): TorrentMetadata {
-        val fs = ti.files()
-        val list = MutableList(fs.numFiles()) { idx ->
-            val size = fs.fileSize(idx)
-            val path = fs.filePath(idx)
-            val name = File(path).name
-            val ext = name.substringAfterLast('.', "").lowercase()
-            FileInfo(name, path, size, idx, ext)
-        }
-        val root = DirectoryNode(ti.name(), "", list)
-        val structure = FileStructure(root, list.size, fs.totalSize())
-        return TorrentMetadata(
-            name = ti.name(),
-            infoHash = extractHashFromMagnet(originalUri),
-            totalSize = fs.totalSize(),
-            pieceLength = ti.pieceLength(),
-            numPieces = ti.numPieces(),
-            fileStructure = structure
-        )
-    }
-}

android/app/src/main/kotlin/com/neo/neomovies_mobile/TorrentModels.kt

@@ -1,66 +0,0 @@
-package com.neo.neomovies_mobile
-
-/**
- * Базовая информация из magnet-ссылки
- */
-data class MagnetBasicInfo(
-    val name: String,
-    val infoHash: String,
-    val trackers: List<String> = emptyList(),
-    val totalSize: Long = 0L
-)
-
-/**
- * Полные метаданные торрента
- */
-data class TorrentMetadata(
-    val name: String,
-    val infoHash: String,
-    val totalSize: Long,
-    val pieceLength: Int,
-    val numPieces: Int,
-    val fileStructure: FileStructure,
-    val trackers: List<String> = emptyList(),
-    val creationDate: Long = 0L,
-    val comment: String = "",
-    val createdBy: String = ""
-)
-
-/**
- * Структура файлов торрента
- */
-data class FileStructure(
-    val rootDirectory: DirectoryNode,
-    val totalFiles: Int,
-    val totalSize: Long,
-    val filesByType: Map<String, Int> = emptyMap(),
-    val fileTypeStats: Map<String, Int> = emptyMap()
-)
-
-/**
- * Узел директории в структуре файлов
- */
-data class DirectoryNode(
-    val name: String,
-    val path: String,
-    val files: List<FileInfo> = emptyList(),
-    val subdirectories: List<DirectoryNode> = emptyList(),
-    val totalSize: Long = 0L,
-    val fileCount: Int = 0
-)
-
-/**
- * Информация о файле
- */
-data class FileInfo(
-    val name: String,
-    val path: String,
-    val size: Long,
-    val index: Int,
-    val extension: String = "",
-    val isVideo: Boolean = false,
-    val isAudio: Boolean = false,
-    val isImage: Boolean = false,
-    val isDocument: Boolean = false,
-    val isArchive: Boolean = false
-)

android/gradle.properties

@@ -1,7 +1,7 @@
 # Gradle JVM settings - optimized for limited RAM
-org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=1G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.daemon=true
-org.gradle.parallel=true
+org.gradle.parallel=false
 org.gradle.caching=true
 org.gradle.configureondemand=true
 

android/settings.gradle

@@ -0,0 +1,33 @@
+// Legacy settings.gradle file for CI compatibility
+// Main configuration is in settings.gradle.kts
+
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        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.library" version "8.7.3" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
+}
+
+include ":app"
+project(":app").projectDir = file("app")
+
+include ":torrentengine"
+project(":torrentengine").projectDir = file("torrentengine")

android/settings.gradle.kts

@@ -28,7 +28,7 @@ plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.7.3" apply false
     id("com.android.library") version "8.7.3" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 
 include(":app")

android/torrentengine/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 NeoMovies
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

android/torrentengine/README.md

@@ -1,20 +1,8 @@
 # TorrentEngine Library
 
-Мощная библиотека для Android, обеспечивающая полноценную работу с торрентами через LibTorrent4j.
+Либа для моего клиента и других независимых проектов где нужен простой торрент движок.
 
-## 🎯 Возможности
-
-- ✅ **Загрузка из magnet-ссылок** - получение метаданных и загрузка файлов
-- ✅ **Выбор файлов** - возможность выбирать какие файлы загружать до и во время загрузки
-- ✅ **Управление приоритетами** - изменение приоритета файлов в активной раздаче
-- ✅ **Фоновый сервис** - непрерывная работа в фоне с foreground уведомлением
-- ✅ **Постоянное уведомление** - нельзя закрыть пока активны загрузки
-- ✅ **Персистентность** - сохранение состояния в Room database
-- ✅ **Реактивность** - Flow API для мониторинга изменений
-- ✅ **Полная статистика** - скорость, пиры, сиды, прогресс, ETA
-- ✅ **Pause/Resume/Remove** - полный контроль над раздачами
-
-## 📦 Установка
+## Установка
 
 ### 1. Добавьте модуль в `settings.gradle.kts`:
 
@@ -38,7 +26,7 @@ dependencies {
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 ```
 
-## 🚀 Использование
+## Использование
 
 ### Инициализация
 
@@ -127,7 +115,7 @@ lifecycleScope.launch {
 }
 ```
 
-## 📊 Модели данных
+## Модели данных
 
 ### TorrentInfo
 
@@ -180,7 +168,7 @@ enum class FilePriority(val value: Int) {
 }
 ```
 
-## 🔔 Foreground Service
+## Foreground Service
 
 Сервис автоматически запускается при добавлении торрента и показывает постоянное уведомление с:
 - Количеством активных торрентов
@@ -190,12 +178,10 @@ enum class FilePriority(val value: Int) {
 
 Уведомление **нельзя закрыть** пока есть активные торренты.
 
-## 💾 Персистентность
+## Персистентность
 
 Все торренты сохраняются в Room database и автоматически восстанавливаются при перезапуске приложения.
 
-## 🔧 Расширенные возможности
-
 ### Проверка видео файлов
 
 ```kotlin
@@ -215,54 +201,6 @@ val selectedCount = torrent.getSelectedFilesCount()
 val selectedSize = torrent.getSelectedSize()
 ```
 
-## 📱 Интеграция с Flutter
+[Apache License 2.0](LICENSE).
 
-Создайте MethodChannel для вызова из Flutter:
-
-```kotlin
-class TorrentEngineChannel(private val context: Context) {
-    private val torrentEngine = TorrentEngine.getInstance(context)
-    private val channel = "com.neomovies/torrent"
-    
-    fun setupMethodChannel(flutterEngine: FlutterEngine) {
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channel)
-            .setMethodCallHandler { call, result ->
-                when (call.method) {
-                    "addTorrent" -> {
-                        val magnetUri = call.argument<String>("magnetUri")!!
-                        val savePath = call.argument<String>("savePath")!!
-                        
-                        CoroutineScope(Dispatchers.IO).launch {
-                            try {
-                                val hash = torrentEngine.addTorrent(magnetUri, savePath)
-                                result.success(hash)
-                            } catch (e: Exception) {
-                                result.error("ERROR", e.message, null)
-                            }
-                        }
-                    }
-                    // ... другие методы
-                }
-            }
-    }
-}
-```
-
-## 📄 Лицензия
-
-MIT License - используйте свободно в любых проектах!
-
-## 🤝 Вклад
-
-Библиотека разработана как универсальное решение для работы с торрентами в Android.
-Может использоваться в любых проектах без ограничений.
-
-## 🐛 Известные проблемы
-
-- LibTorrent4j требует минимум Android 5.0 (API 21)
-- Для Android 13+ нужно запрашивать POST_NOTIFICATIONS permission
-- Foreground service требует отображения уведомления
-
-## 📞 Поддержка
-
-При возникновении проблем создайте issue с описанием и логами.
+Made with <3 by Erno/Foxix

android/torrentengine/build.gradle.kts

@@ -34,6 +34,12 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
+    
+    // KAPT configuration for Kotlin 2.1.0 compatibility
+    kapt {
+        correctErrorTypes = true
+        useBuildCache = true
+    }
 }
 
 dependencies {
@@ -43,17 +49,17 @@ dependencies {
     implementation("com.google.android.material:material:1.12.0")
 
     // Coroutines for async operations
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
 
     // Lifecycle components
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
     implementation("androidx.lifecycle:lifecycle-service:2.8.7")
 
-    // Room database for torrent state persistence
-    implementation("androidx.room:room-runtime:2.6.1")
-    implementation("androidx.room:room-ktx:2.6.1")
-    kapt("androidx.room:room-compiler:2.6.1")
+    // Room database for torrent state persistence - updated for Kotlin 2.1.0
+    implementation("androidx.room:room-runtime:2.7.0-alpha09")
+    implementation("androidx.room:room-ktx:2.7.0-alpha09")
+    kapt("androidx.room:room-compiler:2.7.0-alpha09")
 
     // WorkManager for background tasks
     implementation("androidx.work:work-runtime-ktx:2.10.0")

android/torrentengine/src/main/java/com/neomovies/torrentengine/TorrentEngine.kt

@@ -16,13 +16,7 @@ import java.io.File
 
 /**
  * Main TorrentEngine class - the core of the torrent library
- * This is the main API that applications should use
- * 
- * Usage:
- * ```
- * val engine = TorrentEngine.getInstance(context)
- * engine.addTorrent(magnetUri, savePath)
- * ```
+ * This is the main API that applications should use.
  */
 class TorrentEngine private constructor(private val context: Context) {
     private val TAG = "TorrentEngine"

lib/data/api/api_client.dart

@@ -1,332 +1,142 @@
-import 'dart:convert';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:http/http.dart' as http;
-import 'package:neomovies_mobile/data/models/auth_response.dart';
-import 'package:neomovies_mobile/data/models/favorite.dart';
 import 'package:neomovies_mobile/data/models/movie.dart';
+import 'package:neomovies_mobile/data/models/favorite.dart';
 import 'package:neomovies_mobile/data/models/reaction.dart';
+import 'package:neomovies_mobile/data/models/auth_response.dart';
 import 'package:neomovies_mobile/data/models/user.dart';
+import 'package:neomovies_mobile/data/api/neomovies_api_client.dart'; // новый клиент
+import 'package:neomovies_mobile/data/exceptions/auth_exceptions.dart';
 
 class ApiClient {
-  final http.Client _client;
-  final String _baseUrl = dotenv.env['API_URL']!;
+  final NeoMoviesApiClient _neoClient;
 
-  ApiClient(this._client);
+  ApiClient(http.Client client)
+      : _neoClient = NeoMoviesApiClient(client);
 
-  Future<List<Movie>> getPopularMovies({int page = 1}) async {
-    return _fetchMovies('/movies/popular', page: page);
+  // ---- Movies ----
+  Future<List<Movie>> getPopularMovies({int page = 1}) {
+    return _neoClient.getPopularMovies(page: page);
   }
 
-  Future<List<Movie>> getTopRatedMovies({int page = 1}) async {
-    return _fetchMovies('/movies/top-rated', page: page);
+  Future<List<Movie>> getTopRatedMovies({int page = 1}) {
+    return _neoClient.getTopRatedMovies(page: page);
   }
 
-  Future<List<Movie>> getUpcomingMovies({int page = 1}) async {
-    return _fetchMovies('/movies/upcoming', page: page);
+  Future<List<Movie>> getUpcomingMovies({int page = 1}) {
+    return _neoClient.getUpcomingMovies(page: page);
   }
 
-  Future<Movie> getMovieById(String id) async {
-    return _fetchMovieDetail('/movies/$id');
+  Future<Movie> getMovieById(String id) {
+    return _neoClient.getMovieById(id);
   }
 
-  Future<Movie> getTvById(String id) async {
-    return _fetchMovieDetail('/tv/$id');
+  Future<Movie> getTvById(String id) {
+    return _neoClient.getTvShowById(id);
   }
 
-  // Получение IMDB ID для фильмов
-  Future<String?> getMovieImdbId(int movieId) async {
+  // ---- Search ----
+  Future<List<Movie>> searchMovies(String query, {int page = 1}) {
+    return _neoClient.search(query, page: page);
+  }
+
+  // ---- Favorites ----
+  Future<List<Favorite>> getFavorites() {
+    return _neoClient.getFavorites();
+  }
+
+  Future<void> addFavorite(
+    String mediaId,
+    String mediaType,
+    String title,
+    String posterPath,
+  ) {
+    return _neoClient.addFavorite(
+      mediaId: mediaId,
+      mediaType: mediaType,
+      title: title,
+      posterPath: posterPath,
+    );
+  }
+
+  Future<void> removeFavorite(String mediaId, {String mediaType = 'movie'}) {
+    return _neoClient.removeFavorite(mediaId, mediaType: mediaType);
+  }
+
+  Future<bool> checkIsFavorite(String mediaId, {String mediaType = 'movie'}) {
+    return _neoClient.checkIsFavorite(mediaId, mediaType: mediaType);
+  }
+
+  // ---- Reactions ----
+  Future<Map<String, int>> getReactionCounts(
+      String mediaType, String mediaId) {
+    return _neoClient.getReactionCounts(
+      mediaType: mediaType,
+      mediaId: mediaId,
+    );
+  }
+
+  Future<void> setReaction(
+      String mediaType, String mediaId, String reactionType) {
+    return _neoClient.setReaction(
+      mediaType: mediaType,
+      mediaId: mediaId,
+      reactionType: reactionType,
+    );
+  }
+
+  Future<List<UserReaction>> getMyReactions() {
+    return _neoClient.getMyReactions();
+  }
+
+  // Get single user reaction for specific media
+  Future<UserReaction?> getMyReaction(String mediaType, String mediaId) async {
+    final reactions = await _neoClient.getMyReactions();
     try {
-      final uri = Uri.parse('$_baseUrl/movies/$movieId/external-ids');
-      final response = await _client.get(uri).timeout(const Duration(seconds: 30));
-
-      if (response.statusCode == 200) {
-        final data = json.decode(response.body);
-        return data['imdb_id'] as String?;
-      } else {
-        print('Failed to get movie IMDB ID: ${response.statusCode}');
-        return null;
-      }
+      return reactions.firstWhere(
+        (r) => r.mediaType == mediaType && r.mediaId == mediaId,
+      );
     } catch (e) {
-      print('Error getting movie IMDB ID: $e');
-      return null;
+      return null; // No reaction found
     }
   }
 
-  // Получение IMDB ID для сериалов
-  Future<String?> getTvImdbId(int showId) async {
-    try {
-      final uri = Uri.parse('$_baseUrl/tv/$showId/external-ids');
-      final response = await _client.get(uri).timeout(const Duration(seconds: 30));
-
-      if (response.statusCode == 200) {
-        final data = json.decode(response.body);
-        return data['imdb_id'] as String?;
-      } else {
-        print('Failed to get TV IMDB ID: ${response.statusCode}');
-        return null;
-      }
-    } catch (e) {
-      print('Error getting TV IMDB ID: $e');
-      return null;
-    }
+  // ---- External IDs (IMDb) ----
+  Future<String?> getImdbId(String mediaId, String mediaType) async {
+    return _neoClient.getExternalIds(mediaId, mediaType);
   }
 
-  // Универсальный метод получения IMDB ID
-  Future<String?> getImdbId(int mediaId, String mediaType) async {
-    if (mediaType == 'tv') {
-      return getTvImdbId(mediaId);
-    } else {
-      return getMovieImdbId(mediaId);
-    }
-  }
-
-  Future<List<Movie>> searchMovies(String query, {int page = 1}) async {
-    final moviesUri = Uri.parse('$_baseUrl/movies/search?query=${Uri.encodeQueryComponent(query)}&page=$page');
-    final tvUri = Uri.parse('$_baseUrl/tv/search?query=${Uri.encodeQueryComponent(query)}&page=$page');
-
-    final responses = await Future.wait([
-      _client.get(moviesUri),
-      _client.get(tvUri),
-    ]);
-
-    List<Movie> combined = [];
-
-    for (final response in responses) {
-      if (response.statusCode == 200) {
-        final decoded = json.decode(response.body);
-        List<dynamic> listData;
-        if (decoded is List) {
-          listData = decoded;
-        } else if (decoded is Map && decoded['results'] is List) {
-          listData = decoded['results'];
-        } else {
-          listData = [];
-        }
-        combined.addAll(listData.map((json) => Movie.fromJson(json)));
-      } else {
-        // ignore non-200 but log maybe
-      }
-    }
-
-    if (combined.isEmpty) {
-      throw Exception('Failed to search movies/tv');
-    }
-    return combined;
-  }
-
-  Future<Movie> _fetchMovieDetail(String path) async {
-    final uri = Uri.parse('$_baseUrl$path');
-    final response = await _client.get(uri);
-
-    if (response.statusCode == 200) {
-      final data = json.decode(response.body);
-      return Movie.fromJson(data);
-    } else {
-      throw Exception('Failed to load media details: ${response.statusCode}');
-    }
-  }
-
-  // Favorites
-  Future<List<Favorite>> getFavorites() async {
-    final response = await _client.get(Uri.parse('$_baseUrl/favorites'));
-
-    if (response.statusCode == 200) {
-      final List<dynamic> data = json.decode(response.body);
-      return data.map((json) => Favorite.fromJson(json)).toList();
-    } else {
-      throw Exception('Failed to fetch favorites');
-    }
-  }
-
-  Future<void> addFavorite(String mediaId, String mediaType, String title, String posterPath) async {
-    final response = await _client.post(
-      Uri.parse('$_baseUrl/favorites/$mediaId?mediaType=$mediaType'),
-      body: json.encode({
-        'title': title,
-        'posterPath': posterPath,
-      }),
-    );
-
-    if (response.statusCode != 201 && response.statusCode != 200) {
-      throw Exception('Failed to add favorite');
-    }
-  }
-
-  Future<void> removeFavorite(String mediaId) async {
-    final response = await _client.delete(
-      Uri.parse('$_baseUrl/favorites/$mediaId'),
-    );
-
-    if (response.statusCode != 200) {
-      throw Exception('Failed to remove favorite');
-    }
-  }
-
-  // Reactions
-  Future<Map<String, int>> getReactionCounts(String mediaType, String mediaId) async {
-    final response = await _client.get(
-      Uri.parse('$_baseUrl/reactions/$mediaType/$mediaId/counts'),
-    );
-
-    print('REACTION COUNTS RESPONSE (${response.statusCode}): ${response.body}');
-
-    if (response.statusCode == 200) {
-      final decoded = json.decode(response.body);
-      print('PARSED: $decoded');
-      
-      if (decoded is Map) {
-        final mapSrc = decoded.containsKey('data') && decoded['data'] is Map
-            ? decoded['data'] as Map<String, dynamic>
-            : decoded;
-            
-        print('MAPPING: $mapSrc');
-        return mapSrc.map((k, v) {
-          int count;
-          if (v is num) {
-            count = v.toInt();
-          } else if (v is String) {
-            count = int.tryParse(v) ?? 0;
-          } else {
-            count = 0;
-          }
-          return MapEntry(k, count);
-        });
-      }
-      if (decoded is List) {
-        // list of {type,count}
-        Map<String, int> res = {};
-        for (var item in decoded) {
-          if (item is Map && item['type'] != null) {
-            res[item['type'].toString()] = (item['count'] as num?)?.toInt() ?? 0;
-          }
-        }
-        return res;
-      }
-      return {};
-    } else {
-      throw Exception('Failed to fetch reactions counts');
-    }
-  }
-
-  Future<UserReaction> getMyReaction(String mediaType, String mediaId) async {
-    final response = await _client.get(
-      Uri.parse('$_baseUrl/reactions/$mediaType/$mediaId/my-reaction'),
-    );
-
-    if (response.statusCode == 200) {
-      final decoded = json.decode(response.body);
-      if (decoded == null || (decoded is String && decoded.isEmpty)) {
-        return UserReaction(reactionType: null);
-      }
-      return UserReaction.fromJson(decoded as Map<String, dynamic>);
-    } else if (response.statusCode == 404) {
-      return UserReaction(reactionType: 'none'); // No reaction found
-    } else {
-      throw Exception('Failed to fetch user reaction');
-    }
-  }
-
-  Future<void> setReaction(String mediaType, String mediaId, String reactionType) async {
-    final response = await _client.post(
-      Uri.parse('$_baseUrl/reactions'),
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'mediaId': '${mediaType}_${mediaId}', 'type': reactionType}),
-    );
-
-    if (response.statusCode != 201 && response.statusCode != 200 && response.statusCode != 204) {
-      throw Exception('Failed to set reaction: ${response.statusCode} ${response.body}');
-    }
-  }
-
-  // --- Auth Methods ---
-
-  Future<void> register(String name, String email, String password) async {
-    final uri = Uri.parse('$_baseUrl/auth/register');
-    final response = await _client.post(
-      uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'name': name, 'email': email, 'password': password}),
-    );
-
-    if (response.statusCode == 201 || response.statusCode == 200) {
-      final decoded = json.decode(response.body) as Map<String, dynamic>;
-      if (decoded['success'] == true || decoded.containsKey('token')) {
-        // registration succeeded; nothing further to return
-        return;
-      } else {
-        throw Exception('Failed to register: ${decoded['message'] ?? 'Unknown error'}');
-      }
-    } else {
-      throw Exception('Failed to register: ${response.statusCode} ${response.body}');
-    }
+  // ---- Auth ----
+  Future<void> register(String name, String email, String password) {
+    return _neoClient.register(
+      name: name,
+      email: email,
+      password: password,
+    ).then((_) {}); // старый код ничего не возвращал
   }
 
   Future<AuthResponse> login(String email, String password) async {
-    final uri = Uri.parse('$_baseUrl/auth/login');
-    final response = await _client.post(
-      uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'email': email, 'password': password}),
-    );
-
-    if (response.statusCode == 200) {
-      return AuthResponse.fromJson(json.decode(response.body));
-    } else {
-      throw Exception('Failed to login: ${response.body}');
-    }
-  }
-
-  Future<void> verify(String email, String code) async {
-    final uri = Uri.parse('$_baseUrl/auth/verify');
-    final response = await _client.post(
-      uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'email': email, 'code': code}),
-    );
-
-    if (response.statusCode != 200) {
-      throw Exception('Failed to verify code: ${response.body}');
-    }
-  }
-
-  Future<void> resendCode(String email) async {
-    final uri = Uri.parse('$_baseUrl/auth/resend-code');
-    final response = await _client.post(
-      uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'email': email}),
-    );
-
-    if (response.statusCode != 200) {
-      throw Exception('Failed to resend code: ${response.body}');
-    }
-  }
-
-  Future<void> deleteAccount() async {
-    final uri = Uri.parse('$_baseUrl/auth/profile');
-    final response = await _client.delete(uri);
-
-    if (response.statusCode != 200) {
-      throw Exception('Failed to delete account: ${response.body}');
-    }
-  }
-
-  // --- Movie Methods ---
-
-  Future<List<Movie>> _fetchMovies(String endpoint, {int page = 1}) async {
-    final uri = Uri.parse('$_baseUrl$endpoint').replace(queryParameters: {
-      'page': page.toString(),
-    });
-    final response = await _client.get(uri);
-
-    if (response.statusCode == 200) {
-      final List<dynamic> data = json.decode(response.body)['results'];
-      if (data == null) {
-        return [];
+    try {
+      return await _neoClient.login(email: email, password: password);
+    } catch (e) {
+      final errorMessage = e.toString();
+      if (errorMessage.contains('Account not activated') || 
+          errorMessage.contains('not verified') ||
+          errorMessage.contains('Please verify your email')) {
+        throw UnverifiedAccountException(email, message: errorMessage);
       }
-      return data.map((json) => Movie.fromJson(json)).toList();
-    } else {
-      throw Exception('Failed to load movies from $endpoint');
+      rethrow;
     }
   }
+
+  Future<AuthResponse> verify(String email, String code) {
+    return _neoClient.verifyEmail(email: email, code: code);
+  }
+
+  Future<void> resendCode(String email) {
+    return _neoClient.resendVerificationCode(email);
+  }
+
+  Future<void> deleteAccount() {
+    return _neoClient.deleteAccount();
+  }
 }

lib/data/api/neomovies_api_client.dart

@@ -7,6 +7,7 @@ import 'package:neomovies_mobile/data/models/movie.dart';
 import 'package:neomovies_mobile/data/models/reaction.dart';
 import 'package:neomovies_mobile/data/models/user.dart';
 import 'package:neomovies_mobile/data/models/torrent.dart';
+import 'package:neomovies_mobile/data/models/torrent/torrent_item.dart';
 import 'package:neomovies_mobile/data/models/player/player_response.dart';
 
 /// New API client for neomovies-api (Go-based backend)
@@ -185,12 +186,28 @@ class NeoMoviesApiClient {
   /// Get movie by ID
   Future<Movie> getMovieById(String id) async {
     final uri = Uri.parse('$apiUrl/movies/$id');
+    print('Fetching movie from: $uri');
     final response = await _client.get(uri);
 
+    print('Response status: ${response.statusCode}');
+    print('Response body: ${response.body.substring(0, response.body.length > 500 ? 500 : response.body.length)}...');
+
     if (response.statusCode == 200) {
-      return Movie.fromJson(json.decode(response.body));
+      final apiResponse = json.decode(response.body);
+      print('Decoded API response type: ${apiResponse.runtimeType}');
+      print('API response keys: ${apiResponse is Map ? apiResponse.keys.toList() : 'Not a map'}');
+      
+      // API returns: {"success": true, "data": {...}}
+      final movieData = (apiResponse is Map && apiResponse['data'] != null) 
+          ? apiResponse['data'] 
+          : apiResponse;
+      
+      print('Movie data keys: ${movieData is Map ? movieData.keys.toList() : 'Not a map'}');
+      print('Movie data: $movieData');
+      
+      return Movie.fromJson(movieData);
     } else {
-      throw Exception('Failed to load movie: ${response.statusCode}');
+      throw Exception('Failed to load movie: ${response.statusCode} - ${response.body}');
     }
   }
 
@@ -221,12 +238,28 @@ class NeoMoviesApiClient {
   /// Get TV show by ID
   Future<Movie> getTvShowById(String id) async {
     final uri = Uri.parse('$apiUrl/tv/$id');
+    print('Fetching TV show from: $uri');
     final response = await _client.get(uri);
 
+    print('Response status: ${response.statusCode}');
+    print('Response body: ${response.body.substring(0, response.body.length > 500 ? 500 : response.body.length)}...');
+
     if (response.statusCode == 200) {
-      return Movie.fromJson(json.decode(response.body));
+      final apiResponse = json.decode(response.body);
+      print('Decoded API response type: ${apiResponse.runtimeType}');
+      print('API response keys: ${apiResponse is Map ? apiResponse.keys.toList() : 'Not a map'}');
+      
+      // API returns: {"success": true, "data": {...}}
+      final tvData = (apiResponse is Map && apiResponse['data'] != null) 
+          ? apiResponse['data'] 
+          : apiResponse;
+      
+      print('TV data keys: ${tvData is Map ? tvData.keys.toList() : 'Not a map'}');
+      print('TV data: $tvData');
+      
+      return Movie.fromJson(tvData);
     } else {
-      throw Exception('Failed to load TV show: ${response.statusCode}');
+      throw Exception('Failed to load TV show: ${response.statusCode} - ${response.body}');
     }
   }
 
@@ -240,6 +273,30 @@ class NeoMoviesApiClient {
     return _fetchMovies('/tv/search', page: page, query: query);
   }
 
+  // ============================================
+  // External IDs (IMDb, TVDB, etc.)
+  // ============================================
+
+  /// Get external IDs (IMDb, TVDB) for a movie or TV show
+  Future<String?> getExternalIds(String mediaId, String mediaType) async {
+    try {
+      final uri = Uri.parse('$apiUrl/${mediaType}s/$mediaId/external-ids');
+      final response = await _client.get(uri);
+
+      if (response.statusCode == 200) {
+        final apiResponse = json.decode(response.body);
+        final data = (apiResponse is Map && apiResponse['data'] != null) 
+            ? apiResponse['data'] 
+            : apiResponse;
+        return data['imdb_id'] as String?;
+      }
+      return null;
+    } catch (e) {
+      print('Error getting external IDs: $e');
+      return null;
+    }
+  }
+
   // ============================================
   // Unified Search
   // ============================================
@@ -265,7 +322,11 @@ class NeoMoviesApiClient {
     final response = await _client.get(uri);
 
     if (response.statusCode == 200) {
-      final List<dynamic> data = json.decode(response.body);
+      final apiResponse = json.decode(response.body);
+      // API returns: {"success": true, "data": [...]}
+      final List<dynamic> data = (apiResponse is Map && apiResponse['data'] != null)
+          ? (apiResponse['data'] is List ? apiResponse['data'] : [])
+          : (apiResponse is List ? apiResponse : []);
       return data.map((json) => Favorite.fromJson(json)).toList();
     } else {
       throw Exception('Failed to fetch favorites: ${response.body}');
@@ -273,23 +334,17 @@ class NeoMoviesApiClient {
   }
 
   /// Add movie/show to favorites
+  /// Backend automatically fetches title and poster_path from TMDB
   Future<void> addFavorite({
     required String mediaId,
     required String mediaType,
     required String title,
     required String posterPath,
   }) async {
-    final uri = Uri.parse('$apiUrl/favorites');
-    final response = await _client.post(
-      uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({
-        'mediaId': mediaId,
-        'mediaType': mediaType,
-        'title': title,
-        'posterPath': posterPath,
-      }),
-    );
+    // Backend route: POST /favorites/{id}?type={mediaType}
+    final uri = Uri.parse('$apiUrl/favorites/$mediaId')
+        .replace(queryParameters: {'type': mediaType});
+    final response = await _client.post(uri);
 
     if (response.statusCode != 200 && response.statusCode != 201) {
       throw Exception('Failed to add favorite: ${response.body}');
@@ -297,8 +352,10 @@ class NeoMoviesApiClient {
   }
 
   /// Remove movie/show from favorites
-  Future<void> removeFavorite(String mediaId) async {
-    final uri = Uri.parse('$apiUrl/favorites/$mediaId');
+  Future<void> removeFavorite(String mediaId, {String mediaType = 'movie'}) async {
+    // Backend route: DELETE /favorites/{id}?type={mediaType}
+    final uri = Uri.parse('$apiUrl/favorites/$mediaId')
+        .replace(queryParameters: {'type': mediaType});
     final response = await _client.delete(uri);
 
     if (response.statusCode != 200 && response.statusCode != 204) {
@@ -306,6 +363,26 @@ class NeoMoviesApiClient {
     }
   }
 
+  /// Check if media is in favorites
+  Future<bool> checkIsFavorite(String mediaId, {String mediaType = 'movie'}) async {
+    // Backend route: GET /favorites/{id}/check?type={mediaType}
+    final uri = Uri.parse('$apiUrl/favorites/$mediaId/check')
+        .replace(queryParameters: {'type': mediaType});
+    final response = await _client.get(uri);
+
+    if (response.statusCode == 200) {
+      final apiResponse = json.decode(response.body);
+      // API returns: {"success": true, "data": {"isFavorite": true}}
+      if (apiResponse is Map && apiResponse['data'] != null) {
+        final data = apiResponse['data'];
+        return data['isFavorite'] ?? false;
+      }
+      return false;
+    } else {
+      throw Exception('Failed to check favorite status: ${response.body}');
+    }
+  }
+
   // ============================================
   // Reactions Endpoints (NEW!)
   // ============================================
@@ -350,7 +427,11 @@ class NeoMoviesApiClient {
     final response = await _client.get(uri);
 
     if (response.statusCode == 200) {
-      final List<dynamic> data = json.decode(response.body);
+      final apiResponse = json.decode(response.body);
+      // API returns: {"success": true, "data": [...]}
+      final List<dynamic> data = (apiResponse is Map && apiResponse['data'] != null)
+          ? (apiResponse['data'] is List ? apiResponse['data'] : [])
+          : (apiResponse is List ? apiResponse : []);
       return data.map((json) => UserReaction.fromJson(json)).toList();
     } else {
       throw Exception('Failed to get my reactions: ${response.body}');
@@ -432,8 +513,18 @@ class NeoMoviesApiClient {
     if (response.statusCode == 200) {
       final decoded = json.decode(response.body);
       
+      // API returns: {"success": true, "data": {"page": 1, "results": [...], ...}}
       List<dynamic> results;
-      if (decoded is List) {
+      if (decoded is Map && decoded['success'] == true && decoded['data'] != null) {
+        final data = decoded['data'];
+        if (data is Map && data['results'] != null) {
+          results = data['results'];
+        } else if (data is List) {
+          results = data;
+        } else {
+          throw Exception('Unexpected data format in API response');
+        }
+      } else if (decoded is List) {
         results = decoded;
       } else if (decoded is Map && decoded['results'] != null) {
         results = decoded['results'];

lib/data/models/auth_response.dart

@@ -8,10 +8,13 @@ class AuthResponse {
   AuthResponse({required this.token, required this.user, required this.verified});
 
   factory AuthResponse.fromJson(Map<String, dynamic> json) {
+    // Handle wrapped response with "data" field
+    final data = json['data'] ?? json;
+    
     return AuthResponse(
-      token: json['token'] as String,
-      user: User.fromJson(json['user'] as Map<String, dynamic>),
-      verified: (json['verified'] as bool?) ?? (json['user']?['verified'] as bool? ?? true),
+      token: data['token'] as String,
+      user: User.fromJson(data['user'] as Map<String, dynamic>),
+      verified: (data['verified'] as bool?) ?? (data['user']?['verified'] as bool? ?? true),
     );
   }
 }

lib/data/models/favorite.dart

@@ -1,11 +1,12 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 class Favorite {
-  final int id;
+  final String id; // MongoDB ObjectID as string
   final String mediaId;
-  final String mediaType;
+  final String mediaType; // "movie" or "tv"
   final String title;
   final String posterPath;
+  final DateTime? createdAt;
 
   Favorite({
     required this.id,
@@ -13,24 +14,29 @@ class Favorite {
     required this.mediaType,
     required this.title,
     required this.posterPath,
+    this.createdAt,
   });
 
   factory Favorite.fromJson(Map<String, dynamic> json) {
     return Favorite(
-      id: json['id'] as int? ?? 0,
+      id: json['id'] as String? ?? '',
       mediaId: json['mediaId'] as String? ?? '',
-      mediaType: json['mediaType'] as String? ?? '',
+      mediaType: json['mediaType'] as String? ?? 'movie',
       title: json['title'] as String? ?? '',
       posterPath: json['posterPath'] as String? ?? '',
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt'] as String)
+          : null,
     );
   }
 
   String get fullPosterUrl {
-    final baseUrl = dotenv.env['API_URL']!;
     if (posterPath.isEmpty) {
-      return '$baseUrl/images/w500/placeholder.jpg';
+      return 'https://via.placeholder.com/500x750.png?text=No+Poster';
     }
+    // TMDB CDN base URL
+    const tmdbBaseUrl = 'https://image.tmdb.org/t/p';
     final cleanPath = posterPath.startsWith('/') ? posterPath.substring(1) : posterPath;
-    return '$baseUrl/images/w500/$cleanPath';
+    return '$tmdbBaseUrl/w500/$cleanPath';
   }
 }

lib/data/models/movie.dart

@@ -16,6 +16,8 @@ class Movie extends HiveObject {
   @HiveField(2)
   final String? posterPath;
 
+  final String? backdropPath;
+
   @HiveField(3)
   final String? overview;
 
@@ -51,6 +53,7 @@ class Movie extends HiveObject {
     required this.id,
     required this.title,
     this.posterPath,
+    this.backdropPath,
     this.overview,
     this.releaseDate,
     this.genres,
@@ -64,41 +67,104 @@ class Movie extends HiveObject {
   });
 
   factory Movie.fromJson(Map<String, dynamic> json) {
-    return Movie(
-      id: (json['id'] as num).toString(), // Ensure id is a string
-      title: (json['title'] ?? json['name'] ?? '') as String,
-      posterPath: json['poster_path'] as String?,
-      overview: json['overview'] as String?,
-      releaseDate: json['release_date'] != null && json['release_date'].isNotEmpty
-          ? DateTime.tryParse(json['release_date'] as String)
-          : json['first_air_date'] != null && json['first_air_date'].isNotEmpty
-              ? DateTime.tryParse(json['first_air_date'] as String)
-              : null,
-      genres: List<String>.from(json['genres']?.map((g) => g['name']) ?? []),
-      voteAverage: (json['vote_average'] as num?)?.toDouble() ?? 0.0,
-      popularity: (json['popularity'] as num?)?.toDouble() ?? 0.0,
-      runtime: json['runtime'] is num
-          ? (json['runtime'] as num).toInt()
-          : (json['episode_run_time'] is List && (json['episode_run_time'] as List).isNotEmpty)
-              ? ((json['episode_run_time'] as List).first as num).toInt()
-              : null,
-      seasonsCount: json['number_of_seasons'] as int?,
-      episodesCount: json['number_of_episodes'] as int?,
-      tagline: json['tagline'] as String?,
-      mediaType: (json['media_type'] ?? (json['title'] != null ? 'movie' : 'tv')) as String,
-    );
+    try {
+      print('Parsing Movie from JSON: ${json.keys.toList()}');
+      
+      // Parse genres safely - API returns: [{"id": 18, "name": "Drama"}]
+      List<String> genresList = [];
+      if (json['genres'] != null && json['genres'] is List) {
+        genresList = (json['genres'] as List)
+            .map((g) {
+              if (g is Map && g.containsKey('name')) {
+                return g['name'] as String? ?? '';
+              }
+              return '';
+            })
+            .where((name) => name.isNotEmpty)
+            .toList();
+        print('Parsed genres: $genresList');
+      }
+
+      // Parse dates safely
+      DateTime? parsedDate;
+      final releaseDate = json['release_date'];
+      final firstAirDate = json['first_air_date'];
+      
+      if (releaseDate != null && releaseDate.toString().isNotEmpty && releaseDate.toString() != 'null') {
+        parsedDate = DateTime.tryParse(releaseDate.toString());
+      } else if (firstAirDate != null && firstAirDate.toString().isNotEmpty && firstAirDate.toString() != 'null') {
+        parsedDate = DateTime.tryParse(firstAirDate.toString());
+      }
+
+      // Parse runtime (movie) or episode_run_time (TV)
+      int? runtimeValue;
+      if (json['runtime'] != null && json['runtime'] is num && (json['runtime'] as num) > 0) {
+        runtimeValue = (json['runtime'] as num).toInt();
+      } else if (json['episode_run_time'] != null && json['episode_run_time'] is List) {
+        final episodeRunTime = json['episode_run_time'] as List;
+        if (episodeRunTime.isNotEmpty && episodeRunTime.first is num) {
+          runtimeValue = (episodeRunTime.first as num).toInt();
+        }
+      }
+
+      // Determine media type
+      String mediaTypeValue = 'movie';
+      if (json.containsKey('media_type') && json['media_type'] != null) {
+        mediaTypeValue = json['media_type'] as String;
+      } else if (json.containsKey('name') || json.containsKey('first_air_date')) {
+        mediaTypeValue = 'tv';
+      }
+
+      final movie = Movie(
+        id: (json['id'] as num).toString(),
+        title: (json['title'] ?? json['name'] ?? 'Untitled') as String,
+        posterPath: json['poster_path'] as String?,
+        backdropPath: json['backdrop_path'] as String?,
+        overview: json['overview'] as String?,
+        releaseDate: parsedDate,
+        genres: genresList,
+        voteAverage: (json['vote_average'] as num?)?.toDouble() ?? 0.0,
+        popularity: (json['popularity'] as num?)?.toDouble() ?? 0.0,
+        runtime: runtimeValue,
+        seasonsCount: json['number_of_seasons'] as int?,
+        episodesCount: json['number_of_episodes'] as int?,
+        tagline: json['tagline'] as String?,
+        mediaType: mediaTypeValue,
+      );
+
+      print('Successfully parsed movie: ${movie.title}');
+      return movie;
+    } catch (e, stackTrace) {
+      print('❌ Error parsing Movie from JSON: $e');
+      print('Stack trace: $stackTrace');
+      print('JSON data: $json');
+      rethrow;
+    }
   }
 
   Map<String, dynamic> toJson() => _$MovieToJson(this);
 
   String get fullPosterUrl {
-    final baseUrl = dotenv.env['API_URL']!;
     if (posterPath == null || posterPath!.isEmpty) {
-      // Use the placeholder from our own backend
-      return '$baseUrl/images/w500/placeholder.jpg';
+      // Use API placeholder
+      final apiUrl = dotenv.env['API_URL'] ?? 'https://api.neomovies.ru';
+      return '$apiUrl/api/v1/images/w500/placeholder.jpg';
     }
-    // Null check is already performed above, so we can use `!`
+    // Use NeoMovies API images endpoint instead of TMDB directly
+    final apiUrl = dotenv.env['API_URL'] ?? 'https://api.neomovies.ru';
     final cleanPath = posterPath!.startsWith('/') ? posterPath!.substring(1) : posterPath!;
-    return '$baseUrl/images/w500/$cleanPath';
+    return '$apiUrl/api/v1/images/w500/$cleanPath';
+  }
+
+  String get fullBackdropUrl {
+    if (backdropPath == null || backdropPath!.isEmpty) {
+      // Use API placeholder
+      final apiUrl = dotenv.env['API_URL'] ?? 'https://api.neomovies.ru';
+      return '$apiUrl/api/v1/images/w780/placeholder.jpg';
+    }
+    // Use NeoMovies API images endpoint instead of TMDB directly
+    final apiUrl = dotenv.env['API_URL'] ?? 'https://api.neomovies.ru';
+    final cleanPath = backdropPath!.startsWith('/') ? backdropPath!.substring(1) : backdropPath!;
+    return '$apiUrl/api/v1/images/w780/$cleanPath';
   }
 }

lib/data/models/movie.g.dart

@@ -81,6 +81,7 @@ Movie _$MovieFromJson(Map<String, dynamic> json) => Movie(
       id: json['id'] as String,
       title: json['title'] as String,
       posterPath: json['posterPath'] as String?,
+      backdropPath: json['backdropPath'] as String?,
       overview: json['overview'] as String?,
       releaseDate: json['releaseDate'] == null
           ? null
@@ -100,6 +101,7 @@ Map<String, dynamic> _$MovieToJson(Movie instance) => <String, dynamic>{
       'id': instance.id,
       'title': instance.title,
       'posterPath': instance.posterPath,
+      'backdropPath': instance.backdropPath,
       'overview': instance.overview,
       'releaseDate': instance.releaseDate?.toIso8601String(),
       'genres': instance.genres,

lib/data/models/player/audio_track.dart

@@ -0,0 +1,34 @@
+class AudioTrack {
+  final String name;
+  final String language;
+  final String url;
+  final bool isDefault;
+
+  AudioTrack({
+    required this.name,
+    required this.language,
+    required this.url,
+    this.isDefault = false,
+  });
+
+  factory AudioTrack.fromJson(Map<String, dynamic> json) {
+    return AudioTrack(
+      name: json['name'] ?? '',
+      language: json['language'] ?? '',
+      url: json['url'] ?? '',
+      isDefault: json['isDefault'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'name': name,
+      'language': language,
+      'url': url,
+      'isDefault': isDefault,
+    };
+  }
+
+  @override
+  String toString() => name;
+}

lib/data/models/player/player_response.g.dart

@@ -0,0 +1,21 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'player_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PlayerResponse _$PlayerResponseFromJson(Map<String, dynamic> json) =>
+    PlayerResponse(
+      embedUrl: json['embedUrl'] as String?,
+      playerType: json['playerType'] as String?,
+      error: json['error'] as String?,
+    );
+
+Map<String, dynamic> _$PlayerResponseToJson(PlayerResponse instance) =>
+    <String, dynamic>{
+      'embedUrl': instance.embedUrl,
+      'playerType': instance.playerType,
+      'error': instance.error,
+    };

lib/data/models/player/player_settings.dart

@@ -0,0 +1,73 @@
+import 'package:neomovies_mobile/data/models/player/video_quality.dart';
+import 'package:neomovies_mobile/data/models/player/audio_track.dart';
+import 'package:neomovies_mobile/data/models/player/subtitle.dart';
+
+class PlayerSettings {
+  final VideoQuality? selectedQuality;
+  final AudioTrack? selectedAudioTrack;
+  final Subtitle? selectedSubtitle;
+  final double volume;
+  final double playbackSpeed;
+  final bool autoPlay;
+  final bool muted;
+
+  PlayerSettings({
+    this.selectedQuality,
+    this.selectedAudioTrack,
+    this.selectedSubtitle,
+    this.volume = 1.0,
+    this.playbackSpeed = 1.0,
+    this.autoPlay = true,
+    this.muted = false,
+  });
+
+  PlayerSettings copyWith({
+    VideoQuality? selectedQuality,
+    AudioTrack? selectedAudioTrack,
+    Subtitle? selectedSubtitle,
+    double? volume,
+    double? playbackSpeed,
+    bool? autoPlay,
+    bool? muted,
+  }) {
+    return PlayerSettings(
+      selectedQuality: selectedQuality ?? this.selectedQuality,
+      selectedAudioTrack: selectedAudioTrack ?? this.selectedAudioTrack,
+      selectedSubtitle: selectedSubtitle ?? this.selectedSubtitle,
+      volume: volume ?? this.volume,
+      playbackSpeed: playbackSpeed ?? this.playbackSpeed,
+      autoPlay: autoPlay ?? this.autoPlay,
+      muted: muted ?? this.muted,
+    );
+  }
+
+  factory PlayerSettings.fromJson(Map<String, dynamic> json) {
+    return PlayerSettings(
+      selectedQuality: json['selectedQuality'] != null 
+          ? VideoQuality.fromJson(json['selectedQuality']) 
+          : null,
+      selectedAudioTrack: json['selectedAudioTrack'] != null 
+          ? AudioTrack.fromJson(json['selectedAudioTrack']) 
+          : null,
+      selectedSubtitle: json['selectedSubtitle'] != null 
+          ? Subtitle.fromJson(json['selectedSubtitle']) 
+          : null,
+      volume: json['volume']?.toDouble() ?? 1.0,
+      playbackSpeed: json['playbackSpeed']?.toDouble() ?? 1.0,
+      autoPlay: json['autoPlay'] ?? true,
+      muted: json['muted'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'selectedQuality': selectedQuality?.toJson(),
+      'selectedAudioTrack': selectedAudioTrack?.toJson(),
+      'selectedSubtitle': selectedSubtitle?.toJson(),
+      'volume': volume,
+      'playbackSpeed': playbackSpeed,
+      'autoPlay': autoPlay,
+      'muted': muted,
+    };
+  }
+}

lib/data/models/player/subtitle.dart

@@ -0,0 +1,34 @@
+class Subtitle {
+  final String name;
+  final String language;
+  final String url;
+  final bool isDefault;
+
+  Subtitle({
+    required this.name,
+    required this.language,
+    required this.url,
+    this.isDefault = false,
+  });
+
+  factory Subtitle.fromJson(Map<String, dynamic> json) {
+    return Subtitle(
+      name: json['name'] ?? '',
+      language: json['language'] ?? '',
+      url: json['url'] ?? '',
+      isDefault: json['isDefault'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'name': name,
+      'language': language,
+      'url': url,
+      'isDefault': isDefault,
+    };
+  }
+
+  @override
+  String toString() => name;
+}

lib/data/models/player/video_quality.dart

@@ -0,0 +1,38 @@
+class VideoQuality {
+  final String quality;
+  final String url;
+  final int bandwidth;
+  final int width;
+  final int height;
+
+  VideoQuality({
+    required this.quality,
+    required this.url,
+    required this.bandwidth,
+    required this.width,
+    required this.height,
+  });
+
+  factory VideoQuality.fromJson(Map<String, dynamic> json) {
+    return VideoQuality(
+      quality: json['quality'] ?? '',
+      url: json['url'] ?? '',
+      bandwidth: json['bandwidth'] ?? 0,
+      width: json['width'] ?? 0,
+      height: json['height'] ?? 0,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'quality': quality,
+      'url': url,
+      'bandwidth': bandwidth,
+      'width': width,
+      'height': height,
+    };
+  }
+
+  @override
+  String toString() => quality;
+}

lib/data/models/reaction.dart

@@ -14,12 +14,20 @@ class Reaction {
 
 class UserReaction {
   final String? reactionType;
+  final String? mediaType;
+  final String? mediaId;
 
-  UserReaction({this.reactionType});
+  UserReaction({
+    this.reactionType,
+    this.mediaType,
+    this.mediaId,
+  });
 
   factory UserReaction.fromJson(Map<String, dynamic> json) {
     return UserReaction(
       reactionType: json['type'] as String?,
+      mediaType: json['mediaType'] as String?,
+      mediaId: json['mediaId'] as String?,
     );
   }
 }

lib/data/models/torrent.freezed.dart

@@ -27,12 +27,8 @@ mixin _$Torrent {
   int? get seeders => throw _privateConstructorUsedError;
   int? get size => throw _privateConstructorUsedError;
 
-  /// Serializes this Torrent to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of Torrent
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $TorrentCopyWith<Torrent> get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -60,8 +56,6 @@ class _$TorrentCopyWithImpl<$Res, $Val extends Torrent>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of Torrent
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -125,8 +119,6 @@ class __$$TorrentImplCopyWithImpl<$Res>
       _$TorrentImpl _value, $Res Function(_$TorrentImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of Torrent
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -211,14 +203,12 @@ class _$TorrentImpl implements _Torrent {
             (identical(other.size, size) || other.size == size));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode =>
       Object.hash(runtimeType, magnet, title, name, quality, seeders, size);
 
-  /// Create a copy of Torrent
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$TorrentImplCopyWith<_$TorrentImpl> get copyWith =>
@@ -255,11 +245,8 @@ abstract class _Torrent implements Torrent {
   int? get seeders;
   @override
   int? get size;
-
-  /// Create a copy of Torrent
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$TorrentImplCopyWith<_$TorrentImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }

lib/data/models/torrent/torrent_item.dart

@@ -0,0 +1,29 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'torrent_item.g.dart';
+
+@JsonSerializable()
+class TorrentItem {
+  final String? title;
+  final String? magnetUrl;
+  final String? quality;
+  final int? seeders;
+  final int? leechers;
+  final String? size;
+  final String? source;
+  
+  TorrentItem({
+    this.title,
+    this.magnetUrl,
+    this.quality,
+    this.seeders,
+    this.leechers,
+    this.size,
+    this.source,
+  });
+  
+  factory TorrentItem.fromJson(Map<String, dynamic> json) =>
+      _$TorrentItemFromJson(json);
+  
+  Map<String, dynamic> toJson() => _$TorrentItemToJson(this);
+}

lib/data/models/torrent/torrent_item.g.dart

@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'torrent_item.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+TorrentItem _$TorrentItemFromJson(Map<String, dynamic> json) => TorrentItem(
+      title: json['title'] as String?,
+      magnetUrl: json['magnetUrl'] as String?,
+      quality: json['quality'] as String?,
+      seeders: (json['seeders'] as num?)?.toInt(),
+      leechers: (json['leechers'] as num?)?.toInt(),
+      size: json['size'] as String?,
+      source: json['source'] as String?,
+    );
+
+Map<String, dynamic> _$TorrentItemToJson(TorrentItem instance) =>
+    <String, dynamic>{
+      'title': instance.title,
+      'magnetUrl': instance.magnetUrl,
+      'quality': instance.quality,
+      'seeders': instance.seeders,
+      'leechers': instance.leechers,
+      'size': instance.size,
+      'source': instance.source,
+    };

lib/data/models/torrent_info.dart

@@ -0,0 +1,180 @@
+/// File priority enum matching Android implementation
+enum FilePriority {
+  DONT_DOWNLOAD(0),
+  NORMAL(4),
+  HIGH(7);
+
+  const FilePriority(this.value);
+  final int value;
+
+  static FilePriority fromValue(int value) {
+    return FilePriority.values.firstWhere(
+      (priority) => priority.value == value,
+      orElse: () => FilePriority.NORMAL,
+    );
+  }
+
+  bool operator >(FilePriority other) => value > other.value;
+  bool operator <(FilePriority other) => value < other.value;
+  bool operator >=(FilePriority other) => value >= other.value;
+  bool operator <=(FilePriority other) => value <= other.value;
+}
+
+/// Torrent file information matching Android TorrentFileInfo
+class TorrentFileInfo {
+  final String path;
+  final int size;
+  final FilePriority priority;
+  final double progress;
+
+  TorrentFileInfo({
+    required this.path,
+    required this.size,
+    required this.priority,
+    this.progress = 0.0,
+  });
+
+  factory TorrentFileInfo.fromAndroidJson(Map<String, dynamic> json) {
+    return TorrentFileInfo(
+      path: json['path'] as String,
+      size: json['size'] as int,
+      priority: FilePriority.fromValue(json['priority'] as int),
+      progress: (json['progress'] as num?)?.toDouble() ?? 0.0,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'path': path,
+      'size': size,
+      'priority': priority.value,
+      'progress': progress,
+    };
+  }
+}
+
+/// Main torrent information class matching Android TorrentInfo
+class TorrentInfo {
+  final String infoHash;
+  final String name;
+  final int totalSize;
+  final double progress;
+  final int downloadSpeed;
+  final int uploadSpeed;
+  final int numSeeds;
+  final int numPeers;
+  final String state;
+  final String savePath;
+  final List<TorrentFileInfo> files;
+  final int pieceLength;
+  final int numPieces;
+  final DateTime? addedTime;
+
+  TorrentInfo({
+    required this.infoHash,
+    required this.name,
+    required this.totalSize,
+    required this.progress,
+    required this.downloadSpeed,
+    required this.uploadSpeed,
+    required this.numSeeds,
+    required this.numPeers,
+    required this.state,
+    required this.savePath,
+    required this.files,
+    this.pieceLength = 0,
+    this.numPieces = 0,
+    this.addedTime,
+  });
+
+  factory TorrentInfo.fromAndroidJson(Map<String, dynamic> json) {
+    final filesJson = json['files'] as List<dynamic>? ?? [];
+    final files = filesJson
+        .map((fileJson) => TorrentFileInfo.fromAndroidJson(fileJson as Map<String, dynamic>))
+        .toList();
+
+    return TorrentInfo(
+      infoHash: json['infoHash'] as String,
+      name: json['name'] as String,
+      totalSize: json['totalSize'] as int,
+      progress: (json['progress'] as num).toDouble(),
+      downloadSpeed: json['downloadSpeed'] as int,
+      uploadSpeed: json['uploadSpeed'] as int,
+      numSeeds: json['numSeeds'] as int,
+      numPeers: json['numPeers'] as int,
+      state: json['state'] as String,
+      savePath: json['savePath'] as String,
+      files: files,
+      pieceLength: json['pieceLength'] as int? ?? 0,
+      numPieces: json['numPieces'] as int? ?? 0,
+      addedTime: json['addedTime'] != null
+          ? DateTime.fromMillisecondsSinceEpoch(json['addedTime'] as int)
+          : null,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'infoHash': infoHash,
+      'name': name,
+      'totalSize': totalSize,
+      'progress': progress,
+      'downloadSpeed': downloadSpeed,
+      'uploadSpeed': uploadSpeed,
+      'numSeeds': numSeeds,
+      'numPeers': numPeers,
+      'state': state,
+      'savePath': savePath,
+      'files': files.map((file) => file.toJson()).toList(),
+      'pieceLength': pieceLength,
+      'numPieces': numPieces,
+      'addedTime': addedTime?.millisecondsSinceEpoch,
+    };
+  }
+
+  /// Get video files only
+  List<TorrentFileInfo> get videoFiles {
+    final videoExtensions = {'.mp4', '.mkv', '.avi', '.mov', '.wmv', '.flv', '.webm', '.m4v'};
+    return files.where((file) {
+      final extension = file.path.toLowerCase().split('.').last;
+      return videoExtensions.contains('.$extension');
+    }).toList();
+  }
+
+  /// Get the largest video file (usually the main movie file)
+  TorrentFileInfo? get mainVideoFile {
+    final videos = videoFiles;
+    if (videos.isEmpty) return null;
+    
+    videos.sort((a, b) => b.size.compareTo(a.size));
+    return videos.first;
+  }
+
+  /// Check if torrent is completed
+  bool get isCompleted => progress >= 1.0;
+
+  /// Check if torrent is downloading
+  bool get isDownloading => state == 'DOWNLOADING';
+
+  /// Check if torrent is seeding
+  bool get isSeeding => state == 'SEEDING';
+
+  /// Check if torrent is paused
+  bool get isPaused => state == 'PAUSED';
+
+  /// Get formatted download speed
+  String get formattedDownloadSpeed => _formatBytes(downloadSpeed);
+
+  /// Get formatted upload speed
+  String get formattedUploadSpeed => _formatBytes(uploadSpeed);
+
+  /// Get formatted total size
+  String get formattedTotalSize => _formatBytes(totalSize);
+
+  static String _formatBytes(int bytes) {
+    if (bytes < 1024) return '${bytes}B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)}KB';
+    if (bytes < 1024 * 1024 * 1024) return '${(bytes / (1024 * 1024)).toStringAsFixed(1)}MB';
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)}GB';
+  }
+}

lib/data/models/user.dart

@@ -2,14 +2,30 @@ class User {
   final String id;
   final String name;
   final String email;
+  final bool verified;
 
-  User({required this.id, required this.name, required this.email});
+  User({
+    required this.id, 
+    required this.name, 
+    required this.email,
+    this.verified = true,
+  });
 
   factory User.fromJson(Map<String, dynamic> json) {
     return User(
-      id: json['_id'] as String? ?? '',
+      id: (json['_id'] ?? json['id'] ?? '') as String,
       name: json['name'] as String? ?? '',
       email: json['email'] as String? ?? '',
+      verified: json['verified'] as bool? ?? true,
     );
   }
+  
+  Map<String, dynamic> toJson() {
+    return {
+      '_id': id,
+      'name': name,
+      'email': email,
+      'verified': verified,
+    };
+  }
 }

lib/data/repositories/auth_repository.dart

@@ -33,8 +33,13 @@ class AuthRepository {
   }
 
   Future<void> verifyEmail(String email, String code) async {
-    await _apiClient.verify(email, code);
-    // After successful verification, the user should log in.
+    final response = await _apiClient.verify(email, code);
+    // Auto-login user after successful verification
+    await _storageService.saveToken(response.token);
+    await _storageService.saveUserData(
+      name: response.user.name,
+      email: response.user.email,
+    );
   }
 
   Future<void> resendVerificationCode(String email) async {

lib/data/repositories/reactions_repository.dart

@@ -10,7 +10,7 @@ class ReactionsRepository {
     return await _apiClient.getReactionCounts(mediaType, mediaId);
   }
 
-  Future<UserReaction> getMyReaction(String mediaType,String mediaId) async {
+  Future<UserReaction?> getMyReaction(String mediaType,String mediaId) async {
     return await _apiClient.getMyReaction(mediaType, mediaId);
   }
 

lib/data/services/player_embed_service.dart

@@ -0,0 +1,130 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+
+/// Service for getting player embed URLs from NeoMovies API server
+class PlayerEmbedService {
+  static const String _baseUrl = 'https://neomovies.site'; // Replace with actual base URL
+  
+  /// Get Vibix player embed URL from server
+  static Future<String> getVibixEmbedUrl({
+    required String videoUrl,
+    required String title,
+    String? imdbId,
+    String? season,
+    String? episode,
+  }) async {
+    try {
+      final response = await http.post(
+        Uri.parse('$_baseUrl/api/player/vibix/embed'),
+        headers: {
+          'Content-Type': 'application/json',
+          'Accept': 'application/json',
+        },
+        body: jsonEncode({
+          'videoUrl': videoUrl,
+          'title': title,
+          'imdbId': imdbId,
+          'season': season,
+          'episode': episode,
+          'autoplay': true,
+        }),
+      );
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body);
+        return data['embedUrl'] as String;
+      } else {
+        throw Exception('Failed to get Vibix embed URL: ${response.statusCode}');
+      }
+    } catch (e) {
+      // Fallback to direct URL if server is unavailable
+      final encodedVideoUrl = Uri.encodeComponent(videoUrl);
+      final encodedTitle = Uri.encodeComponent(title);
+      return 'https://vibix.me/embed/?src=$encodedVideoUrl&autoplay=1&title=$encodedTitle';
+    }
+  }
+
+  /// Get Alloha player embed URL from server
+  static Future<String> getAllohaEmbedUrl({
+    required String videoUrl,
+    required String title,
+    String? imdbId,
+    String? season,
+    String? episode,
+  }) async {
+    try {
+      final response = await http.post(
+        Uri.parse('$_baseUrl/api/player/alloha/embed'),
+        headers: {
+          'Content-Type': 'application/json',
+          'Accept': 'application/json',
+        },
+        body: jsonEncode({
+          'videoUrl': videoUrl,
+          'title': title,
+          'imdbId': imdbId,
+          'season': season,
+          'episode': episode,
+          'autoplay': true,
+        }),
+      );
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body);
+        return data['embedUrl'] as String;
+      } else {
+        throw Exception('Failed to get Alloha embed URL: ${response.statusCode}');
+      }
+    } catch (e) {
+      // Fallback to direct URL if server is unavailable
+      final encodedVideoUrl = Uri.encodeComponent(videoUrl);
+      final encodedTitle = Uri.encodeComponent(title);
+      return 'https://alloha.tv/embed?src=$encodedVideoUrl&autoplay=1&title=$encodedTitle';
+    }
+  }
+
+  /// Get player configuration from server
+  static Future<Map<String, dynamic>?> getPlayerConfig({
+    required String playerType,
+    String? imdbId,
+    String? season,
+    String? episode,
+  }) async {
+    try {
+      final response = await http.get(
+        Uri.parse('$_baseUrl/api/player/$playerType/config').replace(
+          queryParameters: {
+            if (imdbId != null) 'imdbId': imdbId,
+            if (season != null) 'season': season,
+            if (episode != null) 'episode': episode,
+          },
+        ),
+        headers: {
+          'Accept': 'application/json',
+        },
+      );
+
+      if (response.statusCode == 200) {
+        return jsonDecode(response.body) as Map<String, dynamic>;
+      } else {
+        return null;
+      }
+    } catch (e) {
+      return null;
+    }
+  }
+
+  /// Check if server player API is available
+  static Future<bool> isServerApiAvailable() async {
+    try {
+      final response = await http.get(
+        Uri.parse('$_baseUrl/api/player/health'),
+        headers: {'Accept': 'application/json'},
+      ).timeout(const Duration(seconds: 5));
+
+      return response.statusCode == 200;
+    } catch (e) {
+      return false;
+    }
+  }
+}

lib/data/services/torrent_platform_service.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:flutter/services.dart';
+import '../models/torrent_info.dart';
 
 /// Data classes for torrent metadata (matching Kotlin side)
 
@@ -340,106 +341,89 @@ class DownloadProgress {
 class TorrentPlatformService {
   static const MethodChannel _channel = MethodChannel('com.neo.neomovies_mobile/torrent');
 
-  /// Получить базовую информацию из magnet-ссылки
-  static Future<MagnetBasicInfo> parseMagnetBasicInfo(String magnetUri) async {
-    try {
-      final String result = await _channel.invokeMethod('parseMagnetBasicInfo', {
-        'magnetUri': magnetUri,
-      });
-      
-      final Map<String, dynamic> json = jsonDecode(result);
-      return MagnetBasicInfo.fromJson(json);
-    } on PlatformException catch (e) {
-      throw Exception('Failed to parse magnet URI: ${e.message}');
-    } catch (e) {
-      throw Exception('Failed to parse magnet basic info: $e');
-    }
-  }
-
-  /// Получить полные метаданные торрента
-  static Future<TorrentMetadataFull> fetchFullMetadata(String magnetUri) async {
-    try {
-      final String result = await _channel.invokeMethod('fetchFullMetadata', {
-        'magnetUri': magnetUri,
-      });
-      
-      final Map<String, dynamic> json = jsonDecode(result);
-      return TorrentMetadataFull.fromJson(json);
-    } on PlatformException catch (e) {
-      throw Exception('Failed to fetch torrent metadata: ${e.message}');
-    } catch (e) {
-      throw Exception('Failed to parse torrent metadata: $e');
-    }
-  }
-
-  /// Тестирование торрент-сервиса
-  static Future<String> testTorrentService() async {
-    try {
-      final String result = await _channel.invokeMethod('testTorrentService');
-      return result;
-    } on PlatformException catch (e) {
-      throw Exception('Torrent service test failed: ${e.message}');
-    }
-  }
-
-  /// Get torrent metadata from magnet link (legacy method)
-  static Future<TorrentMetadata> getTorrentMetadata(String magnetLink) async {
-    try {
-      final String result = await _channel.invokeMethod('getTorrentMetadata', {
-        'magnetLink': magnetLink,
-      });
-      
-      final Map<String, dynamic> json = jsonDecode(result);
-      return TorrentMetadata.fromJson(json);
-    } on PlatformException catch (e) {
-      throw Exception('Failed to get torrent metadata: ${e.message}');
-    } catch (e) {
-      throw Exception('Failed to parse torrent metadata: $e');
-    }
-  }
-
-  /// Start downloading selected files from torrent
-  static Future<String> startDownload({
-    required String magnetLink,
-    required List<int> selectedFiles,
-    String? downloadPath,
+  /// Add torrent from magnet URI and start downloading
+  static Future<String> addTorrent({
+    required String magnetUri,
+    String? savePath,
   }) async {
     try {
-      final String infoHash = await _channel.invokeMethod('startDownload', {
-        'magnetLink': magnetLink,
-        'selectedFiles': selectedFiles,
-        'downloadPath': downloadPath,
+      final String infoHash = await _channel.invokeMethod('addTorrent', {
+        'magnetUri': magnetUri,
+        'savePath': savePath ?? '/storage/emulated/0/Download/NeoMovies',
       });
       
       return infoHash;
     } on PlatformException catch (e) {
-      throw Exception('Failed to start download: ${e.message}');
+      throw Exception('Failed to add torrent: ${e.message}');
+    }
+  }
+
+  /// Get all torrents
+  static Future<List<DownloadProgress>> getAllDownloads() async {
+    try {
+      final String result = await _channel.invokeMethod('getTorrents');
+      
+      final List<dynamic> jsonList = jsonDecode(result);
+      return jsonList.map((json) {
+        final data = json as Map<String, dynamic>;
+        return DownloadProgress(
+          infoHash: data['infoHash'] as String,
+          progress: (data['progress'] as num).toDouble(),
+          downloadRate: data['downloadSpeed'] as int,
+          uploadRate: data['uploadSpeed'] as int,
+          numSeeds: data['numSeeds'] as int,
+          numPeers: data['numPeers'] as int,
+          state: data['state'] as String,
+        );
+      }).toList();
+    } on PlatformException catch (e) {
+      throw Exception('Failed to get all downloads: ${e.message}');
+    } catch (e) {
+      throw Exception('Failed to parse downloads: $e');
+    }
+  }
+
+  /// Get single torrent info
+  static Future<TorrentInfo?> getTorrent(String infoHash) async {
+    try {
+      final String result = await _channel.invokeMethod('getTorrent', {
+        'infoHash': infoHash,
+      });
+      
+      final Map<String, dynamic> json = jsonDecode(result);
+      return TorrentInfo.fromAndroidJson(json);
+    } on PlatformException catch (e) {
+      if (e.code == 'NOT_FOUND') return null;
+      throw Exception('Failed to get torrent: ${e.message}');
+    } catch (e) {
+      throw Exception('Failed to parse torrent: $e');
     }
   }
 
   /// Get download progress for a torrent
   static Future<DownloadProgress?> getDownloadProgress(String infoHash) async {
     try {
-      final String? result = await _channel.invokeMethod('getDownloadProgress', {
-        'infoHash': infoHash,
-      });
+      final torrentInfo = await getTorrent(infoHash);
+      if (torrentInfo == null) return null;
       
-      if (result == null) return null;
-      
-      final Map<String, dynamic> json = jsonDecode(result);
-      return DownloadProgress.fromJson(json);
-    } on PlatformException catch (e) {
-      if (e.code == 'NOT_FOUND') return null;
-      throw Exception('Failed to get download progress: ${e.message}');
+      return DownloadProgress(
+        infoHash: torrentInfo.infoHash,
+        progress: torrentInfo.progress,
+        downloadRate: torrentInfo.downloadSpeed,
+        uploadRate: torrentInfo.uploadSpeed,
+        numSeeds: torrentInfo.numSeeds,
+        numPeers: torrentInfo.numPeers,
+        state: torrentInfo.state,
+      );
     } catch (e) {
-      throw Exception('Failed to parse download progress: $e');
+      return null;
     }
   }
 
   /// Pause download
   static Future<bool> pauseDownload(String infoHash) async {
     try {
-      final bool result = await _channel.invokeMethod('pauseDownload', {
+      final bool result = await _channel.invokeMethod('pauseTorrent', {
         'infoHash': infoHash,
       });
       
@@ -452,7 +436,7 @@ class TorrentPlatformService {
   /// Resume download
   static Future<bool> resumeDownload(String infoHash) async {
     try {
-      final bool result = await _channel.invokeMethod('resumeDownload', {
+      final bool result = await _channel.invokeMethod('resumeTorrent', {
         'infoHash': infoHash,
       });
       
@@ -465,8 +449,9 @@ class TorrentPlatformService {
   /// Cancel and remove download
   static Future<bool> cancelDownload(String infoHash) async {
     try {
-      final bool result = await _channel.invokeMethod('cancelDownload', {
+      final bool result = await _channel.invokeMethod('removeTorrent', {
         'infoHash': infoHash,
+        'deleteFiles': true,
       });
       
       return result;
@@ -475,19 +460,137 @@ class TorrentPlatformService {
     }
   }
 
-  /// Get all active downloads
-  static Future<List<DownloadProgress>> getAllDownloads() async {
+  /// Set file priority
+  static Future<bool> setFilePriority(String infoHash, int fileIndex, FilePriority priority) async {
     try {
-      final String result = await _channel.invokeMethod('getAllDownloads');
+      final bool result = await _channel.invokeMethod('setFilePriority', {
+        'infoHash': infoHash,
+        'fileIndex': fileIndex,
+        'priority': priority.value,
+      });
       
-      final List<dynamic> jsonList = jsonDecode(result);
-      return jsonList
-          .map((json) => DownloadProgress.fromJson(json as Map<String, dynamic>))
-          .toList();
+      return result;
     } on PlatformException catch (e) {
-      throw Exception('Failed to get all downloads: ${e.message}');
+      throw Exception('Failed to set file priority: ${e.message}');
+    }
+  }
+
+  /// Start downloading selected files from torrent
+  static Future<String> startDownload({
+    required String magnetLink,
+    required List<int> selectedFiles,
+    String? downloadPath,
+  }) async {
+    try {
+      // First add the torrent
+      final String infoHash = await addTorrent(
+        magnetUri: magnetLink,
+        savePath: downloadPath,
+      );
+      
+      // Wait for metadata to be received
+      await Future.delayed(const Duration(seconds: 2));
+      
+      // Set file priorities
+      final torrentInfo = await getTorrent(infoHash);
+      if (torrentInfo != null) {
+        for (int i = 0; i < torrentInfo.files.length; i++) {
+          final priority = selectedFiles.contains(i) 
+            ? FilePriority.NORMAL 
+            : FilePriority.DONT_DOWNLOAD;
+          await setFilePriority(infoHash, i, priority);
+        }
+      }
+      
+      return infoHash;
     } catch (e) {
-      throw Exception('Failed to parse downloads: $e');
+      throw Exception('Failed to start download: $e');
+    }
+  }
+
+  // Legacy methods for compatibility with existing code
+
+  /// Get torrent metadata from magnet link (legacy method)
+  static Future<TorrentMetadata> getTorrentMetadata(String magnetLink) async {
+    try {
+      // This is a simplified implementation that adds the torrent and gets metadata
+      final infoHash = await addTorrent(magnetUri: magnetLink);
+      await Future.delayed(const Duration(seconds: 3)); // Wait for metadata
+      
+      final torrentInfo = await getTorrent(infoHash);
+      if (torrentInfo == null) {
+        throw Exception('Failed to get torrent metadata');
+      }
+      
+      return TorrentMetadata(
+        name: torrentInfo.name,
+        totalSize: torrentInfo.totalSize,
+        files: torrentInfo.files.map((file) => TorrentFileInfo(
+          path: file.path,
+          size: file.size,
+          selected: file.priority > FilePriority.DONT_DOWNLOAD,
+        )).toList(),
+        infoHash: torrentInfo.infoHash,
+      );
+    } catch (e) {
+      throw Exception('Failed to get torrent metadata: $e');
+    }
+  }
+
+  /// Получить базовую информацию из magnet-ссылки (legacy)
+  static Future<MagnetBasicInfo> parseMagnetBasicInfo(String magnetUri) async {
+    try {
+      // Parse magnet URI manually since Android implementation doesn't have this
+      final uri = Uri.parse(magnetUri);
+      final params = uri.queryParameters;
+      
+      return MagnetBasicInfo(
+        name: params['dn'] ?? 'Unknown',
+        infoHash: params['xt']?.replaceFirst('urn:btih:', '') ?? '',
+        trackers: params['tr'] != null ? [params['tr']!] : [],
+        totalSize: 0,
+      );
+    } catch (e) {
+      throw Exception('Failed to parse magnet basic info: $e');
+    }
+  }
+
+  /// Получить полные метаданные торрента (legacy)
+  static Future<TorrentMetadataFull> fetchFullMetadata(String magnetUri) async {
+    try {
+      final basicInfo = await parseMagnetBasicInfo(magnetUri);
+      final metadata = await getTorrentMetadata(magnetUri);
+      
+      return TorrentMetadataFull(
+        name: metadata.name,
+        infoHash: metadata.infoHash,
+        totalSize: metadata.totalSize,
+        pieceLength: 0,
+        numPieces: 0,
+        fileStructure: FileStructure(
+          rootDirectory: DirectoryNode(
+            name: metadata.name,
+            path: '/',
+            files: metadata.files.map((file) => FileInfo(
+              name: file.path.split('/').last,
+              path: file.path,
+              size: file.size,
+              index: metadata.files.indexOf(file),
+            )).toList(),
+            subdirectories: [],
+            totalSize: metadata.totalSize,
+            fileCount: metadata.files.length,
+          ),
+          totalFiles: metadata.files.length,
+          filesByType: {'video': metadata.files.length},
+        ),
+        trackers: basicInfo.trackers,
+        creationDate: 0,
+        comment: '',
+        createdBy: '',
+      );
+    } catch (e) {
+      throw Exception('Failed to fetch full metadata: $e');
     }
   }
 }

lib/main.dart

@@ -19,6 +19,7 @@ import 'package:neomovies_mobile/presentation/providers/favorites_provider.dart'
 import 'package:neomovies_mobile/presentation/providers/home_provider.dart';
 import 'package:neomovies_mobile/presentation/providers/movie_detail_provider.dart';
 import 'package:neomovies_mobile/presentation/providers/reactions_provider.dart';
+import 'package:neomovies_mobile/presentation/providers/downloads_provider.dart';
 import 'package:neomovies_mobile/presentation/screens/main_screen.dart';
 import 'package:provider/provider.dart';
 

lib/presentation/cubits/torrent/torrent_state.freezed.dart

@@ -108,9 +108,6 @@ class _$TorrentStateCopyWithImpl<$Res, $Val extends TorrentState>
   final $Val _value;
   // ignore: unused_field
   final $Res Function($Val) _then;
-
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -127,9 +124,6 @@ class __$$InitialImplCopyWithImpl<$Res>
   __$$InitialImplCopyWithImpl(
       _$InitialImpl _value, $Res Function(_$InitialImpl) _then)
       : super(_value, _then);
-
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -268,9 +262,6 @@ class __$$LoadingImplCopyWithImpl<$Res>
   __$$LoadingImplCopyWithImpl(
       _$LoadingImpl _value, $Res Function(_$LoadingImpl) _then)
       : super(_value, _then);
-
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -419,8 +410,6 @@ class __$$LoadedImplCopyWithImpl<$Res>
       _$LoadedImpl _value, $Res Function(_$LoadedImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -551,9 +540,7 @@ class _$LoadedImpl implements _Loaded {
       const DeepCollectionEquality().hash(_availableSeasons),
       selectedQuality);
 
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith =>
@@ -678,10 +665,7 @@ abstract class _Loaded implements TorrentState {
   int? get selectedSeason;
   List<int>? get availableSeasons;
   String? get selectedQuality;
-
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$LoadedImplCopyWith<_$LoadedImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -703,8 +687,6 @@ class __$$ErrorImplCopyWithImpl<$Res>
       _$ErrorImpl _value, $Res Function(_$ErrorImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -743,9 +725,7 @@ class _$ErrorImpl implements _Error {
   @override
   int get hashCode => Object.hash(runtimeType, message);
 
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ErrorImplCopyWith<_$ErrorImpl> get copyWith =>
@@ -854,10 +834,7 @@ abstract class _Error implements TorrentState {
   const factory _Error({required final String message}) = _$ErrorImpl;
 
   String get message;
-
-  /// Create a copy of TorrentState
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ErrorImplCopyWith<_$ErrorImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }

lib/presentation/providers/auth_provider.dart

@@ -93,9 +93,9 @@ class AuthProvider extends ChangeNotifier {
     notifyListeners();
     try {
       await _authRepository.verifyEmail(email, code);
-      // After verification, user should log in.
-      // For a better UX, we could auto-login them, but for now, we'll just go to the unauthenticated state.
-      _state = AuthState.unauthenticated;
+      // Auto-login after successful verification
+      _user = await _authRepository.getCurrentUser();
+      _state = AuthState.authenticated;
     } catch (e) {
       _error = e.toString();
       _state = AuthState.error;

lib/presentation/providers/downloads_provider.dart

@@ -0,0 +1,174 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import '../../data/services/torrent_platform_service.dart';
+import '../../data/models/torrent_info.dart';
+
+/// Provider для управления загрузками торрентов
+class DownloadsProvider with ChangeNotifier {
+  final List<TorrentInfo> _torrents = [];
+  Timer? _progressTimer;
+  bool _isLoading = false;
+  String? _error;
+  String? _stackTrace;
+
+  List<TorrentInfo> get torrents => List.unmodifiable(_torrents);
+  bool get isLoading => _isLoading;
+  String? get error => _error;
+  String? get stackTrace => _stackTrace;
+
+  DownloadsProvider() {
+    _startProgressUpdates();
+  }
+
+  @override
+  void dispose() {
+    _progressTimer?.cancel();
+    super.dispose();
+  }
+
+  void _startProgressUpdates() {
+    _progressTimer = Timer.periodic(const Duration(seconds: 3), (timer) {
+      if (_torrents.isNotEmpty && !_isLoading) {
+        refreshDownloads();
+      }
+    });
+  }
+
+  /// Загрузить список активных загрузок
+  Future<void> refreshDownloads() async {
+    try {
+      _setLoading(true);
+      _setError(null);
+      
+      final progress = await TorrentPlatformService.getAllDownloads();
+      
+      // Получаем полную информацию о каждом торренте
+      _torrents.clear();
+      for (final progressItem in progress) {
+        try {
+          final torrentInfo = await TorrentPlatformService.getTorrent(progressItem.infoHash);
+          if (torrentInfo != null) {
+            _torrents.add(torrentInfo);
+          }
+        } catch (e) {
+          // Если не удалось получить полную информацию, создаем базовую
+          _torrents.add(TorrentInfo(
+            infoHash: progressItem.infoHash,
+            name: 'Торрент ${progressItem.infoHash.substring(0, 8)}',
+            totalSize: 0,
+            progress: progressItem.progress,
+            downloadSpeed: progressItem.downloadRate,
+            uploadSpeed: progressItem.uploadRate,
+            numSeeds: progressItem.numSeeds,
+            numPeers: progressItem.numPeers,
+            state: progressItem.state,
+            savePath: '/storage/emulated/0/Download/NeoMovies',
+            files: [],
+          ));
+        }
+      }
+      
+      _setLoading(false);
+    } catch (e) {
+      _setError(e.toString());
+      _setLoading(false);
+    }
+  }
+
+  /// Получить информацию о конкретном торренте
+  Future<TorrentInfo?> getTorrentInfo(String infoHash) async {
+    try {
+      return await TorrentPlatformService.getTorrent(infoHash);
+    } catch (e) {
+      debugPrint('Ошибка получения информации о торренте: $e');
+      return null;
+    }
+  }
+
+  /// Приостановить торрент
+  Future<void> pauseTorrent(String infoHash) async {
+    try {
+      await TorrentPlatformService.pauseDownload(infoHash);
+      await refreshDownloads(); // Обновляем список
+    } catch (e) {
+      _setError(e.toString());
+    }
+  }
+
+  /// Возобновить торрент
+  Future<void> resumeTorrent(String infoHash) async {
+    try {
+      await TorrentPlatformService.resumeDownload(infoHash);
+      await refreshDownloads(); // Обновляем список
+    } catch (e) {
+      _setError(e.toString());
+    }
+  }
+
+  /// Удалить торрент
+  Future<void> removeTorrent(String infoHash) async {
+    try {
+      await TorrentPlatformService.cancelDownload(infoHash);
+      await refreshDownloads(); // Обновляем список
+    } catch (e) {
+      _setError(e.toString());
+    }
+  }
+
+  /// Установить приоритет файла
+  Future<void> setFilePriority(String infoHash, int fileIndex, FilePriority priority) async {
+    try {
+      await TorrentPlatformService.setFilePriority(infoHash, fileIndex, priority);
+    } catch (e) {
+      _setError(e.toString());
+    }
+  }
+
+  /// Добавить новый торрент
+  Future<String?> addTorrent(String magnetUri, {String? savePath}) async {
+    try {
+      final infoHash = await TorrentPlatformService.addTorrent(
+        magnetUri: magnetUri,
+        savePath: savePath,
+      );
+      await refreshDownloads(); // Обновляем список
+      return infoHash;
+    } catch (e) {
+      _setError(e.toString());
+      return null;
+    }
+  }
+
+  /// Форматировать скорость
+  String formatSpeed(int bytesPerSecond) {
+    if (bytesPerSecond < 1024) return '${bytesPerSecond}B/s';
+    if (bytesPerSecond < 1024 * 1024) return '${(bytesPerSecond / 1024).toStringAsFixed(1)}KB/s';
+    return '${(bytesPerSecond / (1024 * 1024)).toStringAsFixed(1)}MB/s';
+  }
+
+  /// Форматировать продолжительность
+  String formatDuration(Duration duration) {
+    final hours = duration.inHours;
+    final minutes = duration.inMinutes.remainder(60);
+    final seconds = duration.inSeconds.remainder(60);
+
+    if (hours > 0) {
+      return '${hours}ч ${minutes}м ${seconds}с';
+    } else if (minutes > 0) {
+      return '${minutes}м ${seconds}с';
+    } else {
+      return '${seconds}с';
+    }
+  }
+
+  void _setLoading(bool loading) {
+    _isLoading = loading;
+    notifyListeners();
+  }
+
+  void _setError(String? error, [String? stackTrace]) {
+    _error = error;
+    _stackTrace = stackTrace;
+    notifyListeners();
+  }
+}

lib/presentation/providers/downloads_provider_old.dart

@@ -0,0 +1,221 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import '../../data/services/torrent_platform_service.dart';
+import '../../data/models/torrent_info.dart';
+
+class ActiveDownload {
+  final String infoHash;
+  final String name;
+  final DownloadProgress progress;
+  final DateTime startTime;
+  final List<String> selectedFiles;
+
+  ActiveDownload({
+    required this.infoHash,
+    required this.name,
+    required this.progress,
+    required this.startTime,
+    required this.selectedFiles,
+  });
+
+  ActiveDownload copyWith({
+    String? infoHash,
+    String? name,
+    DownloadProgress? progress,
+    DateTime? startTime,
+    List<String>? selectedFiles,
+  }) {
+    return ActiveDownload(
+      infoHash: infoHash ?? this.infoHash,
+      name: name ?? this.name,
+      progress: progress ?? this.progress,
+      startTime: startTime ?? this.startTime,
+      selectedFiles: selectedFiles ?? this.selectedFiles,
+    );
+  }
+}
+
+class DownloadsProvider with ChangeNotifier {
+  final List<TorrentInfo> _torrents = [];
+  Timer? _progressTimer;
+  bool _isLoading = false;
+  String? _error;
+
+  List<TorrentInfo> get torrents => List.unmodifiable(_torrents);
+  bool get isLoading => _isLoading;
+  String? get error => _error;
+
+  DownloadsProvider() {
+    _startProgressUpdates();
+    loadDownloads();
+  }
+
+  @override
+  void dispose() {
+    _progressTimer?.cancel();
+    super.dispose();
+  }
+
+  void _startProgressUpdates() {
+    _progressTimer = Timer.periodic(const Duration(seconds: 2), (timer) {
+      _updateProgress();
+    });
+  }
+
+  Future<void> loadDownloads() async {
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+
+    try {
+      final progressList = await TorrentPlatformService.getAllDownloads();
+      
+      _downloads = progressList.map((progress) {
+        // Try to find existing download to preserve metadata
+        final existing = _downloads.where((d) => d.infoHash == progress.infoHash).firstOrNull;
+        
+        return ActiveDownload(
+          infoHash: progress.infoHash,
+          name: existing?.name ?? 'Unnamed Torrent',
+          progress: progress,
+          startTime: existing?.startTime ?? DateTime.now(),
+          selectedFiles: existing?.selectedFiles ?? [],
+        );
+      }).toList();
+
+      _isLoading = false;
+      notifyListeners();
+    } catch (e) {
+      _error = e.toString();
+      _isLoading = false;
+      notifyListeners();
+    }
+  }
+
+  Future<void> _updateProgress() async {
+    if (_downloads.isEmpty) return;
+
+    try {
+      final List<ActiveDownload> updatedDownloads = [];
+      
+      for (final download in _downloads) {
+        final progress = await TorrentPlatformService.getDownloadProgress(download.infoHash);
+        if (progress != null) {
+          updatedDownloads.add(download.copyWith(progress: progress));
+        }
+      }
+      
+      _downloads = updatedDownloads;
+      notifyListeners();
+    } catch (e) {
+      // Silent failure for progress updates
+      if (kDebugMode) {
+        print('Failed to update progress: $e');
+      }
+    }
+  }
+
+  Future<bool> pauseDownload(String infoHash) async {
+    try {
+      final success = await TorrentPlatformService.pauseDownload(infoHash);
+      if (success) {
+        await _updateProgress();
+      }
+      return success;
+    } catch (e) {
+      _error = e.toString();
+      notifyListeners();
+      return false;
+    }
+  }
+
+  Future<bool> resumeDownload(String infoHash) async {
+    try {
+      final success = await TorrentPlatformService.resumeDownload(infoHash);
+      if (success) {
+        await _updateProgress();
+      }
+      return success;
+    } catch (e) {
+      _error = e.toString();
+      notifyListeners();
+      return false;
+    }
+  }
+
+  Future<bool> cancelDownload(String infoHash) async {
+    try {
+      final success = await TorrentPlatformService.cancelDownload(infoHash);
+      if (success) {
+        _downloads.removeWhere((d) => d.infoHash == infoHash);
+        notifyListeners();
+      }
+      return success;
+    } catch (e) {
+      _error = e.toString();
+      notifyListeners();
+      return false;
+    }
+  }
+
+  void addDownload({
+    required String infoHash,
+    required String name,
+    required List<String> selectedFiles,
+  }) {
+    final download = ActiveDownload(
+      infoHash: infoHash,
+      name: name,
+      progress: DownloadProgress(
+        infoHash: infoHash,
+        progress: 0.0,
+        downloadRate: 0,
+        uploadRate: 0,
+        numSeeds: 0,
+        numPeers: 0,
+        state: 'starting',
+      ),
+      startTime: DateTime.now(),
+      selectedFiles: selectedFiles,
+    );
+
+    _downloads.add(download);
+    notifyListeners();
+  }
+
+  ActiveDownload? getDownload(String infoHash) {
+    try {
+      return _downloads.where((d) => d.infoHash == infoHash).first;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  String formatFileSize(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)} GB';
+  }
+
+  String formatSpeed(int bytesPerSecond) {
+    return '${formatFileSize(bytesPerSecond)}/s';
+  }
+
+  String formatDuration(Duration duration) {
+    if (duration.inDays > 0) {
+      return '${duration.inDays}d ${duration.inHours % 24}h';
+    }
+    if (duration.inHours > 0) {
+      return '${duration.inHours}h ${duration.inMinutes % 60}m';
+    }
+    if (duration.inMinutes > 0) {
+      return '${duration.inMinutes}m ${duration.inSeconds % 60}s';
+    }
+    return '${duration.inSeconds}s';
+  }
+}
+
+extension ListExtension<T> on List<T> {
+  T? get firstOrNull => isEmpty ? null : first;
+}

lib/presentation/providers/movie_detail_provider.dart

@@ -24,6 +24,9 @@ class MovieDetailProvider with ChangeNotifier {
   String? _error;
   String? get error => _error;
 
+  String? _stackTrace;
+  String? get stackTrace => _stackTrace;
+
   Future<void> loadMedia(int mediaId, String mediaType) async {
     _isLoading = true;
     _isImdbLoading = true;
@@ -33,21 +36,40 @@ class MovieDetailProvider with ChangeNotifier {
     notifyListeners();
 
     try {
+      print('Loading media: ID=$mediaId, type=$mediaType');
+      
+      // Load movie/TV details
       if (mediaType == 'movie') {
         _movie = await _movieRepository.getMovieById(mediaId.toString());
+        print('Movie loaded successfully: ${_movie?.title}');
       } else {
         _movie = await _movieRepository.getTvById(mediaId.toString());
+        print('TV show loaded successfully: ${_movie?.title}');
       }
+      
       _isLoading = false;
       notifyListeners();
 
+      // Try to load IMDb ID (non-blocking)
       if (_movie != null) {
-        _imdbId = await _apiClient.getImdbId(mediaId, mediaType);
+        try {
+          print('Loading IMDb ID for $mediaType $mediaId');
+          _imdbId = await _apiClient.getImdbId(mediaId.toString(), mediaType);
+          print('IMDb ID loaded: $_imdbId');
+        } catch (e) {
+          // IMDb ID loading failed, but don't fail the whole screen
+          print('Failed to load IMDb ID: $e');
+          _imdbId = null;
+        }
       }
-    } catch (e) {
+    } catch (e, stackTrace) {
+      print('Error loading media: $e');
+      print('Stack trace: $stackTrace');
       _error = e.toString();
-    } finally {
+      _stackTrace = stackTrace.toString();
       _isLoading = false;
+      notifyListeners();
+    } finally {
       _isImdbLoading = false;
       notifyListeners();
     }

lib/presentation/providers/player/player_provider.dart

@@ -6,7 +6,7 @@ import 'package:chewie/chewie.dart';
 import 'package:neomovies_mobile/data/models/player/video_source.dart';
 import 'package:neomovies_mobile/data/models/player/video_quality.dart';
 import 'package:neomovies_mobile/data/models/player/audio_track.dart';
-import 'package:neomovies_mobile/data/models/player/subtitle.dart';
+import 'package:neomovies_mobile/data/models/player/subtitle.dart' as local_subtitle;
 import 'package:neomovies_mobile/data/models/player/player_settings.dart';
 
 class PlayerProvider with ChangeNotifier {
@@ -37,13 +37,13 @@ class PlayerProvider with ChangeNotifier {
   List<VideoSource> _sources = [];
   List<VideoQuality> _qualities = [];
   List<AudioTrack> _audioTracks = [];
-  List<Subtitle> _subtitles = [];
+  List<local_subtitle.Subtitle> _subtitles = [];
   
   // Selected options
   VideoSource? _selectedSource;
   VideoQuality? _selectedQuality;
   AudioTrack? _selectedAudioTrack;
-  Subtitle? _selectedSubtitle;
+  local_subtitle.Subtitle? _selectedSubtitle;
   
   // Playback state
   double _volume = 1.0;
@@ -67,11 +67,11 @@ class PlayerProvider with ChangeNotifier {
   List<VideoSource> get sources => _sources;
   List<VideoQuality> get qualities => _qualities;
   List<AudioTrack> get audioTracks => _audioTracks;
-  List<Subtitle> get subtitles => _subtitles;
+  List<local_subtitle.Subtitle> get subtitles => _subtitles;
   VideoSource? get selectedSource => _selectedSource;
   VideoQuality? get selectedQuality => _selectedQuality;
   AudioTrack? get selectedAudioTrack => _selectedAudioTrack;
-  Subtitle? get selectedSubtitle => _selectedSubtitle;
+  local_subtitle.Subtitle? get selectedSubtitle => _selectedSubtitle;
   double get volume => _volume;
   bool get isMuted => _isMuted;
   double get playbackSpeed => _playbackSpeed;
@@ -94,7 +94,7 @@ class PlayerProvider with ChangeNotifier {
     List<VideoSource>? sources,
     List<VideoQuality>? qualities,
     List<AudioTrack>? audioTracks,
-    List<Subtitle>? subtitles,
+    List<local_subtitle.Subtitle>? subtitles,
   }) async {
     _mediaId = mediaId;
     _mediaType = mediaType;
@@ -305,7 +305,7 @@ class PlayerProvider with ChangeNotifier {
   }
   
   // Change subtitle
-  void setSubtitle(Subtitle subtitle) {
+  void setSubtitle(local_subtitle.Subtitle subtitle) {
     if (_selectedSubtitle == subtitle) return;
     
     _selectedSubtitle = subtitle;

lib/presentation/providers/reactions_provider.dart

@@ -48,7 +48,7 @@ class ReactionsProvider with ChangeNotifier {
 
       if (_authProvider.isAuthenticated) {
         final userReactionResult = await _repository.getMyReaction(mediaType, mediaId);
-        _userReaction = userReactionResult.reactionType;
+        _userReaction = userReactionResult?.reactionType;
       } else {
         _userReaction = null;
       }

lib/presentation/screens/auth/verify_screen.dart

@@ -61,16 +61,7 @@ class _VerifyScreenState extends State<VerifyScreen> {
     if (_formKey.currentState!.validate()) {
       _formKey.currentState!.save();
       Provider.of<AuthProvider>(context, listen: false)
-          .verifyEmail(widget.email, _code)
-          .then((_) {
-        final auth = Provider.of<AuthProvider>(context, listen: false);
-        if (auth.state != AuthState.error) {
-          Navigator.of(context).pop(); // Go back to LoginScreen
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('Email verified. You can now login.')),
-          );
-        }
-      });
+          .verifyEmail(widget.email, _code);
     }
   }
 
@@ -82,6 +73,16 @@ class _VerifyScreenState extends State<VerifyScreen> {
       ),
       body: Consumer<AuthProvider>(
         builder: (context, auth, child) {
+          // Auto-navigate when user becomes authenticated
+          if (auth.state == AuthState.authenticated) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              Navigator.of(context).pop(); // Go back to previous screen
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(content: Text('Email verified and logged in successfully!')),
+              );
+            });
+          }
+
           return Form(
             key: _formKey,
             child: Padding(

lib/presentation/screens/downloads/download_detail_screen.dart

@@ -0,0 +1,535 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:path_provider/path_provider.dart';
+import '../../providers/downloads_provider.dart';
+import '../player/native_video_player_screen.dart';
+import '../player/webview_player_screen.dart';
+
+class DownloadDetailScreen extends StatefulWidget {
+  final ActiveDownload download;
+
+  const DownloadDetailScreen({
+    super.key,
+    required this.download,
+  });
+
+  @override
+  State<DownloadDetailScreen> createState() => _DownloadDetailScreenState();
+}
+
+class _DownloadDetailScreenState extends State<DownloadDetailScreen> {
+  List<DownloadedFile> _files = [];
+  bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadDownloadedFiles();
+  }
+
+  Future<void> _loadDownloadedFiles() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      // Get downloads directory
+      final downloadsDir = await getApplicationDocumentsDirectory();
+      final torrentDir = Directory('${downloadsDir.path}/torrents/${widget.download.infoHash}');
+
+      if (await torrentDir.exists()) {
+        final files = await _scanDirectory(torrentDir);
+        setState(() {
+          _files = files;
+          _isLoading = false;
+        });
+      } else {
+        setState(() {
+          _files = [];
+          _isLoading = false;
+        });
+      }
+    } catch (e) {
+      setState(() {
+        _files = [];
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<List<DownloadedFile>> _scanDirectory(Directory directory) async {
+    final List<DownloadedFile> files = [];
+    
+    await for (final entity in directory.list(recursive: true)) {
+      if (entity is File) {
+        final stat = await entity.stat();
+        final fileName = entity.path.split('/').last;
+        final extension = fileName.split('.').last.toLowerCase();
+        
+        files.add(DownloadedFile(
+          name: fileName,
+          path: entity.path,
+          size: stat.size,
+          isVideo: _isVideoFile(extension),
+          isAudio: _isAudioFile(extension),
+          extension: extension,
+        ));
+      }
+    }
+    
+    return files..sort((a, b) => a.name.compareTo(b.name));
+  }
+
+  bool _isVideoFile(String extension) {
+    const videoExtensions = ['mp4', 'mkv', 'avi', 'mov', 'wmv', 'flv', 'webm', 'm4v'];
+    return videoExtensions.contains(extension);
+  }
+
+  bool _isAudioFile(String extension) {
+    const audioExtensions = ['mp3', 'wav', 'flac', 'aac', 'm4a', 'ogg'];
+    return audioExtensions.contains(extension);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.download.name),
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        elevation: 0,
+        scrolledUnderElevation: 1,
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.refresh),
+            onPressed: _loadDownloadedFiles,
+          ),
+        ],
+      ),
+      body: Column(
+        children: [
+          _buildProgressSection(),
+          const Divider(height: 1),
+          Expanded(
+            child: _buildFilesSection(),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildProgressSection() {
+    final progress = widget.download.progress;
+    final isCompleted = progress.progress >= 1.0;
+
+    return Container(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'Прогресс загрузки',
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      '${(progress.progress * 100).toStringAsFixed(1)}% - ${progress.state}',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                  ],
+                ),
+              ),
+              Container(
+                padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                decoration: BoxDecoration(
+                  color: isCompleted 
+                    ? Colors.green.withOpacity(0.1)
+                    : Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                child: Text(
+                  isCompleted ? 'Завершено' : 'Загружается',
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: isCompleted ? Colors.green : Theme.of(context).colorScheme.primary,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 16),
+          LinearProgressIndicator(
+            value: progress.progress,
+            backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
+            valueColor: AlwaysStoppedAnimation<Color>(
+              isCompleted ? Colors.green : Theme.of(context).colorScheme.primary,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Row(
+            children: [
+              _buildProgressStat('Скорость', '${_formatSpeed(progress.downloadRate)}'),
+              const SizedBox(width: 24),
+              _buildProgressStat('Сиды', '${progress.numSeeds}'),
+              const SizedBox(width: 24),
+              _buildProgressStat('Пиры', '${progress.numPeers}'),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildProgressStat(String label, String value) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
+            color: Theme.of(context).colorScheme.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          value,
+          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFilesSection() {
+    if (_isLoading) {
+      return const Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            CircularProgressIndicator(),
+            SizedBox(height: 16),
+            Text('Сканирование файлов...'),
+          ],
+        ),
+      );
+    }
+
+    if (_files.isEmpty) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.folder_open,
+              size: 64,
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Файлы не найдены',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Возможно, загрузка еще не завершена',
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        ),
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(16),
+          child: Text(
+            'Файлы (${_files.length})',
+            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+        Expanded(
+          child: ListView.separated(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            itemCount: _files.length,
+            separatorBuilder: (context, index) => const SizedBox(height: 8),
+            itemBuilder: (context, index) {
+              final file = _files[index];
+              return _buildFileItem(file);
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildFileItem(DownloadedFile file) {
+    return Card(
+      elevation: 1,
+      child: InkWell(
+        onTap: file.isVideo || file.isAudio ? () => _openFile(file) : null,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Row(
+            children: [
+              _buildFileIcon(file),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      file.name,
+                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                        fontWeight: FontWeight.w500,
+                      ),
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      _formatFileSize(file.size),
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                        color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(width: 8),
+              PopupMenuButton<String>(
+                icon: const Icon(Icons.more_vert),
+                onSelected: (value) => _handleFileAction(value, file),
+                itemBuilder: (context) => [
+                  if (file.isVideo || file.isAudio) ...[
+                    const PopupMenuItem(
+                      value: 'play_native',
+                      child: Row(
+                        children: [
+                          Icon(Icons.play_arrow),
+                          SizedBox(width: 8),
+                          Text('Нативный плеер'),
+                        ],
+                      ),
+                    ),
+                    if (file.isVideo) ...[
+                      const PopupMenuItem(
+                        value: 'play_vibix',
+                        child: Row(
+                          children: [
+                            Icon(Icons.web),
+                            SizedBox(width: 8),
+                            Text('Vibix плеер'),
+                          ],
+                        ),
+                      ),
+                      const PopupMenuItem(
+                        value: 'play_alloha',
+                        child: Row(
+                          children: [
+                            Icon(Icons.web),
+                            SizedBox(width: 8),
+                            Text('Alloha плеер'),
+                          ],
+                        ),
+                      ),
+                    ],
+                    const PopupMenuDivider(),
+                  ],
+                  const PopupMenuItem(
+                    value: 'delete',
+                    child: Row(
+                      children: [
+                        Icon(Icons.delete, color: Colors.red),
+                        SizedBox(width: 8),
+                        Text('Удалить', style: TextStyle(color: Colors.red)),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFileIcon(DownloadedFile file) {
+    IconData icon;
+    Color color;
+
+    if (file.isVideo) {
+      icon = Icons.movie;
+      color = Colors.blue;
+    } else if (file.isAudio) {
+      icon = Icons.music_note;
+      color = Colors.orange;
+    } else {
+      icon = Icons.insert_drive_file;
+      color = Theme.of(context).colorScheme.onSurfaceVariant;
+    }
+
+    return Container(
+      padding: const EdgeInsets.all(8),
+      decoration: BoxDecoration(
+        color: color.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Icon(
+        icon,
+        color: color,
+        size: 24,
+      ),
+    );
+  }
+
+  void _openFile(DownloadedFile file) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => NativeVideoPlayerScreen(
+          filePath: file.path,
+          title: file.name,
+        ),
+      ),
+    );
+  }
+
+  void _handleFileAction(String action, DownloadedFile file) {
+    switch (action) {
+      case 'play_native':
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => NativeVideoPlayerScreen(
+              filePath: file.path,
+              title: file.name,
+            ),
+          ),
+        );
+        break;
+      case 'play_vibix':
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => WebViewPlayerScreen(
+              url: 'https://vibix.org/player',
+              title: file.name,
+              playerType: 'vibix',
+            ),
+          ),
+        );
+        break;
+      case 'play_alloha':
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => WebViewPlayerScreen(
+              url: 'https://alloha.org/player',
+              title: file.name,
+              playerType: 'alloha',
+            ),
+          ),
+        );
+        break;
+      case 'delete':
+        _showDeleteDialog(file);
+        break;
+    }
+  }
+
+  void _showDeleteDialog(DownloadedFile file) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Удалить файл'),
+        content: Text('Вы уверены, что хотите удалить файл "${file.name}"?'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Отмена'),
+          ),
+          FilledButton(
+            onPressed: () async {
+              Navigator.of(context).pop();
+              await _deleteFile(file);
+            },
+            style: FilledButton.styleFrom(
+              backgroundColor: Theme.of(context).colorScheme.error,
+            ),
+            child: const Text('Удалить'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _deleteFile(DownloadedFile file) async {
+    try {
+      final fileToDelete = File(file.path);
+      if (await fileToDelete.exists()) {
+        await fileToDelete.delete();
+        _loadDownloadedFiles(); // Refresh the list
+        
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('Файл "${file.name}" удален'),
+              duration: const Duration(seconds: 2),
+            ),
+          );
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Ошибка удаления файла: $e'),
+            backgroundColor: Theme.of(context).colorScheme.error,
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+    }
+  }
+
+  String _formatFileSize(int bytes) {
+    if (bytes < 1024) return '$bytes B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} KB';
+    if (bytes < 1024 * 1024 * 1024) return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)} GB';
+  }
+
+  String _formatSpeed(int bytesPerSecond) {
+    return '${_formatFileSize(bytesPerSecond)}/s';
+  }
+}
+
+class DownloadedFile {
+  final String name;
+  final String path;
+  final int size;
+  final bool isVideo;
+  final bool isAudio;
+  final String extension;
+
+  DownloadedFile({
+    required this.name,
+    required this.path,
+    required this.size,
+    required this.isVideo,
+    required this.isAudio,
+    required this.extension,
+  });
+}

lib/presentation/screens/downloads/downloads_screen.dart

@@ -0,0 +1,419 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../../providers/downloads_provider.dart';
+import '../../widgets/error_display.dart';
+import '../../../data/models/torrent_info.dart';
+import 'torrent_detail_screen.dart';
+
+class DownloadsScreen extends StatefulWidget {
+  const DownloadsScreen({super.key});
+
+  @override
+  State<DownloadsScreen> createState() => _DownloadsScreenState();
+}
+
+class _DownloadsScreenState extends State<DownloadsScreen> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      context.read<DownloadsProvider>().refreshDownloads();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Загрузки'),
+        elevation: 0,
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        foregroundColor: Theme.of(context).textTheme.titleLarge?.color,
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.refresh),
+            onPressed: () {
+              context.read<DownloadsProvider>().refreshDownloads();
+            },
+          ),
+        ],
+      ),
+      body: Consumer<DownloadsProvider>(
+        builder: (context, provider, child) {
+          if (provider.isLoading) {
+            return const Center(
+              child: CircularProgressIndicator(),
+            );
+          }
+
+          if (provider.error != null) {
+            return ErrorDisplay(
+              title: 'Ошибка загрузки торрентов',
+              error: provider.error!,
+              stackTrace: provider.stackTrace,
+              onRetry: () {
+                provider.refreshDownloads();
+              },
+            );
+          }
+
+          if (provider.torrents.isEmpty) {
+            return Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(
+                    Icons.download_outlined,
+                    size: 64,
+                    color: Colors.grey.shade400,
+                  ),
+                  const SizedBox(height: 16),
+                  Text(
+                    'Нет активных загрузок',
+                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                      color: Colors.grey.shade600,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    'Загруженные торренты будут отображаться здесь',
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                      color: Colors.grey.shade500,
+                    ),
+                  ),
+                ],
+              ),
+            );
+          }
+
+          return RefreshIndicator(
+            onRefresh: () async {
+              await provider.refreshDownloads();
+            },
+            child: ListView.builder(
+              padding: const EdgeInsets.all(16),
+              itemCount: provider.torrents.length,
+              itemBuilder: (context, index) {
+                final torrent = provider.torrents[index];
+                return TorrentListItem(
+                  torrent: torrent,
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => TorrentDetailScreen(
+                          infoHash: torrent.infoHash,
+                        ),
+                      ),
+                    );
+                  },
+                  onMenuPressed: (action) {
+                    _handleTorrentAction(action, torrent);
+                  },
+                );
+              },
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  void _handleTorrentAction(TorrentAction action, TorrentInfo torrent) {
+    final provider = context.read<DownloadsProvider>();
+    
+    switch (action) {
+      case TorrentAction.pause:
+        provider.pauseTorrent(torrent.infoHash);
+        break;
+      case TorrentAction.resume:
+        provider.resumeTorrent(torrent.infoHash);
+        break;
+      case TorrentAction.remove:
+        _showRemoveConfirmation(torrent);
+        break;
+      case TorrentAction.openFolder:
+        _openFolder(torrent);
+        break;
+    }
+  }
+
+  void _showRemoveConfirmation(TorrentInfo torrent) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Удалить торрент'),
+          content: Text(
+            'Вы уверены, что хотите удалить "${torrent.name}"?\n\nФайлы будут удалены с устройства.',
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('Отмена'),
+            ),
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+                context.read<DownloadsProvider>().removeTorrent(torrent.infoHash);
+              },
+              style: TextButton.styleFrom(
+                foregroundColor: Colors.red,
+              ),
+              child: const Text('Удалить'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  void _openFolder(TorrentInfo torrent) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Папка: ${torrent.savePath}'),
+        action: SnackBarAction(
+          label: 'Копировать',
+          onPressed: () {
+            // TODO: Copy path to clipboard
+          },
+        ),
+      ),
+    );
+  }
+}
+
+enum TorrentAction { pause, resume, remove, openFolder }
+
+class TorrentListItem extends StatelessWidget {
+  final TorrentInfo torrent;
+  final VoidCallback onTap;
+  final Function(TorrentAction) onMenuPressed;
+
+  const TorrentListItem({
+    super.key,
+    required this.torrent,
+    required this.onTap,
+    required this.onMenuPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.only(bottom: 12),
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      torrent.name,
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  PopupMenuButton<TorrentAction>(
+                    icon: const Icon(Icons.more_vert),
+                    onSelected: onMenuPressed,
+                    itemBuilder: (BuildContext context) => [
+                      if (torrent.isPaused)
+                        const PopupMenuItem(
+                          value: TorrentAction.resume,
+                          child: Row(
+                            children: [
+                              Icon(Icons.play_arrow),
+                              SizedBox(width: 8),
+                              Text('Возобновить'),
+                            ],
+                          ),
+                        )
+                      else
+                        const PopupMenuItem(
+                          value: TorrentAction.pause,
+                          child: Row(
+                            children: [
+                              Icon(Icons.pause),
+                              SizedBox(width: 8),
+                              Text('Приостановить'),
+                            ],
+                          ),
+                        ),
+                      const PopupMenuItem(
+                        value: TorrentAction.openFolder,
+                        child: Row(
+                          children: [
+                            Icon(Icons.folder_open),
+                            SizedBox(width: 8),
+                            Text('Открыть папку'),
+                          ],
+                        ),
+                      ),
+                      const PopupMenuItem(
+                        value: TorrentAction.remove,
+                        child: Row(
+                          children: [
+                            Icon(Icons.delete, color: Colors.red),
+                            SizedBox(width: 8),
+                            Text('Удалить', style: TextStyle(color: Colors.red)),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+              const SizedBox(height: 12),
+              _buildProgressBar(context),
+              const SizedBox(height: 8),
+              Row(
+                children: [
+                  _buildStatusChip(),
+                  const Spacer(),
+                  Text(
+                    torrent.formattedTotalSize,
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      color: Colors.grey.shade600,
+                    ),
+                  ),
+                ],
+              ),
+              if (torrent.isDownloading || torrent.isSeeding) ...[
+                const SizedBox(height: 8),
+                Row(
+                  children: [
+                    Icon(
+                      Icons.download,
+                      size: 16,
+                      color: Colors.green.shade600,
+                    ),
+                    const SizedBox(width: 4),
+                    Text(
+                      torrent.formattedDownloadSpeed,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                    const SizedBox(width: 16),
+                    Icon(
+                      Icons.upload,
+                      size: 16,
+                      color: Colors.blue.shade600,
+                    ),
+                    const SizedBox(width: 4),
+                    Text(
+                      torrent.formattedUploadSpeed,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                    const Spacer(),
+                    Text(
+                      'S: ${torrent.numSeeds} P: ${torrent.numPeers}',
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                        color: Colors.grey.shade600,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildProgressBar(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              'Прогресс',
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: Colors.grey.shade600,
+              ),
+            ),
+            Text(
+              '${(torrent.progress * 100).toStringAsFixed(1)}%',
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        LinearProgressIndicator(
+          value: torrent.progress,
+          backgroundColor: Colors.grey.shade300,
+          valueColor: AlwaysStoppedAnimation<Color>(
+            torrent.isCompleted
+                ? Colors.green.shade600
+                : Theme.of(context).primaryColor,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildStatusChip() {
+    Color color;
+    IconData icon;
+    String text;
+
+    if (torrent.isCompleted) {
+      color = Colors.green;
+      icon = Icons.check_circle;
+      text = 'Завершен';
+    } else if (torrent.isDownloading) {
+      color = Colors.blue;
+      icon = Icons.download;
+      text = 'Загружается';
+    } else if (torrent.isPaused) {
+      color = Colors.orange;
+      icon = Icons.pause;
+      text = 'Приостановлен';
+    } else if (torrent.isSeeding) {
+      color = Colors.purple;
+      icon = Icons.upload;
+      text = 'Раздача';
+    } else {
+      color = Colors.grey;
+      icon = Icons.help_outline;
+      text = torrent.state;
+    }
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: color.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(color: color.withOpacity(0.3)),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 14, color: color),
+          const SizedBox(width: 4),
+          Text(
+            text,
+            style: TextStyle(
+              color: color,
+              fontSize: 12,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/presentation/screens/downloads/torrent_detail_screen.dart

@@ -0,0 +1,574 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../../providers/downloads_provider.dart';
+import '../../../data/models/torrent_info.dart';
+import '../player/video_player_screen.dart';
+import '../player/webview_player_screen.dart';
+import 'package:auto_route/auto_route.dart';
+
+@RoutePage()
+class TorrentDetailScreen extends StatefulWidget {
+  final String infoHash;
+
+  const TorrentDetailScreen({
+    super.key,
+    required this.infoHash,
+  });
+
+  @override
+  State<TorrentDetailScreen> createState() => _TorrentDetailScreenState();
+}
+
+class _TorrentDetailScreenState extends State<TorrentDetailScreen> {
+  TorrentInfo? torrentInfo;
+  bool isLoading = true;
+  String? error;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadTorrentInfo();
+  }
+
+  Future<void> _loadTorrentInfo() async {
+    try {
+      setState(() {
+        isLoading = true;
+        error = null;
+      });
+
+      final provider = context.read<DownloadsProvider>();
+      final info = await provider.getTorrentInfo(widget.infoHash);
+      
+      setState(() {
+        torrentInfo = info;
+        isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        error = e.toString();
+        isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(torrentInfo?.name ?? 'Торрент'),
+        elevation: 0,
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        foregroundColor: Theme.of(context).textTheme.titleLarge?.color,
+        actions: [
+          if (torrentInfo != null)
+            PopupMenuButton<String>(
+              onSelected: (value) => _handleAction(value),
+              itemBuilder: (BuildContext context) => [
+                if (torrentInfo!.isPaused)
+                  const PopupMenuItem(
+                    value: 'resume',
+                    child: Row(
+                      children: [
+                        Icon(Icons.play_arrow),
+                        SizedBox(width: 8),
+                        Text('Возобновить'),
+                      ],
+                    ),
+                  )
+                else
+                  const PopupMenuItem(
+                    value: 'pause',
+                    child: Row(
+                      children: [
+                        Icon(Icons.pause),
+                        SizedBox(width: 8),
+                        Text('Приостановить'),
+                      ],
+                    ),
+                  ),
+                const PopupMenuItem(
+                  value: 'refresh',
+                  child: Row(
+                    children: [
+                      Icon(Icons.refresh),
+                      SizedBox(width: 8),
+                      Text('Обновить'),
+                    ],
+                  ),
+                ),
+                const PopupMenuItem(
+                  value: 'remove',
+                  child: Row(
+                    children: [
+                      Icon(Icons.delete, color: Colors.red),
+                      SizedBox(width: 8),
+                      Text('Удалить', style: TextStyle(color: Colors.red)),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+        ],
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    if (isLoading) {
+      return const Center(
+        child: CircularProgressIndicator(),
+      );
+    }
+
+    if (error != null) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.error_outline,
+              size: 64,
+              color: Colors.red.shade300,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Ошибка загрузки',
+              style: Theme.of(context).textTheme.headlineSmall,
+            ),
+            const SizedBox(height: 8),
+            Text(
+              error!,
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Colors.grey.shade600,
+              ),
+            ),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: _loadTorrentInfo,
+              child: const Text('Попробовать снова'),
+            ),
+          ],
+        ),
+      );
+    }
+
+    if (torrentInfo == null) {
+      return const Center(
+        child: Text('Торрент не найден'),
+      );
+    }
+
+    return SingleChildScrollView(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildTorrentInfo(),
+          const SizedBox(height: 24),
+          _buildFilesSection(),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTorrentInfo() {
+    final torrent = torrentInfo!;
+    
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Информация о торренте',
+              style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const SizedBox(height: 16),
+            _buildInfoRow('Название', torrent.name),
+            _buildInfoRow('Размер', torrent.formattedTotalSize),
+            _buildInfoRow('Прогресс', '${(torrent.progress * 100).toStringAsFixed(1)}%'),
+            _buildInfoRow('Статус', _getStatusText(torrent)),
+            _buildInfoRow('Путь сохранения', torrent.savePath),
+            if (torrent.isDownloading || torrent.isSeeding) ...[
+              const Divider(),
+              _buildInfoRow('Скорость загрузки', torrent.formattedDownloadSpeed),
+              _buildInfoRow('Скорость раздачи', torrent.formattedUploadSpeed),
+              _buildInfoRow('Сиды', '${torrent.numSeeds}'),
+              _buildInfoRow('Пиры', '${torrent.numPeers}'),
+            ],
+            const SizedBox(height: 16),
+            LinearProgressIndicator(
+              value: torrent.progress,
+              backgroundColor: Colors.grey.shade300,
+              valueColor: AlwaysStoppedAnimation<Color>(
+                torrent.isCompleted
+                    ? Colors.green.shade600
+                    : Theme.of(context).primaryColor,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            width: 140,
+            child: Text(
+              label,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Colors.grey.shade600,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              value,
+              style: Theme.of(context).textTheme.bodyMedium,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _getStatusText(TorrentInfo torrent) {
+    if (torrent.isCompleted) return 'Завершен';
+    if (torrent.isDownloading) return 'Загружается';
+    if (torrent.isPaused) return 'Приостановлен';
+    if (torrent.isSeeding) return 'Раздача';
+    return torrent.state;
+  }
+
+  Widget _buildFilesSection() {
+    final torrent = torrentInfo!;
+    final videoFiles = torrent.videoFiles;
+    final otherFiles = torrent.files.where((file) => !videoFiles.contains(file)).toList();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Файлы',
+          style: Theme.of(context).textTheme.titleLarge?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 16),
+        
+        // Video files section
+        if (videoFiles.isNotEmpty) ...[
+          _buildFileTypeSection('Видео файлы', videoFiles, Icons.play_circle_fill),
+          const SizedBox(height: 16),
+        ],
+        
+        // Other files section
+        if (otherFiles.isNotEmpty) ...[
+          _buildFileTypeSection('Другие файлы', otherFiles, Icons.insert_drive_file),
+        ],
+      ],
+    );
+  }
+
+  Widget _buildFileTypeSection(String title, List<TorrentFileInfo> files, IconData icon) {
+    return Card(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(16),
+            child: Row(
+              children: [
+                Icon(icon, size: 24),
+                const SizedBox(width: 8),
+                Text(
+                  title,
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const Spacer(),
+                Text(
+                  '${files.length} файлов',
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: Colors.grey.shade600,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const Divider(height: 1),
+          ListView.separated(
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            itemCount: files.length,
+            separatorBuilder: (context, index) => const Divider(height: 1),
+            itemBuilder: (context, index) {
+              final file = files[index];
+              return _buildFileItem(file, icon == Icons.play_circle_fill);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildFileItem(TorrentFileInfo file, bool isVideo) {
+    final fileName = file.path.split('/').last;
+    final fileExtension = fileName.split('.').last.toUpperCase();
+    
+    return ListTile(
+      leading: CircleAvatar(
+        backgroundColor: isVideo 
+            ? Colors.red.shade100 
+            : Colors.blue.shade100,
+        child: Text(
+          fileExtension,
+          style: TextStyle(
+            fontSize: 10,
+            fontWeight: FontWeight.bold,
+            color: isVideo 
+                ? Colors.red.shade700 
+                : Colors.blue.shade700,
+          ),
+        ),
+      ),
+      title: Text(
+        fileName,
+        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            _formatFileSize(file.size),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Colors.grey.shade600,
+            ),
+          ),
+          if (file.progress > 0 && file.progress < 1.0) ...[
+            const SizedBox(height: 4),
+            LinearProgressIndicator(
+              value: file.progress,
+              backgroundColor: Colors.grey.shade300,
+              valueColor: AlwaysStoppedAnimation<Color>(
+                Theme.of(context).primaryColor,
+              ),
+            ),
+          ],
+        ],
+      ),
+      trailing: PopupMenuButton<String>(
+        icon: const Icon(Icons.more_vert),
+        onSelected: (value) => _handleFileAction(value, file),
+        itemBuilder: (BuildContext context) => [
+          if (isVideo && file.progress >= 0.1) ...[
+            const PopupMenuItem(
+              value: 'play_native',
+              child: Row(
+                children: [
+                  Icon(Icons.play_arrow),
+                  SizedBox(width: 8),
+                  Text('Нативный плеер'),
+                ],
+              ),
+            ),
+            const PopupMenuItem(
+              value: 'play_vibix',
+              child: Row(
+                children: [
+                  Icon(Icons.web),
+                  SizedBox(width: 8),
+                  Text('Vibix плеер'),
+                ],
+              ),
+            ),
+            const PopupMenuItem(
+              value: 'play_alloha',
+              child: Row(
+                children: [
+                  Icon(Icons.web),
+                  SizedBox(width: 8),
+                  Text('Alloha плеер'),
+                ],
+              ),
+            ),
+            const PopupMenuDivider(),
+          ],
+          PopupMenuItem(
+            value: file.priority == FilePriority.DONT_DOWNLOAD ? 'download' : 'stop_download',
+            child: Row(
+              children: [
+                Icon(file.priority == FilePriority.DONT_DOWNLOAD ? Icons.download : Icons.stop),
+                const SizedBox(width: 8),
+                Text(file.priority == FilePriority.DONT_DOWNLOAD ? 'Скачать' : 'Остановить'),
+              ],
+            ),
+          ),
+          PopupMenuItem(
+            value: 'priority_${file.priority == FilePriority.HIGH ? 'normal' : 'high'}',
+            child: Row(
+              children: [
+                Icon(file.priority == FilePriority.HIGH ? Icons.flag : Icons.flag_outlined),
+                const SizedBox(width: 8),
+                Text(file.priority == FilePriority.HIGH ? 'Обычный приоритет' : 'Высокий приоритет'),
+              ],
+            ),
+          ),
+        ],
+      ),
+      onTap: isVideo && file.progress >= 0.1 
+          ? () => _playVideo(file, 'native')
+          : null,
+    );
+  }
+
+  String _formatFileSize(int bytes) {
+    if (bytes < 1024) return '${bytes}B';
+    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)}KB';
+    if (bytes < 1024 * 1024 * 1024) return '${(bytes / (1024 * 1024)).toStringAsFixed(1)}MB';
+    return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(1)}GB';
+  }
+
+  void _handleAction(String action) async {
+    final provider = context.read<DownloadsProvider>();
+    
+    switch (action) {
+      case 'pause':
+        await provider.pauseTorrent(widget.infoHash);
+        _loadTorrentInfo();
+        break;
+      case 'resume':
+        await provider.resumeTorrent(widget.infoHash);
+        _loadTorrentInfo();
+        break;
+      case 'refresh':
+        _loadTorrentInfo();
+        break;
+      case 'remove':
+        _showRemoveConfirmation();
+        break;
+    }
+  }
+
+  void _handleFileAction(String action, TorrentFileInfo file) async {
+    final provider = context.read<DownloadsProvider>();
+    
+    if (action.startsWith('play_')) {
+      final playerType = action.replaceFirst('play_', '');
+      _playVideo(file, playerType);
+      return;
+    }
+    
+    if (action.startsWith('priority_')) {
+      final priority = action.replaceFirst('priority_', '');
+      final newPriority = priority == 'high' ? FilePriority.HIGH : FilePriority.NORMAL;
+      
+      final fileIndex = torrentInfo!.files.indexOf(file);
+      await provider.setFilePriority(widget.infoHash, fileIndex, newPriority);
+      _loadTorrentInfo();
+      return;
+    }
+    
+    switch (action) {
+      case 'download':
+        final fileIndex = torrentInfo!.files.indexOf(file);
+        await provider.setFilePriority(widget.infoHash, fileIndex, FilePriority.NORMAL);
+        _loadTorrentInfo();
+        break;
+      case 'stop_download':
+        final fileIndex = torrentInfo!.files.indexOf(file);
+        await provider.setFilePriority(widget.infoHash, fileIndex, FilePriority.DONT_DOWNLOAD);
+        _loadTorrentInfo();
+        break;
+    }
+  }
+
+  void _playVideo(TorrentFileInfo file, String playerType) {
+    final filePath = '${torrentInfo!.savePath}/${file.path}';
+    
+    switch (playerType) {
+      case 'native':
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => VideoPlayerScreen(
+              filePath: filePath,
+              title: file.path.split('/').last,
+            ),
+          ),
+        );
+        break;
+      case 'vibix':
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => WebViewPlayerScreen(
+              playerType: WebPlayerType.vibix,
+              videoUrl: filePath,
+              title: file.path.split('/').last,
+            ),
+          ),
+        );
+        break;
+      case 'alloha':
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => WebViewPlayerScreen(
+              playerType: WebPlayerType.alloha,
+              videoUrl: filePath,
+              title: file.path.split('/').last,
+            ),
+          ),
+        );
+        break;
+    }
+  }
+
+  void _showRemoveConfirmation() {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Удалить торрент'),
+          content: Text(
+            'Вы уверены, что хотите удалить "${torrentInfo!.name}"?\n\nФайлы будут удалены с устройства.',
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('Отмена'),
+            ),
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+                context.read<DownloadsProvider>().removeTorrent(widget.infoHash);
+                Navigator.of(context).pop(); // Возвращаемся к списку загрузок
+              },
+              style: TextButton.styleFrom(
+                foregroundColor: Colors.red,
+              ),
+              child: const Text('Удалить'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/presentation/screens/main_screen.dart

@@ -4,6 +4,7 @@ import 'package:neomovies_mobile/presentation/screens/auth/profile_screen.dart';
 import 'package:neomovies_mobile/presentation/screens/favorites/favorites_screen.dart';
 import 'package:neomovies_mobile/presentation/screens/search/search_screen.dart';
 import 'package:neomovies_mobile/presentation/screens/home/home_screen.dart';
+import 'package:neomovies_mobile/presentation/screens/downloads/downloads_screen.dart';
 import 'package:provider/provider.dart';
 
 class MainScreen extends StatefulWidget {
@@ -30,7 +31,7 @@ class _MainScreenState extends State<MainScreen> {
     HomeScreen(),
     SearchScreen(),
     FavoritesScreen(),
-    Center(child: Text('Downloads Page')),
+    DownloadsScreen(),
     ProfileScreen(),
   ];
 

lib/presentation/screens/movie_detail/movie_detail_screen.dart

@@ -7,6 +7,7 @@ import 'package:neomovies_mobile/presentation/providers/reactions_provider.dart'
 import 'package:neomovies_mobile/presentation/providers/movie_detail_provider.dart';
 import 'package:neomovies_mobile/presentation/screens/player/video_player_screen.dart';
 import 'package:neomovies_mobile/presentation/screens/torrent_selector/torrent_selector_screen.dart';
+import 'package:neomovies_mobile/presentation/widgets/error_display.dart';
 import 'package:provider/provider.dart';
 
 class MovieDetailScreen extends StatefulWidget {
@@ -63,13 +64,11 @@ class _MovieDetailScreenState extends State<MovieDetailScreen> {
       return;
     }
 
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => VideoPlayerScreen(
-          mediaId: imdbId,
-          mediaType: widget.mediaType,
-          title: title,
-        ),
+    // TODO: Implement proper player navigation with mediaId
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Player feature will be implemented. Media ID: $imdbId'),
+        duration: Duration(seconds: 2),
       ),
     );
   }
@@ -91,7 +90,15 @@ class _MovieDetailScreenState extends State<MovieDetailScreen> {
           }
 
           if (provider.error != null) {
-            return Center(child: Text('Error: ${provider.error}'));
+            return ErrorDisplay(
+              title: 'Ошибка загрузки ${widget.mediaType == 'movie' ? 'фильма' : 'сериала'}',
+              error: provider.error!,
+              stackTrace: provider.stackTrace,
+              onRetry: () {
+                Provider.of<MovieDetailProvider>(context, listen: false)
+                    .loadMedia(int.parse(widget.movieId), widget.mediaType);
+              },
+            );
           }
 
           if (provider.movie == null) {

lib/presentation/screens/player/video_player_screen.dart

@@ -1,163 +1,290 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
-import 'package:neomovies_mobile/utils/device_utils.dart';
-import 'package:neomovies_mobile/presentation/widgets/player/web_player_widget.dart';
-import 'package:neomovies_mobile/data/models/player/video_source.dart';
+import 'package:video_player/video_player.dart';
+import 'dart:io';
+import 'package:auto_route/auto_route.dart';
 
+@RoutePage()
 class VideoPlayerScreen extends StatefulWidget {
-  final String mediaId; // Теперь это IMDB ID
-  final String mediaType; // 'movie' or 'tv'
-  final String? title;
-  final String? subtitle;
-  final String? posterUrl;
+  final String filePath;
+  final String title;
 
   const VideoPlayerScreen({
-    Key? key,
-    required this.mediaId,
-    required this.mediaType,
-    this.title,
-    this.subtitle,
-    this.posterUrl,
-  }) : super(key: key);
+    super.key,
+    required this.filePath,
+    required this.title,
+  });
 
   @override
   State<VideoPlayerScreen> createState() => _VideoPlayerScreenState();
 }
 
 class _VideoPlayerScreenState extends State<VideoPlayerScreen> {
-  VideoSource _selectedSource = VideoSource.defaultSources.first;
+  VideoPlayerController? _controller;
+  bool _isControlsVisible = true;
+  bool _isFullscreen = false;
+  bool _isLoading = true;
+  String? _error;
 
   @override
   void initState() {
     super.initState();
-    _setupPlayerEnvironment();
-  }
-
-  void _setupPlayerEnvironment() {
-    // Keep screen awake during video playback
-    WakelockPlus.enable();
-    
-    // Set landscape orientation
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.landscapeLeft,
-      DeviceOrientation.landscapeRight,
-    ]);
-    
-    // Hide system UI for immersive experience
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    _initializePlayer();
   }
 
   @override
   void dispose() {
-    _restoreSystemSettings();
+    _controller?.dispose();
+    _setOrientation(false);
     super.dispose();
   }
 
-  void _restoreSystemSettings() {
-    // Restore system UI and allow screen to sleep
-    WakelockPlus.disable();
+  Future<void> _initializePlayer() async {
+    try {
+      final file = File(widget.filePath);
+      if (!await file.exists()) {
+        setState(() {
+          _error = 'Файл не найден: ${widget.filePath}';
+          _isLoading = false;
+        });
+        return;
+      }
 
-    // Restore orientation: phones back to portrait, tablets/TV keep free rotation
-    if (DeviceUtils.isLargeScreen(context)) {
+      _controller = VideoPlayerController.file(file);
+      
+      await _controller!.initialize();
+      
+      _controller!.addListener(() {
+        setState(() {});
+      });
+
+      setState(() {
+        _isLoading = false;
+      });
+
+      // Auto play
+      _controller!.play();
+    } catch (e) {
+      setState(() {
+        _error = 'Ошибка инициализации плеера: $e';
+        _isLoading = false;
+      });
+    }
+  }
+
+  void _togglePlayPause() {
+    if (_controller!.value.isPlaying) {
+      _controller!.pause();
+    } else {
+      _controller!.play();
+    }
+    setState(() {});
+  }
+
+  void _toggleFullscreen() {
+    setState(() {
+      _isFullscreen = !_isFullscreen;
+    });
+    _setOrientation(_isFullscreen);
+  }
+
+  void _setOrientation(bool isFullscreen) {
+    if (isFullscreen) {
       SystemChrome.setPreferredOrientations([
-        DeviceOrientation.portraitUp,
-        DeviceOrientation.portraitDown,
         DeviceOrientation.landscapeLeft,
         DeviceOrientation.landscapeRight,
       ]);
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
     } else {
       SystemChrome.setPreferredOrientations([
         DeviceOrientation.portraitUp,
       ]);
+      SystemChrome.setEnabledSystemUIMode(
+        SystemUiMode.manual,
+        overlays: SystemUiOverlay.values,
+      );
     }
-    
-    // Restore system UI
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        _restoreSystemSettings();
-        return true;
-      },
-      child: _VideoPlayerScreenContent(
-        title: widget.title,
-        mediaId: widget.mediaId,
-        selectedSource: _selectedSource,
-        onSourceChanged: (source) {
-          if (mounted) {
-            setState(() {
-              _selectedSource = source;
-            });
-          }
-        },
-      ),
-    );
+  void _toggleControls() {
+    setState(() {
+      _isControlsVisible = !_isControlsVisible;
+    });
+
+    if (_isControlsVisible) {
+      // Hide controls after 3 seconds
+      Future.delayed(const Duration(seconds: 3), () {
+        if (mounted && _controller!.value.isPlaying) {
+          setState(() {
+            _isControlsVisible = false;
+          });
+        }
+      });
+    }
   }
-}
 
-class _VideoPlayerScreenContent extends StatelessWidget {
-  final String mediaId; // IMDB ID
-  final String? title;
-  final VideoSource selectedSource;
-  final ValueChanged<VideoSource> onSourceChanged;
+  String _formatDuration(Duration duration) {
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    final minutes = twoDigits(duration.inMinutes.remainder(60));
+    final seconds = twoDigits(duration.inSeconds.remainder(60));
+    final hours = duration.inHours;
     
-  const _VideoPlayerScreenContent({
-    Key? key,
-    required this.mediaId,
-    this.title,
-    required this.selectedSource,
-    required this.onSourceChanged,
-  }) : super(key: key);
+    if (hours > 0) {
+      return '$hours:$minutes:$seconds';
+    } else {
+      return '$minutes:$seconds';
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.black,
-      body: SafeArea(
+      appBar: _isFullscreen ? null : AppBar(
+        title: Text(
+          widget.title,
+          style: const TextStyle(color: Colors.white),
+        ),
+        backgroundColor: Colors.black,
+        iconTheme: const IconThemeData(color: Colors.white),
+        elevation: 0,
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    if (_isLoading) {
+      return const Center(
+        child: CircularProgressIndicator(
+          color: Colors.white,
+        ),
+      );
+    }
+
+    if (_error != null) {
+      return Center(
         child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            // Source selector header
-            Container(
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-              color: Colors.black87,
-              child: Row(
-                children: [
-                  IconButton(
-                    icon: const Icon(Icons.arrow_back, color: Colors.white),
-                    onPressed: () => Navigator.of(context).pop(),
-                  ),
-                  const SizedBox(width: 8),
-                  const Text(
-                    'Источник: ',
-                    style: TextStyle(color: Colors.white, fontSize: 16),
-                  ),
-                  _buildSourceSelector(),
-                  const Spacer(),
-                  if (title != null)
-                    Expanded(
-                      flex: 2,
-                      child: Text(
-                        title!,
-                        style: const TextStyle(color: Colors.white, fontSize: 14),
-                        overflow: TextOverflow.ellipsis,
-                        textAlign: TextAlign.end,
-                      ),
-                    ),
-                ],
+            const Icon(
+              Icons.error_outline,
+              size: 64,
+              color: Colors.white,
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              'Ошибка воспроизведения',
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 18,
+                fontWeight: FontWeight.w600,
               ),
             ),
+            const SizedBox(height: 8),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 32),
+              child: Text(
+                _error!,
+                textAlign: TextAlign.center,
+                style: const TextStyle(
+                  color: Colors.white70,
+                  fontSize: 14,
+                ),
+              ),
+            ),
+            const SizedBox(height: 24),
+            ElevatedButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('Назад'),
+            ),
+          ],
+        ),
+      );
+    }
 
-            // Video player
+    if (_controller == null || !_controller!.value.isInitialized) {
+      return const Center(
+        child: CircularProgressIndicator(
+          color: Colors.white,
+        ),
+      );
+    }
+
+    return GestureDetector(
+      onTap: _toggleControls,
+      child: Stack(
+        children: [
+          // Video player
+          Center(
+            child: AspectRatio(
+              aspectRatio: _controller!.value.aspectRatio,
+              child: VideoPlayer(_controller!),
+            ),
+          ),
+          
+          // Controls overlay
+          if (_isControlsVisible)
+            _buildControlsOverlay(),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildControlsOverlay() {
+    return Container(
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [
+            Colors.black.withOpacity(0.7),
+            Colors.transparent,
+            Colors.transparent,
+            Colors.black.withOpacity(0.7),
+          ],
+          stops: const [0.0, 0.3, 0.7, 1.0],
+        ),
+      ),
+      child: Column(
+        children: [
+          // Top bar
+          if (_isFullscreen) _buildTopBar(),
+          
+          // Center play/pause
+          Expanded(
+            child: Center(
+              child: _buildCenterControls(),
+            ),
+          ),
+          
+          // Bottom controls
+          _buildBottomControls(),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTopBar() {
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Row(
+          children: [
+            IconButton(
+              icon: const Icon(Icons.arrow_back, color: Colors.white),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
             Expanded(
-              child: WebPlayerWidget(
-                key: ValueKey(selectedSource.id),
-                mediaId: mediaId,
-                source: selectedSource,
+              child: Text(
+                widget.title,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 16,
+                  fontWeight: FontWeight.w500,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
               ),
             ),
           ],
@@ -166,24 +293,137 @@ class _VideoPlayerScreenContent extends StatelessWidget {
     );
   }
 
-  Widget _buildSourceSelector() {
-    return DropdownButton<VideoSource>(
-      value: selectedSource,
-      dropdownColor: Colors.black87,
-      style: const TextStyle(color: Colors.white),
-      underline: Container(),
-      items: VideoSource.defaultSources
-          .where((source) => source.isActive)
-          .map((source) => DropdownMenuItem<VideoSource>(
-                value: source,
-                child: Text(source.name),
-              ))
-          .toList(),
-      onChanged: (VideoSource? newSource) {
-        if (newSource != null) {
-          onSourceChanged(newSource);
-        }
-      },
+  Widget _buildCenterControls() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        IconButton(
+          iconSize: 48,
+          icon: Icon(
+            Icons.replay_10,
+            color: Colors.white.withOpacity(0.8),
+          ),
+          onPressed: () {
+            final newPosition = _controller!.value.position - const Duration(seconds: 10);
+            _controller!.seekTo(newPosition < Duration.zero ? Duration.zero : newPosition);
+          },
+        ),
+        const SizedBox(width: 32),
+        Container(
+          decoration: BoxDecoration(
+            color: Colors.black.withOpacity(0.5),
+            shape: BoxShape.circle,
+          ),
+          child: IconButton(
+            iconSize: 64,
+            icon: Icon(
+              _controller!.value.isPlaying ? Icons.pause : Icons.play_arrow,
+              color: Colors.white,
+            ),
+            onPressed: _togglePlayPause,
+          ),
+        ),
+        const SizedBox(width: 32),
+        IconButton(
+          iconSize: 48,
+          icon: Icon(
+            Icons.forward_10,
+            color: Colors.white.withOpacity(0.8),
+          ),
+          onPressed: () {
+            final newPosition = _controller!.value.position + const Duration(seconds: 10);
+            final maxDuration = _controller!.value.duration;
+            _controller!.seekTo(newPosition > maxDuration ? maxDuration : newPosition);
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildBottomControls() {
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          children: [
+            // Progress bar
+            Row(
+              children: [
+                Text(
+                  _formatDuration(_controller!.value.position),
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontSize: 12,
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: VideoProgressIndicator(
+                    _controller!,
+                    allowScrubbing: true,
+                    colors: VideoProgressColors(
+                      playedColor: Theme.of(context).primaryColor,
+                      backgroundColor: Colors.white.withOpacity(0.3),
+                      bufferedColor: Colors.white.withOpacity(0.5),
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  _formatDuration(_controller!.value.duration),
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            
+            // Control buttons
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                IconButton(
+                  icon: Icon(
+                    _controller!.value.volume == 0 ? Icons.volume_off : Icons.volume_up,
+                    color: Colors.white,
+                  ),
+                  onPressed: () {
+                    if (_controller!.value.volume == 0) {
+                      _controller!.setVolume(1.0);
+                    } else {
+                      _controller!.setVolume(0.0);
+                    }
+                    setState(() {});
+                  },
+                ),
+                IconButton(
+                  icon: Icon(
+                    _isFullscreen ? Icons.fullscreen_exit : Icons.fullscreen,
+                    color: Colors.white,
+                  ),
+                  onPressed: _toggleFullscreen,
+                ),
+                PopupMenuButton<double>(
+                  icon: const Icon(Icons.speed, color: Colors.white),
+                  onSelected: (speed) {
+                    _controller!.setPlaybackSpeed(speed);
+                  },
+                  itemBuilder: (context) => [
+                    const PopupMenuItem(value: 0.5, child: Text('0.5x')),
+                    const PopupMenuItem(value: 0.75, child: Text('0.75x')),
+                    const PopupMenuItem(value: 1.0, child: Text('1.0x')),
+                    const PopupMenuItem(value: 1.25, child: Text('1.25x')),
+                    const PopupMenuItem(value: 1.5, child: Text('1.5x')),
+                    const PopupMenuItem(value: 2.0, child: Text('2.0x')),
+                  ],
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/presentation/screens/player/webview_player_screen.dart

@@ -0,0 +1,469 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:auto_route/auto_route.dart';
+import '../../../data/services/player_embed_service.dart';
+
+enum WebPlayerType { vibix, alloha }
+
+@RoutePage()
+class WebViewPlayerScreen extends StatefulWidget {
+  final WebPlayerType playerType;
+  final String videoUrl;
+  final String title;
+
+  const WebViewPlayerScreen({
+    super.key,
+    required this.playerType,
+    required this.videoUrl,
+    required this.title,
+  });
+
+  @override
+  State<WebViewPlayerScreen> createState() => _WebViewPlayerScreenState();
+}
+
+class _WebViewPlayerScreenState extends State<WebViewPlayerScreen> {
+  late WebViewController _controller;
+  bool _isLoading = true;
+  bool _isFullscreen = false;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeWebView();
+  }
+
+  @override
+  void dispose() {
+    _setOrientation(false);
+    super.dispose();
+  }
+
+  void _initializeWebView() {
+    _controller = WebViewController()
+      ..setJavaScriptMode(JavaScriptMode.unrestricted)
+      ..setNavigationDelegate(
+        NavigationDelegate(
+          onProgress: (int progress) {
+            // Update loading progress
+          },
+          onPageStarted: (String url) {
+            setState(() {
+              _isLoading = true;
+              _error = null;
+            });
+          },
+          onPageFinished: (String url) {
+            setState(() {
+              _isLoading = false;
+            });
+          },
+          onWebResourceError: (WebResourceError error) {
+            setState(() {
+              _error = 'Ошибка загрузки: ${error.description}';
+              _isLoading = false;
+            });
+          },
+        ),
+      );
+
+    _loadPlayer();
+  }
+
+  void _loadPlayer() async {
+    try {
+      setState(() {
+        _isLoading = true;
+        _error = null;
+      });
+
+      final playerUrl = await _getPlayerUrl();
+      _controller.loadRequest(Uri.parse(playerUrl));
+    } catch (e) {
+      setState(() {
+        _error = 'Ошибка получения URL плеера: $e';
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<String> _getPlayerUrl() async {
+    switch (widget.playerType) {
+      case WebPlayerType.vibix:
+        return await _getVibixUrl();
+      case WebPlayerType.alloha:
+        return await _getAllohaUrl();
+    }
+  }
+
+  Future<String> _getVibixUrl() async {
+    try {
+      // Try to get embed URL from API server first
+      return await PlayerEmbedService.getVibixEmbedUrl(
+        videoUrl: widget.videoUrl,
+        title: widget.title,
+      );
+    } catch (e) {
+      // Fallback to direct URL if server is unavailable
+      final encodedVideoUrl = Uri.encodeComponent(widget.videoUrl);
+      return 'https://vibix.me/embed/?src=$encodedVideoUrl&autoplay=1&title=${Uri.encodeComponent(widget.title)}';
+    }
+  }
+
+  Future<String> _getAllohaUrl() async {
+    try {
+      // Try to get embed URL from API server first
+      return await PlayerEmbedService.getAllohaEmbedUrl(
+        videoUrl: widget.videoUrl,
+        title: widget.title,
+      );
+    } catch (e) {
+      // Fallback to direct URL if server is unavailable
+      final encodedVideoUrl = Uri.encodeComponent(widget.videoUrl);
+      return 'https://alloha.tv/embed?src=$encodedVideoUrl&autoplay=1&title=${Uri.encodeComponent(widget.title)}';
+    }
+  }
+
+  void _toggleFullscreen() {
+    setState(() {
+      _isFullscreen = !_isFullscreen;
+    });
+    _setOrientation(_isFullscreen);
+  }
+
+  void _setOrientation(bool isFullscreen) {
+    if (isFullscreen) {
+      SystemChrome.setPreferredOrientations([
+        DeviceOrientation.landscapeLeft,
+        DeviceOrientation.landscapeRight,
+      ]);
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+    } else {
+      SystemChrome.setPreferredOrientations([
+        DeviceOrientation.portraitUp,
+      ]);
+      SystemChrome.setEnabledSystemUIMode(
+        SystemUiMode.manual,
+        overlays: SystemUiOverlay.values,
+      );
+    }
+  }
+
+  String _getPlayerName() {
+    switch (widget.playerType) {
+      case WebPlayerType.vibix:
+        return 'Vibix';
+      case WebPlayerType.alloha:
+        return 'Alloha';
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: _isFullscreen ? null : AppBar(
+        title: Text(
+          '${_getPlayerName()} - ${widget.title}',
+          style: const TextStyle(color: Colors.white),
+        ),
+        backgroundColor: Colors.black,
+        iconTheme: const IconThemeData(color: Colors.white),
+        elevation: 0,
+        actions: [
+          IconButton(
+            icon: Icon(
+              _isFullscreen ? Icons.fullscreen_exit : Icons.fullscreen,
+              color: Colors.white,
+            ),
+            onPressed: _toggleFullscreen,
+          ),
+          PopupMenuButton<String>(
+            icon: const Icon(Icons.more_vert, color: Colors.white),
+            onSelected: (value) => _handleMenuAction(value),
+            itemBuilder: (BuildContext context) => [
+              const PopupMenuItem(
+                value: 'reload',
+                child: Row(
+                  children: [
+                    Icon(Icons.refresh),
+                    SizedBox(width: 8),
+                    Text('Перезагрузить'),
+                  ],
+                ),
+              ),
+              const PopupMenuItem(
+                value: 'share',
+                child: Row(
+                  children: [
+                    Icon(Icons.share),
+                    SizedBox(width: 8),
+                    Text('Поделиться'),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    if (_error != null) {
+      return _buildErrorState();
+    }
+
+    return Stack(
+      children: [
+        // WebView
+        WebViewWidget(controller: _controller),
+        
+        // Loading indicator
+        if (_isLoading)
+          Container(
+            color: Colors.black,
+            child: const Center(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  CircularProgressIndicator(
+                    color: Colors.white,
+                  ),
+                  SizedBox(height: 16),
+                  Text(
+                    'Загрузка плеера...',
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        
+        // Fullscreen toggle for when player is loaded
+        if (!_isLoading && !_isFullscreen)
+          Positioned(
+            top: 16,
+            right: 16,
+            child: SafeArea(
+              child: Container(
+                decoration: BoxDecoration(
+                  color: Colors.black.withOpacity(0.7),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: IconButton(
+                  icon: const Icon(Icons.fullscreen, color: Colors.white),
+                  onPressed: _toggleFullscreen,
+                ),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildErrorState() {
+    return Center(
+      child: Container(
+        padding: const EdgeInsets.all(24),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.error_outline,
+              size: 64,
+              color: Colors.red.shade300,
+            ),
+            const SizedBox(height: 16),
+            Text(
+              'Ошибка загрузки плеера',
+              style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                color: Colors.white,
+              ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              _error!,
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: Colors.white70,
+              ),
+            ),
+            const SizedBox(height: 24),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                ElevatedButton(
+                  onPressed: () {
+                    setState(() {
+                      _error = null;
+                    });
+                    _loadPlayer();
+                  },
+                  child: const Text('Повторить'),
+                ),
+                const SizedBox(width: 16),
+                OutlinedButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  style: OutlinedButton.styleFrom(
+                    foregroundColor: Colors.white,
+                    side: const BorderSide(color: Colors.white),
+                  ),
+                  child: const Text('Назад'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            _buildPlayerInfo(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPlayerInfo() {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.grey.shade900.withOpacity(0.8),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            'Информация о плеере',
+            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+              color: Colors.white,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(height: 8),
+          _buildInfoRow('Плеер', _getPlayerName()),
+          _buildInfoRow('Файл', widget.title),
+          _buildInfoRow('URL', widget.videoUrl),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 4),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            width: 60,
+            child: Text(
+              '$label:',
+              style: const TextStyle(
+                color: Colors.white70,
+                fontSize: 12,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              value,
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 12,
+              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _handleMenuAction(String action) {
+    switch (action) {
+      case 'reload':
+        _loadPlayer();
+        break;
+      case 'share':
+        _shareVideo();
+        break;
+    }
+  }
+
+  void _shareVideo() {
+    // TODO: Implement sharing functionality
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Поделиться: ${widget.title}'),
+        backgroundColor: Colors.green,
+      ),
+    );
+  }
+}
+
+// Helper widget for creating custom HTML player if needed
+class CustomPlayerWidget extends StatelessWidget {
+  final String videoUrl;
+  final String title;
+  final WebPlayerType playerType;
+
+  const CustomPlayerWidget({
+    super.key,
+    required this.videoUrl,
+    required this.title,
+    required this.playerType,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      height: double.infinity,
+      color: Colors.black,
+      child: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.play_circle_filled,
+              size: 64,
+              color: Colors.white.withOpacity(0.8),
+            ),
+            const SizedBox(height: 16),
+            Text(
+              title,
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 18,
+                fontWeight: FontWeight.w600,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Плеер: ${playerType == WebPlayerType.vibix ? 'Vibix' : 'Alloha'}',
+              style: const TextStyle(
+                color: Colors.white70,
+                fontSize: 14,
+              ),
+            ),
+            const SizedBox(height: 24),
+            const Text(
+              'Нажмите для воспроизведения',
+              style: TextStyle(
+                color: Colors.white70,
+                fontSize: 14,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/presentation/widgets/error_display.dart

@@ -0,0 +1,254 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+/// Widget that displays detailed error information for debugging
+class ErrorDisplay extends StatelessWidget {
+  final String title;
+  final String error;
+  final String? stackTrace;
+  final VoidCallback? onRetry;
+
+  const ErrorDisplay({
+    super.key,
+    this.title = 'Произошла ошибка',
+    required this.error,
+    this.stackTrace,
+    this.onRetry,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Error icon and title
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(
+                  Icons.error_outline,
+                  size: 48,
+                  color: Colors.red.shade400,
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            
+            // Title
+            Text(
+              title,
+              style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: Colors.red.shade700,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 24),
+            
+            // Error message card
+            Container(
+              width: double.infinity,
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: Colors.red.shade50,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: Colors.red.shade200),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Icon(Icons.info_outline, size: 20, color: Colors.red.shade700),
+                      const SizedBox(width: 8),
+                      Text(
+                        'Сообщение об ошибке:',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Colors.red.shade700,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  SelectableText(
+                    error,
+                    style: const TextStyle(
+                      fontFamily: 'monospace',
+                      fontSize: 13,
+                    ),
+                  ),
+                  const SizedBox(height: 12),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: OutlinedButton.icon(
+                          onPressed: () {
+                            Clipboard.setData(ClipboardData(text: error));
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Ошибка скопирована в буфер обмена'),
+                                duration: Duration(seconds: 2),
+                              ),
+                            );
+                          },
+                          icon: const Icon(Icons.copy, size: 18),
+                          label: const Text('Копировать ошибку'),
+                          style: OutlinedButton.styleFrom(
+                            foregroundColor: Colors.red.shade700,
+                            side: BorderSide(color: Colors.red.shade300),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            
+            // Stack trace (if available)
+            if (stackTrace != null && stackTrace!.isNotEmpty) ...[
+              const SizedBox(height: 16),
+              ExpansionTile(
+                title: Row(
+                  children: [
+                    Icon(Icons.bug_report, size: 20, color: Colors.orange.shade700),
+                    const SizedBox(width: 8),
+                    Text(
+                      'Stack Trace (для разработчиков)',
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        color: Colors.orange.shade700,
+                      ),
+                    ),
+                  ],
+                ),
+                backgroundColor: Colors.orange.shade50,
+                collapsedBackgroundColor: Colors.orange.shade50,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  side: BorderSide(color: Colors.orange.shade200),
+                ),
+                collapsedShape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  side: BorderSide(color: Colors.orange.shade200),
+                ),
+                children: [
+                  Container(
+                    width: double.infinity,
+                    padding: const EdgeInsets.all(16),
+                    decoration: BoxDecoration(
+                      color: Colors.grey.shade900,
+                      borderRadius: const BorderRadius.only(
+                        bottomLeft: Radius.circular(8),
+                        bottomRight: Radius.circular(8),
+                      ),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SelectableText(
+                          stackTrace!,
+                          style: const TextStyle(
+                            fontFamily: 'monospace',
+                            fontSize: 11,
+                            color: Colors.greenAccent,
+                          ),
+                        ),
+                        const SizedBox(height: 12),
+                        OutlinedButton.icon(
+                          onPressed: () {
+                            Clipboard.setData(ClipboardData(text: stackTrace!));
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Stack trace скопирован в буфер обмена'),
+                                duration: Duration(seconds: 2),
+                              ),
+                            );
+                          },
+                          icon: const Icon(Icons.copy, size: 18),
+                          label: const Text('Копировать stack trace'),
+                          style: OutlinedButton.styleFrom(
+                            foregroundColor: Colors.greenAccent,
+                            side: const BorderSide(color: Colors.greenAccent),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ],
+            
+            // Retry button
+            if (onRetry != null) ...[
+              const SizedBox(height: 24),
+              Row(
+                children: [
+                  Expanded(
+                    child: ElevatedButton.icon(
+                      onPressed: onRetry,
+                      icon: const Icon(Icons.refresh),
+                      label: const Text('Попробовать снова'),
+                      style: ElevatedButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                        backgroundColor: Theme.of(context).primaryColor,
+                        foregroundColor: Colors.white,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+            
+            // Debug tips
+            const SizedBox(height: 24),
+            Container(
+              width: double.infinity,
+              padding: const EdgeInsets.all(12),
+              decoration: BoxDecoration(
+                color: Colors.blue.shade50,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: Colors.blue.shade200),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Icon(Icons.lightbulb_outline, size: 20, color: Colors.blue.shade700),
+                      const SizedBox(width: 8),
+                      Text(
+                        'Советы по отладке:',
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Colors.blue.shade700,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    '• Скопируйте ошибку и отправьте разработчику\n'
+                    '• Проверьте соединение с интернетом\n'
+                    '• Проверьте логи Flutter в консоли\n'
+                    '• Попробуйте перезапустить приложение',
+                    style: TextStyle(
+                      fontSize: 12,
+                      color: Colors.blue.shade900,
+                      height: 1.5,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -12,6 +12,7 @@ import path_provider_foundation
 import shared_preferences_foundation
 import sqflite_darwin
 import url_launcher_macos
+import video_player_avfoundation
 import wakelock_plus
 import webview_flutter_wkwebview
 
@@ -23,6 +24,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
   WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
 }

pubspec.lock

@@ -41,6 +41,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
+  auto_route:
+    dependency: "direct main"
+    description:
+      name: auto_route
+      sha256: a9001a90539ca3effc168f7e1029a5885c7326b9032c09ac895e303c1d137704
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.3.0"
+  auto_route_generator:
+    dependency: "direct dev"
+    description:
+      name: auto_route_generator
+      sha256: a21d7a936c917488653c972f62d884d8adcf8c5d37acc7cd24da33cf784546c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.0"
   bloc:
     dependency: transitive
     description:
@@ -117,18 +133,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.12.0"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
-      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
+      sha256: "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.4.0"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
@@ -141,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
+      sha256: "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   characters:
     dependency: transitive
     description:
@@ -161,6 +177,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.4"
+  chewie:
+    dependency: "direct main"
+    description:
+      name: chewie
+      sha256: "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.13.0"
   cli_util:
     dependency: transitive
     description:
@@ -181,10 +205,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.1"
+    version: "4.11.0"
   collection:
     dependency: transitive
     description:
@@ -209,6 +233,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.6"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -233,6 +265,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  dio:
+    dependency: transitive
+    description:
+      name: dio
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -420,10 +468,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      sha256: "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.3.2"
   graphs:
     dependency: transitive
     description:
@@ -456,14 +504,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
+  http_mock_adapter:
+    dependency: "direct dev"
+    description:
+      name: http_mock_adapter
+      sha256: "46399c78bd4a0af071978edd8c502d7aeeed73b5fb9860bca86b5ed647a63c1b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
   http_multi_server:
     dependency: transitive
     description:
@@ -560,6 +624,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
+  logger:
+    dependency: transitive
+    description:
+      name: logger
+      sha256: "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
   logging:
     dependency: transitive
     description:
@@ -628,18 +700,18 @@ packages:
     dependency: transitive
     description:
       name: package_info_plus
-      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   path:
     dependency: transitive
     description:
@@ -649,7 +721,7 @@ packages:
     source: hosted
     version: "1.9.1"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
       sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
@@ -660,18 +732,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.18"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -696,14 +768,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.4.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.1.0"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "7.0.1"
   platform:
     dependency: transitive
     description:
@@ -724,10 +844,10 @@ packages:
     dependency: transitive
     description:
       name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   posix:
     dependency: transitive
     description:
@@ -740,10 +860,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.5+1"
   pub_semver:
     dependency: transitive
     description:
@@ -780,10 +900,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      sha256: "0b0f98d535319cb5cdd4f65783c2a54ee6d417a2f093dbb18be3e36e4c3d181f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.14"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -889,18 +1009,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_android
-      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
+      sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2+2"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b"
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.5"
+    version: "2.5.6"
   sqflite_darwin:
     dependency: transitive
     description:
@@ -1001,18 +1121,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
+      sha256: c0fb544b9ac7efa10254efaf00a951615c362d1ea1877472f8f6c0fa00fcf15b
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.16"
+    version: "6.3.23"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
+      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.3.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1025,10 +1145,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1069,46 +1189,86 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  video_player:
+    dependency: "direct main"
+    description:
+      name: video_player
+      sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.0"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      sha256: "6cfe0b1e102522eda1e139b82bf00602181c5844fd2885340f595fb213d74842"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.14"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      sha256: f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.4"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      sha256: cf2a1d29a284db648fd66cbd18aacc157f9862d77d2cc790f6f9678a46c1db5a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.4.0"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      sha256: "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
   wakelock_plus:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
+      sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
+      sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.4"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "0.5.1"
   web_socket:
     dependency: transitive
     description:
@@ -1137,26 +1297,26 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678
+      sha256: "21507ea5a326ceeba4d29dea19e37d92d53d9959cfc746317b9f9f7a57418d87"
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.10.3"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: f0dc2dc3a2b1e3a6abdd6801b9355ebfeb3b8f6cde6b9dc7c9235909c4a1f147
+      sha256: "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.1"
+    version: "2.14.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3
+      sha256: fea63576b3b7e02b2df8b78ba92b48ed66caec2bb041e9a0b1cbd586d5d80bfd
       url: "https://pub.dev"
     source: hosted
-    version: "3.22.0"
+    version: "3.23.1"
   win32:
     dependency: transitive
     description:
@@ -1177,10 +1337,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.6.1"
   yaml:
     dependency: transitive
     description:
@@ -1190,5 +1350,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.1 <4.0.0"
-  flutter: ">=3.27.0"
+  dart: ">=3.9.0 <4.0.0"
+  flutter: ">=3.35.0"

pubspec.yaml

@@ -52,19 +52,29 @@ dependencies:
   # Video Player (WebView only)
   webview_flutter: ^4.7.0
   wakelock_plus: ^1.2.1
+  # Video Player with native controls
+  video_player: ^2.9.2
+  chewie: ^1.8.5
   # Utils
   equatable: ^2.0.5
   url_launcher: ^6.3.2
+  auto_route: ^8.3.0
+  # File operations and path management
+  path_provider: ^2.1.4
+  permission_handler: ^11.3.1
 
 dev_dependencies:
   freezed: ^2.4.5
   json_serializable: ^6.7.1
   hive_generator: ^2.0.1
+  auto_route_generator: ^8.1.0
   flutter_test:
     sdk: flutter
   flutter_lints: ^5.0.0
   build_runner: ^2.4.13
   flutter_launcher_icons: ^0.13.1
+  # HTTP mocking for testing
+  http_mock_adapter: ^0.6.1
 
 flutter_launcher_icons:
   android: true

test/integration/ci_environment_test.dart

@@ -0,0 +1,83 @@
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('CI Environment Tests', () {
+    test('should detect GitHub Actions environment', () {
+      final isGitHubActions = Platform.environment['GITHUB_ACTIONS'] == 'true';
+      final isCI = Platform.environment['CI'] == 'true';
+      final runnerOS = Platform.environment['RUNNER_OS'];
+      
+      print('Environment Variables:');
+      print('  GITHUB_ACTIONS: ${Platform.environment['GITHUB_ACTIONS']}');
+      print('  CI: ${Platform.environment['CI']}');
+      print('  RUNNER_OS: $runnerOS');
+      print('  Platform: ${Platform.operatingSystem}');
+      
+      if (isGitHubActions || isCI) {
+        print('Running in CI/GitHub Actions environment');
+        expect(isCI, isTrue, reason: 'CI environment variable should be set');
+        
+        if (isGitHubActions) {
+          expect(runnerOS, isNotNull, reason: 'RUNNER_OS should be set in GitHub Actions');
+          print('  GitHub Actions Runner OS: $runnerOS');
+        }
+      } else {
+        print('Running in local development environment');
+      }
+      
+      // Test should always pass regardless of environment
+      expect(Platform.operatingSystem, isNotEmpty);
+    });
+
+    test('should have correct Dart/Flutter environment in CI', () {
+      final dartVersion = Platform.version;
+      print('Dart version: $dartVersion');
+      
+      // In CI, we should have Dart available
+      expect(dartVersion, isNotEmpty);
+      expect(dartVersion, contains('Dart'));
+      
+      // Check if running in CI and validate expected environment
+      final isCI = Platform.environment['CI'] == 'true';
+      if (isCI) {
+        print('Dart environment validated in CI');
+        
+        // CI should have these basic characteristics
+        expect(Platform.operatingSystem, anyOf('linux', 'macos', 'windows'));
+        
+        // GitHub Actions typically runs on Linux
+        final runnerOS = Platform.environment['RUNNER_OS'];
+        if (runnerOS == 'Linux') {
+          expect(Platform.operatingSystem, 'linux');
+        }
+      }
+    });
+
+    test('should handle network connectivity gracefully', () async {
+      // Simple network test that won't fail in restricted environments
+      try {
+        // Test with a reliable endpoint
+        final socket = await Socket.connect('8.8.8.8', 53, timeout: const Duration(seconds: 5));
+        socket.destroy();
+        print('Network connectivity available');
+      } catch (e) {
+        print('Limited network connectivity: $e');
+        // Don't fail the test - some CI environments have restricted network
+      }
+      
+      // Test should always pass
+      expect(true, isTrue);
+    });
+
+    test('should validate test infrastructure', () {
+      // Basic test framework validation
+      expect(testWidgets, isNotNull, reason: 'Flutter test framework should be available');
+      expect(setUp, isNotNull, reason: 'Test setup functions should be available');
+      expect(tearDown, isNotNull, reason: 'Test teardown functions should be available');
+      
+      print('Test infrastructure validated');
+    });
+  });
+}

test/models/torrent_info_test.dart

@@ -0,0 +1,196 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:neomovies_mobile/data/models/torrent_info.dart';
+
+void main() {
+  group('TorrentInfo', () {
+    test('fromAndroidJson creates valid TorrentInfo', () {
+      final json = {
+        'infoHash': 'test_hash',
+        'name': 'Test Torrent',
+        'totalSize': 1024000000,
+        'progress': 0.5,
+        'downloadSpeed': 1024000,
+        'uploadSpeed': 512000,
+        'numSeeds': 10,
+        'numPeers': 5,
+        'state': 'DOWNLOADING',
+        'savePath': '/test/path',
+        'files': [
+          {
+            'path': 'test.mp4',
+            'size': 1024000000,
+            'priority': 4,
+            'progress': 0.5,
+          }
+        ],
+        'pieceLength': 16384,
+        'numPieces': 62500,
+        'addedTime': 1640995200000,
+      };
+
+      final torrentInfo = TorrentInfo.fromAndroidJson(json);
+
+      expect(torrentInfo.infoHash, equals('test_hash'));
+      expect(torrentInfo.name, equals('Test Torrent'));
+      expect(torrentInfo.totalSize, equals(1024000000));
+      expect(torrentInfo.progress, equals(0.5));
+      expect(torrentInfo.downloadSpeed, equals(1024000));
+      expect(torrentInfo.uploadSpeed, equals(512000));
+      expect(torrentInfo.numSeeds, equals(10));
+      expect(torrentInfo.numPeers, equals(5));
+      expect(torrentInfo.state, equals('DOWNLOADING'));
+      expect(torrentInfo.savePath, equals('/test/path'));
+      expect(torrentInfo.files.length, equals(1));
+      expect(torrentInfo.files.first.path, equals('test.mp4'));
+      expect(torrentInfo.files.first.size, equals(1024000000));
+      expect(torrentInfo.files.first.priority, equals(FilePriority.NORMAL));
+    });
+
+    test('isDownloading returns true for DOWNLOADING state', () {
+      final torrent = TorrentInfo(
+        infoHash: 'test',
+        name: 'test',
+        totalSize: 100,
+        progress: 0.5,
+        downloadSpeed: 1000,
+        uploadSpeed: 500,
+        numSeeds: 5,
+        numPeers: 3,
+        state: 'DOWNLOADING',
+        savePath: '/test',
+        files: [],
+      );
+
+      expect(torrent.isDownloading, isTrue);
+      expect(torrent.isPaused, isFalse);
+      expect(torrent.isSeeding, isFalse);
+      expect(torrent.isCompleted, isFalse);
+    });
+
+    test('isCompleted returns true for progress >= 1.0', () {
+      final torrent = TorrentInfo(
+        infoHash: 'test',
+        name: 'test',
+        totalSize: 100,
+        progress: 1.0,
+        downloadSpeed: 0,
+        uploadSpeed: 500,
+        numSeeds: 5,
+        numPeers: 3,
+        state: 'SEEDING',
+        savePath: '/test',
+        files: [],
+      );
+
+      expect(torrent.isCompleted, isTrue);
+      expect(torrent.isSeeding, isTrue);
+    });
+
+    test('videoFiles returns only video files', () {
+      final torrent = TorrentInfo(
+        infoHash: 'test',
+        name: 'test',
+        totalSize: 100,
+        progress: 1.0,
+        downloadSpeed: 0,
+        uploadSpeed: 0,
+        numSeeds: 0,
+        numPeers: 0,
+        state: 'COMPLETED',
+        savePath: '/test',
+        files: [
+          TorrentFileInfo(
+            path: 'movie.mp4',
+            size: 1000000,
+            priority: FilePriority.NORMAL,
+          ),
+          TorrentFileInfo(
+            path: 'subtitle.srt',
+            size: 10000,
+            priority: FilePriority.NORMAL,
+          ),
+          TorrentFileInfo(
+            path: 'episode.mkv',
+            size: 2000000,
+            priority: FilePriority.NORMAL,
+          ),
+        ],
+      );
+
+      final videoFiles = torrent.videoFiles;
+      expect(videoFiles.length, equals(2));
+      expect(videoFiles.any((file) => file.path == 'movie.mp4'), isTrue);
+      expect(videoFiles.any((file) => file.path == 'episode.mkv'), isTrue);
+      expect(videoFiles.any((file) => file.path == 'subtitle.srt'), isFalse);
+    });
+
+    test('mainVideoFile returns largest video file', () {
+      final torrent = TorrentInfo(
+        infoHash: 'test',
+        name: 'test',
+        totalSize: 100,
+        progress: 1.0,
+        downloadSpeed: 0,
+        uploadSpeed: 0,
+        numSeeds: 0,
+        numPeers: 0,
+        state: 'COMPLETED',
+        savePath: '/test',
+        files: [
+          TorrentFileInfo(
+            path: 'small.mp4',
+            size: 1000000,
+            priority: FilePriority.NORMAL,
+          ),
+          TorrentFileInfo(
+            path: 'large.mkv',
+            size: 5000000,
+            priority: FilePriority.NORMAL,
+          ),
+          TorrentFileInfo(
+            path: 'medium.avi',
+            size: 3000000,
+            priority: FilePriority.NORMAL,
+          ),
+        ],
+      );
+
+      final mainFile = torrent.mainVideoFile;
+      expect(mainFile?.path, equals('large.mkv'));
+      expect(mainFile?.size, equals(5000000));
+    });
+
+    test('formattedTotalSize formats bytes correctly', () {
+      final torrent = TorrentInfo(
+        infoHash: 'test',
+        name: 'test',
+        totalSize: 1073741824, // 1 GB
+        progress: 0.0,
+        downloadSpeed: 0,
+        uploadSpeed: 0,
+        numSeeds: 0,
+        numPeers: 0,
+        state: 'PAUSED',
+        savePath: '/test',
+        files: [],
+      );
+
+      expect(torrent.formattedTotalSize, equals('1.0GB'));
+    });
+  });
+
+  group('FilePriority', () {
+    test('fromValue returns correct priority', () {
+      expect(FilePriority.fromValue(0), equals(FilePriority.DONT_DOWNLOAD));
+      expect(FilePriority.fromValue(4), equals(FilePriority.NORMAL));
+      expect(FilePriority.fromValue(7), equals(FilePriority.HIGH));
+      expect(FilePriority.fromValue(999), equals(FilePriority.NORMAL)); // Default
+    });
+
+    test('comparison operators work correctly', () {
+      expect(FilePriority.HIGH > FilePriority.NORMAL, isTrue);
+      expect(FilePriority.NORMAL > FilePriority.DONT_DOWNLOAD, isTrue);
+      expect(FilePriority.DONT_DOWNLOAD < FilePriority.HIGH, isTrue);
+    });
+  });
+}

test/providers/downloads_provider_test.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:neomovies_mobile/presentation/providers/downloads_provider.dart';
+
+void main() {
+  group('DownloadsProvider', () {
+    late DownloadsProvider provider;
+
+    setUp(() {
+      provider = DownloadsProvider();
+    });
+
+    tearDown(() {
+      provider.dispose();
+    });
+
+    test('initial state is correct', () {
+      expect(provider.torrents, isEmpty);
+      expect(provider.isLoading, isFalse);
+      expect(provider.error, isNull);
+    });
+
+    test('formatSpeed formats bytes correctly', () {
+      expect(provider.formatSpeed(1024), equals('1.0KB/s'));
+      expect(provider.formatSpeed(1048576), equals('1.0MB/s'));
+      expect(provider.formatSpeed(512), equals('512B/s'));
+      expect(provider.formatSpeed(2048000), equals('2.0MB/s'));
+    });
+
+    test('formatDuration formats duration correctly', () {
+      expect(provider.formatDuration(Duration(seconds: 30)), equals('30с'));
+      expect(provider.formatDuration(Duration(minutes: 2, seconds: 30)), equals('2м 30с'));
+      expect(provider.formatDuration(Duration(hours: 1, minutes: 30, seconds: 45)), equals('1ч 30м 45с'));
+      expect(provider.formatDuration(Duration(hours: 2)), equals('2ч 0м 0с'));
+    });
+
+    test('provider implements ChangeNotifier', () {
+      expect(provider, isA<ChangeNotifier>());
+    });
+  });
+}

test/services/player_embed_service_test.dart

@@ -0,0 +1,381 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:neomovies_mobile/data/services/player_embed_service.dart';
+
+void main() {
+  group('PlayerEmbedService Tests', () {
+    group('Vibix Player', () {
+      test('should get embed URL from API server successfully', () async {
+        final mockClient = MockClient((request) async {
+          if (request.url.path == '/api/player/vibix/embed') {
+            final body = jsonDecode(request.body);
+            expect(body['videoUrl'], 'http://example.com/video.mp4');
+            expect(body['title'], 'Test Movie');
+            expect(body['autoplay'], true);
+
+            return http.Response(
+              jsonEncode({
+                'embedUrl': 'https://vibix.me/embed/custom?src=encoded&autoplay=1',
+                'success': true,
+              }),
+              200,
+              headers: {'content-type': 'application/json'},
+            );
+          }
+          return http.Response('Not Found', 404);
+        });
+
+        // Mock the http client (in real implementation, you'd inject this)
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test Movie',
+        );
+
+        expect(embedUrl, 'https://vibix.me/embed/custom?src=encoded&autoplay=1');
+      });
+
+      test('should fallback to direct URL when server fails', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Server Error', 500);
+        });
+
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test Movie',
+        );
+
+        expect(embedUrl, contains('vibix.me/embed'));
+        expect(embedUrl, contains('src=http%3A//example.com/video.mp4'));
+        expect(embedUrl, contains('title=Test%20Movie'));
+      });
+
+      test('should handle network timeout gracefully', () async {
+        final mockClient = MockClient((request) async {
+          throw const SocketException('Connection timeout');
+        });
+
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test Movie',
+        );
+
+        // Should fallback to direct URL
+        expect(embedUrl, contains('vibix.me/embed'));
+      });
+
+      test('should include optional parameters in API request', () async {
+        final mockClient = MockClient((request) async {
+          if (request.url.path == '/api/player/vibix/embed') {
+            final body = jsonDecode(request.body);
+            expect(body['imdbId'], 'tt1234567');
+            expect(body['season'], '1');
+            expect(body['episode'], '5');
+
+            return http.Response(
+              jsonEncode({'embedUrl': 'https://vibix.me/embed/tv'}),
+              200,
+            );
+          }
+          return http.Response('Not Found', 404);
+        });
+
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test TV Show',
+          imdbId: 'tt1234567',
+          season: '1',
+          episode: '5',
+        );
+
+        expect(embedUrl, 'https://vibix.me/embed/tv');
+      });
+    });
+
+    group('Alloha Player', () {
+      test('should get embed URL from API server successfully', () async {
+        final mockClient = MockClient((request) async {
+          if (request.url.path == '/api/player/alloha/embed') {
+            return http.Response(
+              jsonEncode({
+                'embedUrl': 'https://alloha.tv/embed/custom?src=encoded',
+                'success': true,
+              }),
+              200,
+            );
+          }
+          return http.Response('Not Found', 404);
+        });
+
+        final embedUrl = await _testGetAllohaEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test Movie',
+        );
+
+        expect(embedUrl, 'https://alloha.tv/embed/custom?src=encoded');
+      });
+
+      test('should fallback to direct URL when server fails', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Server Error', 500);
+        });
+
+        final embedUrl = await _testGetAllohaEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Test Movie',
+        );
+
+        expect(embedUrl, contains('alloha.tv/embed'));
+        expect(embedUrl, contains('src=http%3A//example.com/video.mp4'));
+      });
+    });
+
+    group('Player Configuration', () {
+      test('should get player config from server', () async {
+        final mockClient = MockClient((request) async {
+          if (request.url.path == '/api/player/vibix/config') {
+            return http.Response(
+              jsonEncode({
+                'playerOptions': {
+                  'autoplay': true,
+                  'controls': true,
+                  'volume': 0.8,
+                },
+                'theme': 'dark',
+                'language': 'ru',
+              }),
+              200,
+            );
+          }
+          return http.Response('Not Found', 404);
+        });
+
+        final config = await _testGetPlayerConfig(
+          client: mockClient,
+          playerType: 'vibix',
+          imdbId: 'tt1234567',
+        );
+
+        expect(config, isNotNull);
+        expect(config!['playerOptions']['autoplay'], true);
+        expect(config['theme'], 'dark');
+      });
+
+      test('should return null when config not available', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Not Found', 404);
+        });
+
+        final config = await _testGetPlayerConfig(
+          client: mockClient,
+          playerType: 'nonexistent',
+        );
+
+        expect(config, isNull);
+      });
+    });
+
+    group('Server Health Check', () {
+      test('should return true when server is available', () async {
+        final mockClient = MockClient((request) async {
+          if (request.url.path == '/api/player/health') {
+            return http.Response(
+              jsonEncode({'status': 'ok', 'version': '1.0.0'}),
+              200,
+            );
+          }
+          return http.Response('Not Found', 404);
+        });
+
+        final isAvailable = await _testIsServerApiAvailable(mockClient);
+        expect(isAvailable, true);
+      });
+
+      test('should return false when server is unavailable', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Server Error', 500);
+        });
+
+        final isAvailable = await _testIsServerApiAvailable(mockClient);
+        expect(isAvailable, false);
+      });
+
+      test('should return false on network timeout', () async {
+        final mockClient = MockClient((request) async {
+          throw const SocketException('Connection timeout');
+        });
+
+        final isAvailable = await _testIsServerApiAvailable(mockClient);
+        expect(isAvailable, false);
+      });
+    });
+
+    group('URL Encoding', () {
+      test('should properly encode special characters in video URL', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Server Error', 500); // Force fallback
+        });
+
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/path with spaces/movie&test.mp4',
+          title: 'Movie Title (2023)',
+        );
+
+        expect(embedUrl, contains('path%20with%20spaces'));
+        expect(embedUrl, contains('movie%26test.mp4'));
+        expect(embedUrl, contains('Movie%20Title%20%282023%29'));
+      });
+
+      test('should handle non-ASCII characters in title', () async {
+        final mockClient = MockClient((request) async {
+          return http.Response('Server Error', 500); // Force fallback
+        });
+
+        final embedUrl = await _testGetVibixEmbedUrl(
+          client: mockClient,
+          videoUrl: 'http://example.com/video.mp4',
+          title: 'Тест Фильм Россия',
+        );
+
+        expect(embedUrl, contains('title=%D0%A2%D0%B5%D1%81%D1%82'));
+      });
+    });
+  });
+}
+
+// Helper functions to test with mocked http client
+// Note: In a real implementation, you would inject the http client
+
+Future<String> _testGetVibixEmbedUrl({
+  required http.Client client,
+  required String videoUrl,
+  required String title,
+  String? imdbId,
+  String? season,
+  String? episode,
+}) async {
+  // This simulates the PlayerEmbedService.getVibixEmbedUrl behavior
+  // In real implementation, you'd need dependency injection for the http client
+  try {
+    final response = await client.post(
+      Uri.parse('https://neomovies.site/api/player/vibix/embed'),
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+      },
+      body: jsonEncode({
+        'videoUrl': videoUrl,
+        'title': title,
+        'imdbId': imdbId,
+        'season': season,
+        'episode': episode,
+        'autoplay': true,
+      }),
+    );
+
+    if (response.statusCode == 200) {
+      final data = jsonDecode(response.body);
+      return data['embedUrl'] as String;
+    } else {
+      throw Exception('Failed to get Vibix embed URL: ${response.statusCode}');
+    }
+  } catch (e) {
+    // Fallback to direct URL
+    final encodedVideoUrl = Uri.encodeComponent(videoUrl);
+    final encodedTitle = Uri.encodeComponent(title);
+    return 'https://vibix.me/embed/?src=$encodedVideoUrl&autoplay=1&title=$encodedTitle';
+  }
+}
+
+Future<String> _testGetAllohaEmbedUrl({
+  required http.Client client,
+  required String videoUrl,
+  required String title,
+  String? imdbId,
+  String? season,
+  String? episode,
+}) async {
+  try {
+    final response = await client.post(
+      Uri.parse('https://neomovies.site/api/player/alloha/embed'),
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json',
+      },
+      body: jsonEncode({
+        'videoUrl': videoUrl,
+        'title': title,
+        'imdbId': imdbId,
+        'season': season,
+        'episode': episode,
+        'autoplay': true,
+      }),
+    );
+
+    if (response.statusCode == 200) {
+      final data = jsonDecode(response.body);
+      return data['embedUrl'] as String;
+    } else {
+      throw Exception('Failed to get Alloha embed URL: ${response.statusCode}');
+    }
+  } catch (e) {
+    // Fallback to direct URL
+    final encodedVideoUrl = Uri.encodeComponent(videoUrl);
+    final encodedTitle = Uri.encodeComponent(title);
+    return 'https://alloha.tv/embed?src=$encodedVideoUrl&autoplay=1&title=$encodedTitle';
+  }
+}
+
+Future<Map<String, dynamic>?> _testGetPlayerConfig({
+  required http.Client client,
+  required String playerType,
+  String? imdbId,
+  String? season,
+  String? episode,
+}) async {
+  try {
+    final response = await client.get(
+      Uri.parse('https://neomovies.site/api/player/$playerType/config').replace(
+        queryParameters: {
+          if (imdbId != null) 'imdbId': imdbId,
+          if (season != null) 'season': season,
+          if (episode != null) 'episode': episode,
+        },
+      ),
+      headers: {
+        'Accept': 'application/json',
+      },
+    );
+
+    if (response.statusCode == 200) {
+      return jsonDecode(response.body) as Map<String, dynamic>;
+    } else {
+      return null;
+    }
+  } catch (e) {
+    return null;
+  }
+}
+
+Future<bool> _testIsServerApiAvailable(http.Client client) async {
+  try {
+    final response = await client.get(
+      Uri.parse('https://neomovies.site/api/player/health'),
+      headers: {'Accept': 'application/json'},
+    ).timeout(const Duration(seconds: 5));
+
+    return response.statusCode == 200;
+  } catch (e) {
+    return false;
+  }
+}

test/services/torrent_platform_service_simple_test.dart

@@ -0,0 +1,111 @@
+import 'dart:convert';
+
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:neomovies_mobile/data/services/torrent_platform_service.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  
+  group('TorrentPlatformService Tests', () {
+    late List<MethodCall> methodCalls;
+
+    setUp(() {
+      methodCalls = [];
+
+      // Mock the platform channel
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(
+        const MethodChannel('com.neo.neomovies_mobile/torrent'),
+        (MethodCall methodCall) async {
+          methodCalls.add(methodCall);
+          return _handleMethodCall(methodCall);
+        },
+      );
+    });
+
+    tearDown(() {
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(
+        const MethodChannel('com.neo.neomovies_mobile/torrent'),
+        null,
+      );
+    });
+
+    test('addTorrent should call platform method with correct parameters', () async {
+      const magnetUri = 'magnet:?xt=urn:btih:test123&dn=test.movie.mkv';
+      const savePath = '/storage/emulated/0/Download/Torrents';
+      
+      final result = await TorrentPlatformService.addTorrent(
+        magnetUri: magnetUri, 
+        savePath: savePath
+      );
+
+      expect(methodCalls.length, 1);
+      expect(methodCalls.first.method, 'addTorrent');
+      expect(methodCalls.first.arguments, {
+        'magnetUri': magnetUri,
+        'savePath': savePath,
+      });
+      expect(result, 'test-hash-123');
+    });
+
+    test('parseMagnetBasicInfo should parse magnet URI correctly', () async {
+      const magnetUri = 'magnet:?xt=urn:btih:abc123&dn=test%20movie&tr=http%3A//tracker.example.com%3A8080/announce';
+      
+      final result = await TorrentPlatformService.parseMagnetBasicInfo(magnetUri);
+
+      expect(result.name, 'test movie');
+      expect(result.infoHash, 'abc123');
+      expect(result.trackers.length, 1);
+      expect(result.trackers.first, 'http://tracker.example.com:8080/announce');
+    });
+  });
+}
+
+/// Mock method call handler for torrent platform channel
+dynamic _handleMethodCall(MethodCall methodCall) {
+  switch (methodCall.method) {
+    case 'addTorrent':
+      return 'test-hash-123';
+
+    case 'getTorrents':
+      return jsonEncode([
+        {
+          'infoHash': 'test-hash-123',
+          'progress': 0.5,
+          'downloadSpeed': 1024000,
+          'uploadSpeed': 512000,
+          'numSeeds': 5,
+          'numPeers': 10,
+          'state': 'downloading',
+        }
+      ]);
+
+    case 'getTorrent':
+      return jsonEncode({
+        'name': 'Test Movie',
+        'infoHash': 'test-hash-123',
+        'totalSize': 1073741824,
+        'files': [
+          {
+            'path': 'Test Movie.mkv',
+            'size': 1073741824,
+            'priority': 4,
+          }
+        ],
+        'downloadedSize': 536870912,
+        'downloadSpeed': 1024000,
+        'uploadSpeed': 512000,
+        'state': 'downloading',
+        'progress': 0.5,
+        'numSeeds': 5,
+        'numPeers': 10,
+        'addedTime': DateTime.now().millisecondsSinceEpoch,
+        'ratio': 0.8,
+      });
+
+    default:
+      return null;
+  }
+}

test/widget_test.dart

@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('App smoke test', (WidgetTester tester) async {
+    // Build a minimal app for testing
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          appBar: AppBar(
+            title: const Text('NeoMovies Test'),
+          ),
+          body: const Center(
+            child: Text('Hello World'),
+          ),
+        ),
+      ),
+    );
+
+    // Verify that our app displays basic elements
+    expect(find.text('NeoMovies Test'), findsOneWidget);
+    expect(find.text('Hello World'), findsOneWidget);
+  });
+
+  testWidgets('Download progress indicator test', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: Column(
+            children: [
+              LinearProgressIndicator(value: 0.5),
+              Text('50%'),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    // Verify progress indicator and text
+    expect(find.byType(LinearProgressIndicator), findsOneWidget);
+    expect(find.text('50%'), findsOneWidget);
+  });
+
+  testWidgets('List tile with popup menu test', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: ListTile(
+            title: const Text('Test Torrent'),
+            trailing: PopupMenuButton<String>(
+              itemBuilder: (context) => [
+                const PopupMenuItem(
+                  value: 'delete',
+                  child: Text('Delete'),
+                ),
+                const PopupMenuItem(
+                  value: 'pause',
+                  child: Text('Pause'),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+
+    // Verify list tile
+    expect(find.text('Test Torrent'), findsOneWidget);
+    expect(find.byType(PopupMenuButton<String>), findsOneWidget);
+
+    // Tap the popup menu button
+    await tester.tap(find.byType(PopupMenuButton<String>));
+    await tester.pumpAndSettle();
+
+    // Verify menu items appear
+    expect(find.text('Delete'), findsOneWidget);
+    expect(find.text('Pause'), findsOneWidget);
+  });
+}

windows/flutter/generated_plugin_registrant.cc

@@ -8,6 +8,7 @@
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -15,6 +16,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   flutter_secure_storage_windows
+  permission_handler_windows
   url_launcher_windows
 )