From 3fc7d3aff42ed6d1550d995801bdf66d7ed8c4d0 Mon Sep 17 00:00:00 2001 From: problematicconsumer Date: Thu, 12 Oct 2023 00:27:23 +0330 Subject: [PATCH] Fix bugs --- lib/data/repository/app_repository_impl.dart | 1 - lib/data/repository/core_facade_impl.dart | 2 +- lib/domain/app/app_info.dart | 5 ++--- lib/domain/connectivity/connection_status.dart | 9 +++++++++ .../common/connectivity/connectivity_controller.dart | 5 ++++- lib/features/common/profile_tile.dart | 8 ++++++-- libcore | 2 +- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lib/data/repository/app_repository_impl.dart b/lib/data/repository/app_repository_impl.dart index b4525c16..f353da0e 100644 --- a/lib/data/repository/app_repository_impl.dart +++ b/lib/data/repository/app_repository_impl.dart @@ -23,7 +23,6 @@ class AppRepositoryImpl version: packageInfo.version, buildNumber: packageInfo.buildNumber, release: Release.read(), - installerMedia: packageInfo.installerStore, operatingSystem: Platform.operatingSystem, operatingSystemVersion: Platform.operatingSystemVersion, environment: environment, diff --git a/lib/data/repository/core_facade_impl.dart b/lib/data/repository/core_facade_impl.dart index 5c83f87d..b344809f 100644 --- a/lib/data/repository/core_facade_impl.dart +++ b/lib/data/repository/core_facade_impl.dart @@ -79,7 +79,7 @@ class CoreFacadeImpl with ExceptionHandler, InfraLogger implements CoreFacade { ) { return exceptionHandler( () { - loggy.debug("changing config options: $options"); + loggy.info("changing config options: ${options.format()}"); return singbox .changeConfigOptions(options) .mapLeft(CoreServiceFailure.invalidConfigOptions) diff --git a/lib/domain/app/app_info.dart b/lib/domain/app/app_info.dart index 0d42343e..1e02660a 100644 --- a/lib/domain/app/app_info.dart +++ b/lib/domain/app/app_info.dart @@ -14,7 +14,6 @@ class AppInfo with _$AppInfo { required String version, required String buildNumber, required Release release, - String? installerMedia, required String operatingSystem, required String operatingSystemVersion, required Environment environment, @@ -28,8 +27,8 @@ class AppInfo with _$AppInfo { /// formats app info for sharing String format() => ''' -$name v$version ($buildNumber) ${environment.name} -${release.name} release ${installerMedia != null ? "via $installerMedia" : ""} +$name v$version ($buildNumber) [${environment.name}] +${release.name} release $operatingSystem [$operatingSystemVersion]'''; factory AppInfo.fromJson(Map json) => diff --git a/lib/domain/connectivity/connection_status.dart b/lib/domain/connectivity/connection_status.dart index 047883b1..df84b363 100644 --- a/lib/domain/connectivity/connection_status.dart +++ b/lib/domain/connectivity/connection_status.dart @@ -23,6 +23,15 @@ sealed class ConnectionStatus with _$ConnectionStatus { _ => false, }; + String format() => switch (this) { + Disconnected(:final connectionFailure) => connectionFailure != null + ? "CONNECTION FAILURE: $connectionFailure" + : "DISCONNECTED", + Connecting() => "CONNECTING", + Connected() => "CONNECTED", + Disconnecting() => "DISCONNECTING", + }; + String present(TranslationsEn t) => switch (this) { Disconnected() => t.home.connection.tapToConnect, Connecting() => t.home.connection.connecting, diff --git a/lib/features/common/connectivity/connectivity_controller.dart b/lib/features/common/connectivity/connectivity_controller.dart index 63e287a7..5f35f98e 100644 --- a/lib/features/common/connectivity/connectivity_controller.dart +++ b/lib/features/common/connectivity/connectivity_controller.dart @@ -4,6 +4,7 @@ import 'package:hiddify/domain/core_facade.dart'; import 'package:hiddify/features/common/active_profile/active_profile_notifier.dart'; import 'package:hiddify/utils/utils.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; +import 'package:rxdart/rxdart.dart'; part 'connectivity_controller.g.dart'; @@ -21,7 +22,9 @@ class ConnectivityController extends _$ConnectivityController with AppLogger { } }, ); - return _core.watchConnectionStatus(); + return _core.watchConnectionStatus().doOnData((event) { + loggy.info("connection status: ${event.format()}"); + }); } CoreFacade get _core => ref.watch(coreFacadeProvider); diff --git a/lib/features/common/profile_tile.dart b/lib/features/common/profile_tile.dart index ce77cb41..099f1675 100644 --- a/lib/features/common/profile_tile.dart +++ b/lib/features/common/profile_tile.dart @@ -120,11 +120,13 @@ class ProfileTile extends HookConsumerWidget { Flexible( child: Text( profile.name, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: theme.textTheme.titleMedium, semanticsLabel: t.profile .activeProfileNameSemanticLabel( name: profile.name, ), - style: theme.textTheme.titleMedium, ), ), const Icon(Icons.arrow_drop_down), @@ -135,6 +137,9 @@ class ProfileTile extends HookConsumerWidget { else Text( profile.name, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: theme.textTheme.titleMedium, semanticsLabel: profile.active ? t.profile.activeProfileNameSemanticLabel( name: profile.name, @@ -142,7 +147,6 @@ class ProfileTile extends HookConsumerWidget { : t.profile.nonActiveProfileBtnSemanticLabel( name: profile.name, ), - style: theme.textTheme.titleMedium, ), if (subInfo != null) ...[ const Gap(4), diff --git a/libcore b/libcore index dced5a30..b36fab34 160000 --- a/libcore +++ b/libcore @@ -1 +1 @@ -Subproject commit dced5a30d0cf32c5ced6f002f63008f6fe450101 +Subproject commit b36fab34eceb91f2fc207ff1852c238f88ac1b1b