opt: support match user/hostname/id(flutter), case insensitive
Signed-off-by: Kingtous <kingtous@qq.com>
This commit is contained in:
parent
c6bcc9a099
commit
ff5e9a8ea5
@ -8,6 +8,7 @@ import 'package:desktop_multi_window/desktop_multi_window.dart';
|
|||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
|
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
|
||||||
|
import 'package:flutter_hbb/models/peer_model.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
@ -704,3 +705,37 @@ String bool2option(String option, bool b) {
|
|||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<bool> matchPeer(String searchText, Peer peer) async {
|
||||||
|
if (searchText.isEmpty) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (peer.id.toLowerCase().contains(searchText)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (peer.hostname.toLowerCase().contains(searchText) ||
|
||||||
|
peer.username.toLowerCase().contains(searchText)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
final alias = await bind.mainGetPeerOption(id: peer.id, key: 'alias');
|
||||||
|
if (alias.isEmpty) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return alias.toLowerCase().contains(searchText);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<Peer>>? matchPeers(String searchText, List<Peer> peers) async {
|
||||||
|
if (searchText.isEmpty) {
|
||||||
|
return peers;
|
||||||
|
}
|
||||||
|
searchText = searchText.toLowerCase();
|
||||||
|
final matches =
|
||||||
|
await Future.wait(peers.map((peer) => matchPeer(searchText, peer)));
|
||||||
|
final filteredList = List<Peer>.empty(growable: true);
|
||||||
|
for (var i = 0; i < peers.length; i++) {
|
||||||
|
if (matches[i]) {
|
||||||
|
filteredList.add(peers[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return filteredList;
|
||||||
|
}
|
@ -88,26 +88,27 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
|
|||||||
)
|
)
|
||||||
: SingleChildScrollView(
|
: SingleChildScrollView(
|
||||||
child: ObxValue<RxString>((searchText) {
|
child: ObxValue<RxString>((searchText) {
|
||||||
|
return FutureBuilder<List<Peer>>(
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.hasData) {
|
||||||
|
final peers = snapshot.data!;
|
||||||
final cards = <Widget>[];
|
final cards = <Widget>[];
|
||||||
peers.peers.where((peer) {
|
for (final peer in peers) {
|
||||||
if (searchText.isEmpty) {
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return peer.id.contains(peerSearchText.value);
|
|
||||||
}
|
|
||||||
}).forEach((peer) {
|
|
||||||
cards.add(Offstage(
|
cards.add(Offstage(
|
||||||
|
key: ValueKey("off${peer.id}"),
|
||||||
offstage: super.widget._offstageFunc(peer),
|
offstage: super.widget._offstageFunc(peer),
|
||||||
child: Obx(
|
child: Obx(
|
||||||
() => Container(
|
() => SizedBox(
|
||||||
width: 220,
|
width: 220,
|
||||||
height: peerCardUiType.value == PeerUiType.grid
|
height:
|
||||||
|
peerCardUiType.value == PeerUiType.grid
|
||||||
? 140
|
? 140
|
||||||
: 42,
|
: 42,
|
||||||
child: VisibilityDetector(
|
child: VisibilityDetector(
|
||||||
key: Key('${peer.id}'),
|
key: ValueKey(peer.id),
|
||||||
onVisibilityChanged: (info) {
|
onVisibilityChanged: (info) {
|
||||||
final peerId = (info.key as ValueKey).value;
|
final peerId =
|
||||||
|
(info.key as ValueKey).value;
|
||||||
if (info.visibleFraction > 0.00001) {
|
if (info.visibleFraction > 0.00001) {
|
||||||
_curPeers.add(peerId);
|
_curPeers.add(peerId);
|
||||||
} else {
|
} else {
|
||||||
@ -115,13 +116,25 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
|
|||||||
}
|
}
|
||||||
_lastChangeTime = DateTime.now();
|
_lastChangeTime = DateTime.now();
|
||||||
},
|
},
|
||||||
child: super.widget._peerCardWidgetFunc(peer),
|
child: super
|
||||||
|
.widget
|
||||||
|
._peerCardWidgetFunc(peer),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)));
|
)));
|
||||||
});
|
}
|
||||||
return Wrap(
|
return Wrap(
|
||||||
children: cards, spacing: space, runSpacing: space);
|
spacing: space,
|
||||||
|
runSpacing: space,
|
||||||
|
children: cards);
|
||||||
|
} else {
|
||||||
|
return const Center(
|
||||||
|
child: CircularProgressIndicator(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
future: matchPeers(searchText.value, peers.peers),
|
||||||
|
);
|
||||||
}, peerSearchText),
|
}, peerSearchText),
|
||||||
)),
|
)),
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user