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

Change mapping and bug fixes

Browse Source
This commit is contained in:
problematicconsumer
2024-02-15 19:39:35 +03:30
parent bd4c5eed7e
commit 702c59c3bc
21 changed files with 501 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/features/proxy/active/active_proxy_footer.dart
View File

@@ -1,7 +1,6 @@
import 'package:dartx/dartx.dart';
import 'package:fluentui_system_icons/fluentui_system_icons.dart';
import 'package:flutter/material.dart';
import 'package:flutter/semantics.dart';
import 'package:gap/gap.dart';
import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/widget/animated_visibility.dart';

13
lib/features/proxy/overview/proxies_overview_notifier.dart
View File

@@ -8,7 +8,6 @@ import 'package:hiddify/features/connection/notifier/connection_notifier.dart';
import 'package:hiddify/features/proxy/data/proxy_data_providers.dart';
import 'package:hiddify/features/proxy/model/proxy_entity.dart';
import 'package:hiddify/features/proxy/model/proxy_failure.dart';
import 'package:hiddify/singbox/model/singbox_proxy_type.dart';
import 'package:hiddify/utils/pref_notifier.dart';
import 'package:hiddify/utils/riverpod_utils.dart';
import 'package:hiddify/utils/utils.dart';
@@ -94,14 +93,14 @@ class ProxiesOverviewNotifier extends _$ProxiesOverviewNotifier with AppLogger {
for (final group in proxies) {
final sortedItems = switch (sortBy) {
ProxiesSort.name => group.items.sortedWith((a, b) {
if(a.type.isGroup && !b.type.isGroup) return -1;
if(!a.type.isGroup && b.type.isGroup) return 1;
if (a.type.isGroup && !b.type.isGroup) return -1;
if (!a.type.isGroup && b.type.isGroup) return 1;
return a.tag.compareTo(b.tag);
}),
}),
ProxiesSort.delay => group.items.sortedWith((a, b) {
if(a.type.isGroup && !b.type.isGroup) return -1;
if(!a.type.isGroup && b.type.isGroup) return 1;
if (a.type.isGroup && !b.type.isGroup) return -1;
if (!a.type.isGroup && b.type.isGroup) return 1;
final ai = a.urlTestDelay;
final bi = b.urlTestDelay;
if (ai == 0 && bi == 0) return -1;