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
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user