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

new: show groups always on top

Browse Source
This commit is contained in:
Hiddify
2024-01-31 11:03:36 +01:00
parent 7639296ca4
commit 3c1c355ae4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import 'package:hiddify/features/connection/notifier/connection_notifier.dart';
import 'package:hiddify/features/proxy/data/proxy_data_providers.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_entity.dart';
import 'package:hiddify/features/proxy/model/proxy_failure.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/pref_notifier.dart';
import 'package:hiddify/utils/riverpod_utils.dart'; import 'package:hiddify/utils/riverpod_utils.dart';
import 'package:hiddify/utils/utils.dart'; import 'package:hiddify/utils/utils.dart';
@@ -33,7 +34,7 @@ class ProxiesSortNotifier extends _$ProxiesSortNotifier with AppLogger {
late final _pref = Pref( late final _pref = Pref(
ref.watch(sharedPreferencesProvider).requireValue, ref.watch(sharedPreferencesProvider).requireValue,
"proxies_sort_mode", "proxies_sort_mode",
ProxiesSort.unsorted, ProxiesSort.delay,
mapFrom: ProxiesSort.values.byName, mapFrom: ProxiesSort.values.byName,
mapTo: (value) => value.name, mapTo: (value) => value.name,
); );
@@ -92,14 +93,20 @@ class ProxiesOverviewNotifier extends _$ProxiesOverviewNotifier with AppLogger {
final sortedProxies = <ProxyGroupEntity>[]; final sortedProxies = <ProxyGroupEntity>[];
for (final group in proxies) { for (final group in proxies) {
final sortedItems = switch (sortBy) { final sortedItems = switch (sortBy) {
ProxiesSort.name => group.items.sortedBy((e) => e.tag), 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;
return a.tag.compareTo(b.tag);
}),
ProxiesSort.delay => group.items.sortedWith((a, b) { 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;
final ai = a.urlTestDelay; final ai = a.urlTestDelay;
final bi = b.urlTestDelay; final bi = b.urlTestDelay;
if (ai == 0 && bi == 0) return -1; if (ai == 0 && bi == 0) return -1;
if (ai == 0 && bi > 0) return 1; if (ai == 0 && bi > 0) return 1;
if (ai > 0 && bi == 0) return -1; if (ai > 0 && bi == 0) return -1;
if (ai == bi && a.type.isGroup) return -1;
return ai.compareTo(bi); return ai.compareTo(bi);
}), }),
ProxiesSort.unsorted => group.items, ProxiesSort.unsorted => group.items,