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

fix: some bugs

Browse Source
This commit is contained in:
hiddify-com
2024-08-05 02:07:07 +02:00
parent 12290dc4e3
commit 39ae86a538
4 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/profile/add/add_profile_modal.dart
View File

@@ -39,7 +39,7 @@ class AddProfileModal extends HookConsumerWidget {
if (next case AsyncData(value: final _?)) {
WidgetsBinding.instance.addPostFrameCallback(
(_) {
if (context.mounted) context.pop();
if (context.mounted && context.canPop()) context.pop();
},
);
}

51
lib/features/profile/widget/profile_tile.dart
View File

@@ -41,7 +41,7 @@ class ProfileTile extends HookConsumerWidget {
CustomToast.error(t.presentShortError(err)).show(context);
},
initialOnSuccess: () {
if (context.mounted) context.pop();
if (context.mounted && context.canPop()) context.pop();
},
);
@@ -50,12 +50,9 @@ class ProfileTile extends HookConsumerWidget {
_ => null,
};
final effectiveMargin = isMain
? const EdgeInsets.symmetric(horizontal: 16, vertical: 8)
: const EdgeInsets.only(left: 12, right: 12, bottom: 12);
final effectiveMargin = isMain ? const EdgeInsets.symmetric(horizontal: 16, vertical: 8) : const EdgeInsets.only(left: 12, right: 12, bottom: 12);
final double effectiveElevation = profile.active ? 12 : 4;
final effectiveOutlineColor =
profile.active ? theme.colorScheme.outlineVariant : Colors.transparent;
final effectiveOutlineColor = profile.active ? theme.colorScheme.outlineVariant : Colors.transparent;
return Card(
margin: effectiveMargin,
@@ -98,9 +95,7 @@ class ProfileTile extends HookConsumerWidget {
if (selectActiveMutation.state.isInProgress) return;
if (profile.active) return;
selectActiveMutation.setFuture(
ref
.read(profilesOverviewNotifierProvider.notifier)
.selectActiveProfile(profile.id),
ref.read(profilesOverviewNotifierProvider.notifier).selectActiveProfile(profile.id),
);
}
},
@@ -120,20 +115,17 @@ class ProfileTile extends HookConsumerWidget {
color: Colors.transparent,
clipBehavior: Clip.antiAlias,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Text(
profile.name,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style:
theme.textTheme.titleMedium?.copyWith(
style: theme.textTheme.titleMedium?.copyWith(
fontFamily: FontFamily.emoji,
),
semanticsLabel: t.profile
.activeProfileNameSemanticLabel(
semanticsLabel: t.profile.activeProfileNameSemanticLabel(
name: profile.name,
),
),
@@ -201,9 +193,7 @@ class ProfileActionButton extends HookConsumerWidget {
if (ref.read(updateProfileProvider(profile.id)).isLoading) {
return;
}
ref
.read(updateProfileProvider(profile.id).notifier)
.updateProfile(profile as RemoteProfileEntity);
ref.read(updateProfileProvider(profile.id).notifier).updateProfile(profile as RemoteProfileEntity);
},
child: const Icon(FluentIcons.arrow_sync_24_filled),
),
@@ -243,9 +233,7 @@ class ProfileActionsMenu extends HookConsumerWidget {
initialOnFailure: (err) {
CustomToast.error(t.presentShortError(err)).show(context);
},
initialOnSuccess: () =>
CustomToast.success(t.profile.share.exportConfigToClipboardSuccess)
.show(context),
initialOnSuccess: () => CustomToast.success(t.profile.share.exportConfigToClipboardSuccess).show(context),
);
final deleteProfileMutation = useMutation(
initialOnFailure: (err) {
@@ -262,9 +250,7 @@ class ProfileActionsMenu extends HookConsumerWidget {
if (ref.read(updateProfileProvider(profile.id)).isLoading) {
return;
}
ref
.read(updateProfileProvider(profile.id).notifier)
.updateProfile(profile as RemoteProfileEntity);
ref.read(updateProfileProvider(profile.id).notifier).updateProfile(profile as RemoteProfileEntity);
},
),
AdaptiveMenuItem(
@@ -279,8 +265,7 @@ class ProfileActionsMenu extends HookConsumerWidget {
if (link.isNotEmpty) {
await Clipboard.setData(ClipboardData(text: link));
if (context.mounted) {
CustomToast(t.profile.share.exportToClipboardSuccess)
.show(context);
CustomToast(t.profile.share.exportToClipboardSuccess).show(context);
}
}
},
@@ -305,9 +290,7 @@ class ProfileActionsMenu extends HookConsumerWidget {
return;
}
exportConfigMutation.setFuture(
ref
.read(profilesOverviewNotifierProvider.notifier)
.exportConfigToClipboard(profile),
ref.read(profilesOverviewNotifierProvider.notifier).exportConfigToClipboard(profile),
);
},
),
@@ -335,9 +318,7 @@ class ProfileActionsMenu extends HookConsumerWidget {
);
if (deleteConfirmed) {
deleteProfileMutation.setFuture(
ref
.read(profilesOverviewNotifierProvider.notifier)
.deleteProfile(profile),
ref.read(profilesOverviewNotifierProvider.notifier).deleteProfile(profile),
);
}
},
@@ -367,8 +348,7 @@ class ProfileSubscriptionInfo extends HookConsumerWidget {
return (t.profile.subscription.remainingDuration(duration: "∞"), null);
} else {
return (
t.profile.subscription
.remainingDuration(duration: subInfo.remaining.inDays),
t.profile.subscription.remainingDuration(duration: subInfo.remaining.inDays),
null,
);
}
@@ -390,8 +370,7 @@ class ProfileSubscriptionInfo extends HookConsumerWidget {
subInfo.total > 10 * 1099511627776 //10TB
? "∞ GiB"
: subInfo.consumption.sizeOf(subInfo.total),
semanticsLabel:
t.profile.subscription.remainingTrafficSemanticLabel(
semanticsLabel: t.profile.subscription.remainingTrafficSemanticLabel(
consumed: subInfo.consumption.sizeGB(),
total: subInfo.total.sizeGB(),
),

4
lib/features/proxy/active/active_proxy_notifier.dart
View File

@@ -48,8 +48,8 @@ class IpInfoNotifier extends _$IpInfoNotifier with AppLogger {
final info = await ref.watch(proxyRepositoryProvider).getCurrentIpInfo(cancelToken).getOrElse(
(err) {
loggy.warning("error getting proxy ip info", err, StackTrace.current);
throw err; //hiddify: remove exception to be logged
//throw const UnknownIp();
// throw err; //hiddify: remove exception to be logged
throw const UnknownIp();
},
).run();