vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

connection button by proxy status indicator, change connected to connecting when timeout

Browse Source
This commit is contained in:
hiddify-com
2024-08-04 16:46:51 +02:00
parent 7a697acf7d
commit 92bf0fa6cf
4 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/features/home/widget/connection_button.dart
View File

@@ -11,6 +11,7 @@ import 'package:hiddify/features/connection/model/connection_status.dart';
import 'package:hiddify/features/connection/notifier/connection_notifier.dart';
import 'package:hiddify/features/connection/widget/experimental_feature_notice.dart';
import 'package:hiddify/features/profile/notifier/active_profile_notifier.dart';
import 'package:hiddify/features/proxy/active/active_proxy_notifier.dart';
import 'package:hiddify/gen/assets.gen.dart';
import 'package:hiddify/utils/alerts.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -23,8 +24,10 @@ class ConnectionButton extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
final connectionStatus = ref.watch(connectionNotifierProvider);
final requiresReconnect =
ref.watch(configOptionNotifierProvider).valueOrNull;
final activeProxy = ref.watch(activeProxyNotifierProvider);
final delay = activeProxy.valueOrNull?.urlTestDelay ?? 0;
final requiresReconnect = ref.watch(configOptionNotifierProvider).valueOrNull;
final today = DateTime.now();
ref.listen(
@@ -33,10 +36,8 @@ class ConnectionButton extends HookConsumerWidget {
if (next case AsyncError(:final error)) {
CustomAlertDialog.fromErr(t.presentError(error)).show(context);
}
if (next
case AsyncData(value: Disconnected(:final connectionFailure?))) {
CustomAlertDialog.fromErr(t.presentError(connectionFailure))
.show(context);
if (next case AsyncData(value: Disconnected(:final connectionFailure?))) {
CustomAlertDialog.fromErr(t.presentError(connectionFailure)).show(context);
}
},
);
@@ -47,8 +48,7 @@ class ConnectionButton extends HookConsumerWidget {
final hasExperimental = ref.read(ConfigOptions.hasExperimentalFeatures);
final canShowNotice = !ref.read(disableExperimentalFeatureNoticeProvider);
if (hasExperimental && canShowNotice && context.mounted) {
return await const ExperimentalFeatureNoticeDialog().show(context) ??
false;
return await const ExperimentalFeatureNoticeDialog().show(context) ?? false;
}
return true;
}
@@ -57,52 +57,40 @@ class ConnectionButton extends HookConsumerWidget {
onTap: switch (connectionStatus) {
AsyncData(value: Disconnected()) || AsyncError() => () async {
if (await showExperimentalNotice()) {
return await ref
.read(connectionNotifierProvider.notifier)
.toggleConnection();
return await ref.read(connectionNotifierProvider.notifier).toggleConnection();
}
},
AsyncData(value: Connected()) => () async {
if (requiresReconnect == true && await showExperimentalNotice()) {
return await ref
.read(connectionNotifierProvider.notifier)
.reconnect(await ref.read(activeProfileProvider.future));
return await ref.read(connectionNotifierProvider.notifier).reconnect(await ref.read(activeProfileProvider.future));
}
return await ref
.read(connectionNotifierProvider.notifier)
.toggleConnection();
return await ref.read(connectionNotifierProvider.notifier).toggleConnection();
},
_ => () {},
},
enabled: switch (connectionStatus) {
AsyncData(value: Connected()) ||
AsyncData(value: Disconnected()) ||
AsyncError() =>
true,
AsyncData(value: Connected()) || AsyncData(value: Disconnected()) || AsyncError() => true,
_ => false,
},
label: switch (connectionStatus) {
AsyncData(value: Connected()) when requiresReconnect == true =>
t.connection.reconnect,
AsyncData(value: Connected()) when requiresReconnect == true => t.connection.reconnect,
AsyncData(value: Connected()) when delay <= 0 || delay >= 65000 => t.connection.connecting,
AsyncData(value: final status) => status.present(t),
_ => "",
},
buttonColor: switch (connectionStatus) {
AsyncData(value: Connected()) when requiresReconnect == true =>
Colors.teal,
AsyncData(value: Connected()) when requiresReconnect == true => Colors.teal,
AsyncData(value: Connected()) when delay <= 0 || delay >= 65000 => Color.fromARGB(255, 185, 176, 103),
AsyncData(value: Connected()) => buttonTheme.connectedColor!,
AsyncData(value: _) => buttonTheme.idleColor!,
_ => Colors.red,
},
image: switch (connectionStatus) {
AsyncData(value: Connected()) when requiresReconnect == true =>
Assets.images.disconnectNorouz,
AsyncData(value: Connected()) when requiresReconnect == true => Assets.images.disconnectNorouz,
AsyncData(value: Connected()) => Assets.images.connectNorouz,
AsyncData(value: _) => Assets.images.disconnectNorouz,
_ => Assets.images.disconnectNorouz,
AsyncData(value: Disconnected()) ||
AsyncError() =>
Assets.images.disconnectNorouz,
AsyncData(value: Disconnected()) || AsyncError() => Assets.images.disconnectNorouz,
AsyncData(value: Connected()) => Assets.images.connectNorouz,
_ => Assets.images.disconnectNorouz,
},
@@ -177,9 +165,7 @@ class _ConnectionButton extends StatelessWidget {
),
),
).animate(target: enabled ? 0 : 1).blurXY(end: 1),
)
.animate(target: enabled ? 0 : 1)
.scaleXY(end: .88, curve: Curves.easeIn),
).animate(target: enabled ? 0 : 1).scaleXY(end: .88, curve: Curves.easeIn),
),
const Gap(16),
ExcludeSemantics(