From 9bbc3376a42ca3112293818ec3873206c75659b0 Mon Sep 17 00:00:00 2001 From: csf Date: Thu, 22 Sep 2022 15:35:46 +0800 Subject: [PATCH] refactor: rename to peer_card.dart and peers_view.dart --- flutter/lib/common/widgets/address_book.dart | 4 +- .../{peercard_widget.dart => peer_card.dart} | 1 - flutter/lib/common/widgets/peer_tab_page.dart | 4 +- .../{peer_widget.dart => peers_view.dart} | 56 +++++++++---------- .../lib/desktop/pages/connection_page.dart | 8 +-- flutter/lib/mobile/pages/connection_page.dart | 8 +-- 6 files changed, 40 insertions(+), 41 deletions(-) rename flutter/lib/common/widgets/{peercard_widget.dart => peer_card.dart} (99%) rename flutter/lib/common/widgets/{peer_widget.dart => peers_view.dart} (86%) diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart index beecf47f2..ca5e85f56 100644 --- a/flutter/lib/common/widgets/address_book.dart +++ b/flutter/lib/common/widgets/address_book.dart @@ -1,6 +1,6 @@ import 'package:contextmenu/contextmenu.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_hbb/common/widgets/peer_widget.dart'; +import 'package:flutter_hbb/common/widgets/peers_view.dart'; import 'package:flutter_hbb/models/ab_model.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -174,7 +174,7 @@ class _AddressBookState extends State { Expanded( child: Align( alignment: Alignment.topLeft, - child: AddressBookPeerWidget()), + child: AddressBookPeersView()), ) ], )); diff --git a/flutter/lib/common/widgets/peercard_widget.dart b/flutter/lib/common/widgets/peer_card.dart similarity index 99% rename from flutter/lib/common/widgets/peercard_widget.dart rename to flutter/lib/common/widgets/peer_card.dart index 1f30c89df..bf0c93de5 100644 --- a/flutter/lib/common/widgets/peercard_widget.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -489,7 +489,6 @@ abstract class BasePeerCard extends StatelessWidget { await bind.mainRemovePeer(id: id); removePreference(id); await reloadFunc(); - // Get.forceAppUpdate(); // TODO use inner model / state }(); }, dismissOnClicked: true, diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart index fefe74671..2a1fe9909 100644 --- a/flutter/lib/common/widgets/peer_tab_page.dart +++ b/flutter/lib/common/widgets/peer_tab_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_hbb/common/widgets/peer_widget.dart'; -import 'package:flutter_hbb/common/widgets/peercard_widget.dart'; +import 'package:flutter_hbb/common/widgets/peers_view.dart'; +import 'package:flutter_hbb/common/widgets/peer_card.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:get/get.dart'; diff --git a/flutter/lib/common/widgets/peer_widget.dart b/flutter/lib/common/widgets/peers_view.dart similarity index 86% rename from flutter/lib/common/widgets/peer_widget.dart rename to flutter/lib/common/widgets/peers_view.dart index e6236ff4e..cf9c4299a 100644 --- a/flutter/lib/common/widgets/peer_widget.dart +++ b/flutter/lib/common/widgets/peers_view.dart @@ -11,34 +11,34 @@ import 'package:window_manager/window_manager.dart'; import '../../common.dart'; import '../../models/peer_model.dart'; import '../../models/platform_model.dart'; -import 'peercard_widget.dart'; +import 'peer_card.dart'; typedef OffstageFunc = bool Function(Peer peer); -typedef PeerCardWidgetFunc = Widget Function(Peer peer); +typedef PeerCardBuilder = BasePeerCard Function(Peer peer); /// for peer search text, global obs value final peerSearchText = "".obs; final peerSearchTextController = TextEditingController(text: peerSearchText.value); -class _PeerWidget extends StatefulWidget { +class _PeersView extends StatefulWidget { final Peers peers; final OffstageFunc offstageFunc; - final PeerCardWidgetFunc peerCardWidgetFunc; + final PeerCardBuilder peerCardBuilder; - const _PeerWidget( + const _PeersView( {required this.peers, required this.offstageFunc, - required this.peerCardWidgetFunc, + required this.peerCardBuilder, Key? key}) : super(key: key); @override - _PeerWidgetState createState() => _PeerWidgetState(); + _PeersViewState createState() => _PeersViewState(); } /// State for the peer widget. -class _PeerWidgetState extends State<_PeerWidget> with WindowListener { +class _PeersViewState extends State<_PeersView> with WindowListener { static const int _maxQueryCount = 3; final space = isDesktop ? 12.0 : 8.0; final _curPeers = {}; @@ -60,7 +60,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener { return width; }(); - _PeerWidgetState() { + _PeersViewState() { _startCheckOnlines(); } @@ -119,7 +119,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener { } _lastChangeTime = DateTime.now(); }, - child: widget.peerCardWidgetFunc(peer), + child: widget.peerCardBuilder(peer), ); cards.add(Offstage( key: ValueKey("off${peer.id}"), @@ -198,39 +198,39 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener { } } -abstract class BasePeerWidget extends StatelessWidget { +abstract class BasePeersView extends StatelessWidget { final String name; final String loadEvent; final OffstageFunc offstageFunc; - final PeerCardWidgetFunc peerCardWidgetFunc; + final PeerCardBuilder peerCardBuilder; final List initPeers; - const BasePeerWidget({ + const BasePeersView({ Key? key, required this.name, required this.loadEvent, required this.offstageFunc, - required this.peerCardWidgetFunc, + required this.peerCardBuilder, required this.initPeers, }) : super(key: key); @override Widget build(BuildContext context) { - return _PeerWidget( + return _PeersView( peers: Peers(name: name, loadEvent: loadEvent, peers: initPeers), offstageFunc: offstageFunc, - peerCardWidgetFunc: peerCardWidgetFunc); + peerCardBuilder: peerCardBuilder); } } -class RecentPeerWidget extends BasePeerWidget { - RecentPeerWidget({Key? key}) +class RecentPeersView extends BasePeersView { + RecentPeersView({Key? key}) : super( key: key, name: 'recent peer', loadEvent: 'load_recent_peers', offstageFunc: (Peer peer) => false, - peerCardWidgetFunc: (Peer peer) => RecentPeerCard( + peerCardBuilder: (Peer peer) => RecentPeerCard( peer: peer, ), initPeers: [], @@ -244,14 +244,14 @@ class RecentPeerWidget extends BasePeerWidget { } } -class FavoritePeerWidget extends BasePeerWidget { - FavoritePeerWidget({Key? key}) +class FavoritePeersView extends BasePeersView { + FavoritePeersView({Key? key}) : super( key: key, name: 'favorite peer', loadEvent: 'load_fav_peers', offstageFunc: (Peer peer) => false, - peerCardWidgetFunc: (Peer peer) => FavoritePeerCard( + peerCardBuilder: (Peer peer) => FavoritePeerCard( peer: peer, ), initPeers: [], @@ -265,14 +265,14 @@ class FavoritePeerWidget extends BasePeerWidget { } } -class DiscoveredPeerWidget extends BasePeerWidget { - DiscoveredPeerWidget({Key? key}) +class DiscoveredPeersView extends BasePeersView { + DiscoveredPeersView({Key? key}) : super( key: key, name: 'discovered peer', loadEvent: 'load_lan_peers', offstageFunc: (Peer peer) => false, - peerCardWidgetFunc: (Peer peer) => DiscoveredPeerCard( + peerCardBuilder: (Peer peer) => DiscoveredPeerCard( peer: peer, ), initPeers: [], @@ -286,15 +286,15 @@ class DiscoveredPeerWidget extends BasePeerWidget { } } -class AddressBookPeerWidget extends BasePeerWidget { - AddressBookPeerWidget({Key? key}) +class AddressBookPeersView extends BasePeersView { + AddressBookPeersView({Key? key}) : super( key: key, name: 'address book peer', loadEvent: 'load_address_book_peers', offstageFunc: (Peer peer) => !_hitTag(gFFI.abModel.selectedTags, peer.tags), - peerCardWidgetFunc: (Peer peer) => AddressBookPeerCard( + peerCardBuilder: (Peer peer) => AddressBookPeerCard( peer: peer, ), initPeers: _loadPeers(), diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart index ad8e430f4..6a8c58f7b 100644 --- a/flutter/lib/desktop/pages/connection_page.dart +++ b/flutter/lib/desktop/pages/connection_page.dart @@ -11,7 +11,7 @@ import 'package:url_launcher/url_launcher_string.dart'; import '../../common.dart'; import '../../common/formatter/id_formatter.dart'; import '../../common/widgets/peer_tab_page.dart'; -import '../../common/widgets/peer_widget.dart'; +import '../../common/widgets/peers_view.dart'; import '../../models/platform_model.dart'; /// Connection page for connecting to a remote peer. @@ -74,9 +74,9 @@ class _ConnectionPageState extends State { translate('Address Book') ], children: [ - RecentPeerWidget(), - FavoritePeerWidget(), - DiscoveredPeerWidget(), + RecentPeersView(), + FavoritePeersView(), + DiscoveredPeersView(), const AddressBook(), ], )), diff --git a/flutter/lib/mobile/pages/connection_page.dart b/flutter/lib/mobile/pages/connection_page.dart index edc2f5f6d..0778bec4e 100644 --- a/flutter/lib/mobile/pages/connection_page.dart +++ b/flutter/lib/mobile/pages/connection_page.dart @@ -10,7 +10,7 @@ import 'package:url_launcher/url_launcher.dart'; import '../../common.dart'; import '../../common/widgets/address_book.dart'; import '../../common/widgets/peer_tab_page.dart'; -import '../../common/widgets/peer_widget.dart'; +import '../../common/widgets/peers_view.dart'; import '../../consts.dart'; import '../../models/model.dart'; import '../../models/platform_model.dart'; @@ -84,9 +84,9 @@ class _ConnectionPageState extends State { translate('Address Book') ], children: [ - RecentPeerWidget(), - FavoritePeerWidget(), - DiscoveredPeerWidget(), + RecentPeersView(), + FavoritePeersView(), + DiscoveredPeersView(), const AddressBook(), ], )),