hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ab tag selection state and opt ab style

Browse Source
This commit is contained in:
csf 2022-10-08 10:55:54 +09:00
parent ff9c3bccb5
commit 9449e50ba4
2 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flutter/lib/common/widgets/address_book.dart
View File

@ -113,8 +113,9 @@ class _AddressBookState extends State<AddressBook> {
builder: (context, model, child) => Row( builder: (context, model, child) => Row(
children: [ children: [
Card( Card(
margin: EdgeInsets.symmetric(horizontal: 4.0),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(12),
side: BorderSide( side: BorderSide(
color: Theme.of(context).scaffoldBackgroundColor)), color: Theme.of(context).scaffoldBackgroundColor)),
child: Container( child: Container(
@ -127,6 +128,7 @@ class _AddressBookState extends State<AddressBook> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
// TODO same style as peer
Text(translate('Tags')), Text(translate('Tags')),
InkWell( InkWell(
child: PopupMenuButton( child: PopupMenuButton(
@ -155,7 +157,8 @@ class _AddressBookState extends State<AddressBook> {
width: double.infinity, width: double.infinity,
height: double.infinity, height: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: MyTheme.darkGray)), border: Border.all(color: MyTheme.darkGray),
borderRadius: BorderRadius.circular(2)),
child: Obx( child: Obx(
() => Wrap( () => Wrap(
children: gFFI.abModel.tags children: gFFI.abModel.tags
@ -210,7 +213,7 @@ class _AddressBookState extends State<AddressBook> {
decoration: BoxDecoration( decoration: BoxDecoration(
color: rxTags.contains(tagName) ? Colors.blue : null, color: rxTags.contains(tagName) ? Colors.blue : null,
border: Border.all(color: MyTheme.darkGray), border: Border.all(color: MyTheme.darkGray),
borderRadius: BorderRadius.circular(10)), borderRadius: BorderRadius.circular(6)),
margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0), margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0), padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
child: Text( child: Text(

39
flutter/lib/common/widgets/peers_view.dart
View File

@ -3,7 +3,6 @@ import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:visibility_detector/visibility_detector.dart'; import 'package:visibility_detector/visibility_detector.dart';
@ -14,8 +13,7 @@ import '../../models/peer_model.dart';
import '../../models/platform_model.dart'; import '../../models/platform_model.dart';
import 'peer_card.dart'; import 'peer_card.dart';
typedef OffstageFunc = bool Function(Peer peer); typedef PeerCardBuilder = Widget Function(Peer peer);
typedef PeerCardBuilder = BasePeerCard Function(Peer peer);
/// for peer search text, global obs value /// for peer search text, global obs value
final peerSearchText = "".obs; final peerSearchText = "".obs;
@ -24,16 +22,10 @@ final peerSearchTextController =
class _PeersView extends StatefulWidget { class _PeersView extends StatefulWidget {
final Peers peers; final Peers peers;
final OffstageFunc offstageFunc;
final PeerCardBuilder peerCardBuilder; final PeerCardBuilder peerCardBuilder;
final ScrollController? scrollController;
const _PeersView( const _PeersView(
{required this.peers, {required this.peers, required this.peerCardBuilder, Key? key})
required this.offstageFunc,
required this.peerCardBuilder,
Key? key,
this.scrollController})
: super(key: key); : super(key: key);
@override @override
@ -124,20 +116,16 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
}, },
child: widget.peerCardBuilder(peer), child: widget.peerCardBuilder(peer),
); );
cards.add(Offstage( cards.add(isDesktop
key: ValueKey("off${peer.id}"),
offstage: widget.offstageFunc(peer),
child: isDesktop
? Obx( ? Obx(
() => SizedBox( () => SizedBox(
width: 220, width: 220,
height: peerCardUiType.value == PeerUiType.grid height:
? 140 peerCardUiType.value == PeerUiType.grid ? 140 : 42,
: 42,
child: visibilityChild, child: visibilityChild,
), ),
) )
: SizedBox(width: mobileWidth, child: visibilityChild))); : SizedBox(width: mobileWidth, child: visibilityChild));
} }
return Wrap(spacing: space, runSpacing: space, children: cards); return Wrap(spacing: space, runSpacing: space, children: cards);
} else { } else {
@ -190,7 +178,6 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
abstract class BasePeersView extends StatelessWidget { abstract class BasePeersView extends StatelessWidget {
final String name; final String name;
final String loadEvent; final String loadEvent;
final OffstageFunc offstageFunc;
final PeerCardBuilder peerCardBuilder; final PeerCardBuilder peerCardBuilder;
final List<Peer> initPeers; final List<Peer> initPeers;
@ -198,7 +185,6 @@ abstract class BasePeersView extends StatelessWidget {
Key? key, Key? key,
required this.name, required this.name,
required this.loadEvent, required this.loadEvent,
required this.offstageFunc,
required this.peerCardBuilder, required this.peerCardBuilder,
required this.initPeers, required this.initPeers,
}) : super(key: key); }) : super(key: key);
@ -207,7 +193,6 @@ abstract class BasePeersView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return _PeersView( return _PeersView(
peers: Peers(name: name, loadEvent: loadEvent, peers: initPeers), peers: Peers(name: name, loadEvent: loadEvent, peers: initPeers),
offstageFunc: offstageFunc,
peerCardBuilder: peerCardBuilder); peerCardBuilder: peerCardBuilder);
} }
} }
@ -219,7 +204,6 @@ class RecentPeersView extends BasePeersView {
key: key, key: key,
name: 'recent peer', name: 'recent peer',
loadEvent: 'load_recent_peers', loadEvent: 'load_recent_peers',
offstageFunc: (Peer peer) => false,
peerCardBuilder: (Peer peer) => RecentPeerCard( peerCardBuilder: (Peer peer) => RecentPeerCard(
peer: peer, peer: peer,
menuPadding: menuPadding, menuPadding: menuPadding,
@ -242,7 +226,6 @@ class FavoritePeersView extends BasePeersView {
key: key, key: key,
name: 'favorite peer', name: 'favorite peer',
loadEvent: 'load_fav_peers', loadEvent: 'load_fav_peers',
offstageFunc: (Peer peer) => false,
peerCardBuilder: (Peer peer) => FavoritePeerCard( peerCardBuilder: (Peer peer) => FavoritePeerCard(
peer: peer, peer: peer,
menuPadding: menuPadding, menuPadding: menuPadding,
@ -265,7 +248,6 @@ class DiscoveredPeersView extends BasePeersView {
key: key, key: key,
name: 'discovered peer', name: 'discovered peer',
loadEvent: 'load_lan_peers', loadEvent: 'load_lan_peers',
offstageFunc: (Peer peer) => false,
peerCardBuilder: (Peer peer) => DiscoveredPeerCard( peerCardBuilder: (Peer peer) => DiscoveredPeerCard(
peer: peer, peer: peer,
menuPadding: menuPadding, menuPadding: menuPadding,
@ -288,12 +270,13 @@ class AddressBookPeersView extends BasePeersView {
key: key, key: key,
name: 'address book peer', name: 'address book peer',
loadEvent: 'load_address_book_peers', loadEvent: 'load_address_book_peers',
offstageFunc: (Peer peer) => peerCardBuilder: (Peer peer) => Obx(() => Offstage(
!_hitTag(gFFI.abModel.selectedTags, peer.tags), key: ValueKey("off${peer.id}"),
peerCardBuilder: (Peer peer) => AddressBookPeerCard( offstage: !_hitTag(gFFI.abModel.selectedTags, peer.tags),
child: AddressBookPeerCard(
peer: peer, peer: peer,
menuPadding: menuPadding, menuPadding: menuPadding,
), ))),
initPeers: _loadPeers(), initPeers: _loadPeers(),
); );