lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-13 19:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into sort-favorites

Browse Source
This commit is contained in:
NicKoehler
2023-03-07 19:50:29 +01:00
parent e76cbe9997 cd926dfd50
commit d40aed6ac2
50 changed files with 152 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flutter/lib/common/widgets/chat_page.dart
View File

@@ -73,7 +73,7 @@ class ChatPage extends StatelessWidget implements PageShape {
? InputDecoration(
isDense: true,
hintText:
"${translate('Write a message')}...",
"${translate('Write a message')}",
filled: true,
fillColor:
Theme.of(context).colorScheme.background,
@@ -88,7 +88,7 @@ class ChatPage extends StatelessWidget implements PageShape {
)
: defaultInputDecoration(
hintText:
"${translate('Write a message')}...",
"${translate('Write a message')}",
fillColor:
Theme.of(context).colorScheme.background),
sendButtonBuilder: defaultSendButton(

11
flutter/lib/common/widgets/peer_card.dart
View File

@@ -890,13 +890,10 @@ class DiscoveredPeerCard extends BasePeerCard {
menuItems.add(_createShortCutAction(peer.id));
}
final inRecent = await bind.mainIsInRecentPeers(id: peer.id);
if (inRecent) {
if (!favs.contains(peer.id)) {
menuItems.add(_addFavAction(peer.id));
} else {
menuItems.add(_rmFavAction(peer.id, () async {}));
}
if (!favs.contains(peer.id)) {
menuItems.add(_addFavAction(peer.id));
} else {
menuItems.add(_rmFavAction(peer.id, () async {}));
}
if (gFFI.userModel.userName.isNotEmpty) {