feat: mobile-like window size and always-visible stats

- Changed window size to mobile phone format (400x800) - Removed width condition for ActiveProxyFooter - now always visible - Added run-umbrix.sh launch script with icon copying - Stats cards now display on all screen sizes
2026-01-17 13:09:20 +03:00
parent ec5ebbd54b
commit 76a374950f
245 changed files with 7931 additions and 1315 deletions
--- a/lib/features/app_update/data/app_update_data_providers.dart
+++ b/lib/features/app_update/data/app_update_data_providers.dart
@@ -1,5 +1,5 @@
-import 'package:hiddify/core/http_client/http_client_provider.dart';
-import 'package:hiddify/features/app_update/data/app_update_repository.dart';
+import 'package:umbrix/core/http_client/http_client_provider.dart';
+import 'package:umbrix/features/app_update/data/app_update_repository.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

 part 'app_update_data_providers.g.dart';
--- a/lib/features/app_update/data/app_update_repository.dart
+++ b/lib/features/app_update/data/app_update_repository.dart
@@ -1,12 +1,12 @@
 import 'package:fpdart/fpdart.dart';
-import 'package:hiddify/core/http_client/dio_http_client.dart';
-import 'package:hiddify/core/model/constants.dart';
-import 'package:hiddify/core/model/environment.dart';
-import 'package:hiddify/core/utils/exception_handler.dart';
-import 'package:hiddify/features/app_update/data/github_release_parser.dart';
-import 'package:hiddify/features/app_update/model/app_update_failure.dart';
-import 'package:hiddify/features/app_update/model/remote_version_entity.dart';
-import 'package:hiddify/utils/utils.dart';
+import 'package:umbrix/core/http_client/dio_http_client.dart';
+import 'package:umbrix/core/model/constants.dart';
+import 'package:umbrix/core/model/environment.dart';
+import 'package:umbrix/core/utils/exception_handler.dart';
+import 'package:umbrix/features/app_update/data/github_release_parser.dart';
+import 'package:umbrix/features/app_update/model/app_update_failure.dart';
+import 'package:umbrix/features/app_update/model/remote_version_entity.dart';
+import 'package:umbrix/utils/utils.dart';

 abstract interface class AppUpdateRepository {
  TaskEither<AppUpdateFailure, RemoteVersionEntity> getLatestVersion({
@@ -15,9 +15,7 @@ abstract interface class AppUpdateRepository {
  });
 }

-class AppUpdateRepositoryImpl
-    with ExceptionHandler, InfraLogger
-    implements AppUpdateRepository {
+class AppUpdateRepositoryImpl with ExceptionHandler, InfraLogger implements AppUpdateRepository {
  AppUpdateRepositoryImpl({required this.httpClient});

  final DioHttpClient httpClient;
@@ -32,25 +30,86 @@ class AppUpdateRepositoryImpl
        if (!release.allowCustomUpdateChecker) {
          throw Exception("custom update checkers are not supported");
        }
-        final response =
-            await httpClient.get<List>(Constants.githubReleasesApiUrl);
-        if (response.statusCode != 200 || response.data == null) {
-          loggy.warning("failed to fetch latest version info");
-          return left(const AppUpdateFailure.unexpected());
-        }

-        final releases = response.data!.map(
-          (e) => GithubReleaseParser.parse(e as Map<String, dynamic>),
-        );
-        late RemoteVersionEntity latest;
-        if (includePreReleases) {
-          latest = releases.first;
+        // Выбираем источник обновлений: собственный сервер или GitHub
+        if (Constants.useCustomUpdateServer) {
+          return _getVersionFromCustomServer(includePreReleases);
        } else {
-          latest = releases.firstWhere((e) => e.preRelease == false);
+          return _getVersionFromGitHub(includePreReleases);
        }
-        return right(latest);
      },
      AppUpdateFailure.unexpected,
    );
  }
+
+  /// Получение версии с собственного сервера обновлений
+  /// Формат ответа:
+  /// {
+  ///   "version": "2.5.8",
+  ///   "build_number": "258",
+  ///   "is_prerelease": false,
+  ///   "download_url": "https://your-server.com/downloads/umbrix-2.5.8.apk",
+  ///   "release_notes": "Что нового в этой версии",
+  ///   "published_at": "2026-01-16T10:00:00Z"
+  /// }
+  Future<Either<AppUpdateFailure, RemoteVersionEntity>> _getVersionFromCustomServer(
+    bool includePreReleases,
+  ) async {
+    try {
+      final url = includePreReleases ? "${Constants.customUpdateServerUrl}?include_prerelease=true" : Constants.customUpdateServerUrl;
+
+      final response = await httpClient.get<Map<String, dynamic>>(url);
+
+      if (response.statusCode != 200 || response.data == null) {
+        loggy.warning("failed to fetch version from custom server");
+        return left(const AppUpdateFailure.unexpected());
+      }
+
+      final data = response.data!;
+      final version = RemoteVersionEntity(
+        version: data['version'] as String,
+        buildNumber: data['build_number'] as String,
+        releaseTag: data['version'] as String,
+        preRelease: data['is_prerelease'] as bool? ?? false,
+        url: data['download_url'] as String,
+        publishedAt: DateTime.parse(data['published_at'] as String),
+        flavor: Environment.prod,
+      );
+
+      return right(version);
+    } catch (e, stackTrace) {
+      loggy.warning("error fetching from custom server", e, stackTrace);
+      return left(const AppUpdateFailure.unexpected());
+    }
+  }
+
+  /// Получение версии из GitHub Releases (публичный репозиторий)
+  Future<Either<AppUpdateFailure, RemoteVersionEntity>> _getVersionFromGitHub(
+    bool includePreReleases,
+  ) async {
+    try {
+      final response = await httpClient.get<List>(Constants.githubReleasesApiUrl);
+
+      if (response.statusCode != 200 || response.data == null) {
+        loggy.warning("failed to fetch latest version info from GitHub");
+        return left(const AppUpdateFailure.unexpected());
+      }
+
+      final releases = response.data!.map(
+        (e) => GithubReleaseParser.parse(e as Map<String, dynamic>),
+      );
+
+      late RemoteVersionEntity latest;
+      if (includePreReleases) {
+        latest = releases.first;
+      } else {
+        latest = releases.firstWhere((e) => e.preRelease == false);
+      }
+
+      return right(latest);
+    } catch (e, stackTrace) {
+      loggy.warning("error fetching from GitHub", e, stackTrace);
+      return left(const AppUpdateFailure.unexpected());
+    }
+  }
 }
--- a/lib/features/app_update/data/github_release_parser.dart
+++ b/lib/features/app_update/data/github_release_parser.dart
@@ -1,6 +1,6 @@
 import 'package:dartx/dartx.dart';
-import 'package:hiddify/core/model/environment.dart';
-import 'package:hiddify/features/app_update/model/remote_version_entity.dart';
+import 'package:umbrix/core/model/environment.dart';
+import 'package:umbrix/features/app_update/model/remote_version_entity.dart';

 abstract class GithubReleaseParser {
  static RemoteVersionEntity parse(Map<String, dynamic> json) {
--- a/lib/features/app_update/model/app_update_failure.dart
+++ b/lib/features/app_update/model/app_update_failure.dart
@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hiddify/core/localization/translations.dart';
-import 'package:hiddify/core/model/failures.dart';
+import 'package:umbrix/core/localization/translations.dart';
+import 'package:umbrix/core/model/failures.dart';

 part 'app_update_failure.freezed.dart';

--- a/lib/features/app_update/model/remote_version_entity.dart
+++ b/lib/features/app_update/model/remote_version_entity.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hiddify/core/model/environment.dart';
+import 'package:umbrix/core/model/environment.dart';

 part 'remote_version_entity.freezed.dart';

--- a/lib/features/app_update/notifier/app_update_notifier.dart
+++ b/lib/features/app_update/notifier/app_update_notifier.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/foundation.dart';
-import 'package:hiddify/core/app_info/app_info_provider.dart';
-import 'package:hiddify/core/localization/locale_preferences.dart';
-import 'package:hiddify/core/preferences/preferences_provider.dart';
-import 'package:hiddify/core/utils/preferences_utils.dart';
-import 'package:hiddify/features/app_update/data/app_update_data_providers.dart';
-import 'package:hiddify/features/app_update/model/app_update_failure.dart';
-import 'package:hiddify/features/app_update/model/remote_version_entity.dart';
-import 'package:hiddify/features/app_update/notifier/app_update_state.dart';
-import 'package:hiddify/utils/utils.dart';
+import 'package:umbrix/core/app_info/app_info_provider.dart';
+import 'package:umbrix/core/localization/locale_preferences.dart';
+import 'package:umbrix/core/preferences/preferences_provider.dart';
+import 'package:umbrix/core/utils/preferences_utils.dart';
+import 'package:umbrix/features/app_update/data/app_update_data_providers.dart';
+import 'package:umbrix/features/app_update/model/app_update_failure.dart';
+import 'package:umbrix/features/app_update/model/remote_version_entity.dart';
+import 'package:umbrix/features/app_update/notifier/app_update_state.dart';
+import 'package:umbrix/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:upgrader/upgrader.dart';
 import 'package:version/version.dart';
--- a/lib/features/app_update/notifier/app_update_state.dart
+++ b/lib/features/app_update/notifier/app_update_state.dart
@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hiddify/features/app_update/model/app_update_failure.dart';
-import 'package:hiddify/features/app_update/model/remote_version_entity.dart';
+import 'package:umbrix/features/app_update/model/app_update_failure.dart';
+import 'package:umbrix/features/app_update/model/remote_version_entity.dart';

 part 'app_update_state.freezed.dart';

--- a/lib/features/app_update/widget/new_version_dialog.dart
+++ b/lib/features/app_update/widget/new_version_dialog.dart
@@ -1,11 +1,16 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
-import 'package:hiddify/core/localization/translations.dart';
-import 'package:hiddify/features/app_update/model/remote_version_entity.dart';
-import 'package:hiddify/features/app_update/notifier/app_update_notifier.dart';
-import 'package:hiddify/utils/utils.dart';
+import 'package:umbrix/core/localization/translations.dart';
+import 'package:umbrix/features/app_update/model/remote_version_entity.dart';
+import 'package:umbrix/features/app_update/notifier/app_update_notifier.dart';
+import 'package:umbrix/utils/utils.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:dio/dio.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:open_file/open_file.dart';

 class NewVersionDialog extends HookConsumerWidget with PresLogger {
  NewVersionDialog(
@@ -35,6 +40,54 @@ class NewVersionDialog extends HookConsumerWidget with PresLogger {
  Widget build(BuildContext context, WidgetRef ref) {
    final t = ref.watch(translationsProvider);
    final theme = Theme.of(context);
+    final isDownloading = useState(false);
+    final downloadProgress = useState(0.0);
+
+    Future<void> downloadAndInstallUpdate() async {
+      // Для Android - просто открываем браузер (в production - ссылка на Google Play)
+      if (Platform.isAndroid) {
+        await UriUtils.tryLaunch(Uri.parse(newVersion.url));
+        if (context.mounted) context.pop();
+        return;
+      }
+
+      // Для Desktop (Windows/macOS/Linux) - скачиваем с прогресс-баром
+      try {
+        isDownloading.value = true;
+        downloadProgress.value = 0.0;
+
+        final tempDir = await getTemporaryDirectory();
+        String fileExt = '';
+        if (Platform.isWindows)
+          fileExt = '.exe';
+        else if (Platform.isMacOS)
+          fileExt = '.dmg';
+        else if (Platform.isLinux) fileExt = '.AppImage';
+
+        final savePath = '${tempDir.path}/umbrix-${newVersion.version}$fileExt';
+        final file = File(savePath);
+        if (await file.exists()) await file.delete();
+
+        final dio = Dio();
+        await dio.download(newVersion.url, savePath, onReceiveProgress: (received, total) {
+          if (total != -1) downloadProgress.value = received / total;
+        });
+
+        loggy.info('Update downloaded to: $savePath');
+        final result = await OpenFile.open(savePath);
+
+        if (result.type != ResultType.done && context.mounted) {
+          CustomToast.error('Не удалось открыть: ${result.message}').show(context);
+        } else if (context.mounted) {
+          context.pop();
+        }
+      } catch (e, st) {
+        loggy.error('Download failed', e, st);
+        if (context.mounted) CustomToast.error('Ошибка: $e').show(context);
+      } finally {
+        isDownloading.value = false;
+      }
+    }

    return AlertDialog(
      title: Text(t.appUpdate.dialogTitle),
@@ -44,56 +97,35 @@ class NewVersionDialog extends HookConsumerWidget with PresLogger {
        children: [
          Text(t.appUpdate.updateMsg),
          const Gap(8),
-          Text.rich(
-            TextSpan(
-              children: [
-                TextSpan(
-                  text: "${t.appUpdate.currentVersionLbl}: ",
-                  style: theme.textTheme.bodySmall,
-                ),
-                TextSpan(
-                  text: currentVersion,
-                  style: theme.textTheme.labelMedium,
-                ),
-              ],
-            ),
-          ),
-          Text.rich(
-            TextSpan(
-              children: [
-                TextSpan(
-                  text: "${t.appUpdate.newVersionLbl}: ",
-                  style: theme.textTheme.bodySmall,
-                ),
-                TextSpan(
-                  text: newVersion.presentVersion,
-                  style: theme.textTheme.labelMedium,
-                ),
-              ],
-            ),
-          ),
+          Text.rich(TextSpan(children: [
+            TextSpan(text: "${t.appUpdate.currentVersionLbl}: ", style: theme.textTheme.bodySmall),
+            TextSpan(text: currentVersion, style: theme.textTheme.labelMedium),
+          ])),
+          Text.rich(TextSpan(children: [
+            TextSpan(text: "${t.appUpdate.newVersionLbl}: ", style: theme.textTheme.bodySmall),
+            TextSpan(text: newVersion.presentVersion, style: theme.textTheme.labelMedium),
+          ])),
+          if (isDownloading.value) ...[
+            const Gap(16),
+            LinearProgressIndicator(value: downloadProgress.value),
+            const Gap(8),
+            Text('Скачивание: ${(downloadProgress.value * 100).toStringAsFixed(0)}%', style: theme.textTheme.bodySmall),
+          ],
        ],
      ),
      actions: [
-        if (canIgnore)
+        if (canIgnore && !isDownloading.value)
          TextButton(
            onPressed: () async {
-              await ref
-                  .read(appUpdateNotifierProvider.notifier)
-                  .ignoreRelease(newVersion);
+              await ref.read(appUpdateNotifierProvider.notifier).ignoreRelease(newVersion);
              if (context.mounted) context.pop();
            },
            child: Text(t.appUpdate.ignoreBtnTxt),
          ),
+        if (!isDownloading.value) TextButton(onPressed: context.pop, child: Text(t.appUpdate.laterBtnTxt)),
        TextButton(
-          onPressed: context.pop,
-          child: Text(t.appUpdate.laterBtnTxt),
-        ),
-        TextButton(
-          onPressed: () async {
-            await UriUtils.tryLaunch(Uri.parse(newVersion.url));
-          },
-          child: Text(t.appUpdate.updateNowBtnTxt),
+          onPressed: isDownloading.value ? null : downloadAndInstallUpdate,
+          child: Text(isDownloading.value ? 'Скачивание...' : t.appUpdate.updateNowBtnTxt),
        ),
      ],
    );