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

Mobile. Share Screen. Clean up

Browse Source
This commit is contained in:
grummbeer 2023-03-09 18:31:34 +01:00
parent 2a5d379c60
commit 7db1440191
1 changed files with 60 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
flutter/lib/mobile/pages/server_page.dart
View File

@ -242,7 +242,6 @@ class ServerInfo extends StatelessWidget {
return PaddingCard( return PaddingCard(
title: translate('Your Device'), title: translate('Your Device'),
child: Column( child: Column(
// mainAxisSize: MainAxisSize.min,
// ID // ID
children: [ children: [
Row(children: [ Row(children: [
@ -384,73 +383,64 @@ class ConnectionManager extends StatelessWidget {
titleIcon: client.isFileTransfer titleIcon: client.isFileTransfer
? Icon(Icons.folder_outlined) ? Icon(Icons.folder_outlined)
: Icon(Icons.mobile_screen_share), : Icon(Icons.mobile_screen_share),
child: Column( child: Column(children: [
crossAxisAlignment: CrossAxisAlignment.start, Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Expanded(child: ClientInfo(client)),
mainAxisAlignment: MainAxisAlignment.spaceBetween, Expanded(
children: [ flex: -1,
Expanded(child: ClientInfo(client)), child: client.isFileTransfer || !client.authorized
Expanded( ? const SizedBox.shrink()
flex: -1, : IconButton(
child: client.isFileTransfer || !client.authorized onPressed: () {
? const SizedBox.shrink() gFFI.chatModel.changeCurrentID(client.id);
: IconButton( final bar = navigationBarKey.currentWidget;
onPressed: () { if (bar != null) {
gFFI.chatModel bar as BottomNavigationBar;
.changeCurrentID(client.id); bar.onTap!(1);
final bar = }
navigationBarKey.currentWidget; },
if (bar != null) { icon: const Icon(Icons.chat)))
bar as BottomNavigationBar; ],
bar.onTap!(1); ),
} client.authorized
}, ? const SizedBox.shrink()
icon: const Icon(Icons.chat))) : Text(
], translate("android_new_connection_tip"),
), style: Theme.of(context).textTheme.bodyMedium,
client.authorized ).marginOnly(bottom: 5),
? const SizedBox.shrink() client.authorized
: Text( ? Container(
translate("android_new_connection_tip"), alignment: Alignment.centerRight,
style: Theme.of(context).textTheme.bodyMedium, child: ElevatedButton.icon(
).marginOnly(bottom: 5), style: ButtonStyle(
client.authorized backgroundColor:
? Row( MaterialStatePropertyAll(Colors.red)),
mainAxisAlignment: MainAxisAlignment.end, icon: const Icon(Icons.close),
children: [ onPressed: () {
ElevatedButton.icon( bind.cmCloseConnection(connId: client.id);
style: ButtonStyle( gFFI.invokeMethod(
backgroundColor: "cancel_notification", client.id);
MaterialStatePropertyAll( },
Colors.red)), label: Text(translate("Disconnect"))))
icon: const Icon(Icons.close), : Row(
onPressed: () { mainAxisAlignment: MainAxisAlignment.end,
bind.cmCloseConnection( children: [
connId: client.id); TextButton(
gFFI.invokeMethod( child: Text(translate("Dismiss")),
"cancel_notification", client.id); onPressed: () {
}, serverModel.sendLoginResponse(
label: Text(translate("Disconnect"))) client, false);
]) }).marginOnly(right: 15),
: Row( ElevatedButton.icon(
mainAxisAlignment: MainAxisAlignment.end, icon: const Icon(Icons.check),
children: [ label: Text(translate("Accept")),
TextButton( onPressed: () {
child: Text(translate("Dismiss")), serverModel.sendLoginResponse(client, true);
onPressed: () { }),
serverModel.sendLoginResponse( ]),
client, false); ])))
}).marginOnly(right: 15),
ElevatedButton.icon(
icon: const Icon(Icons.check),
label: Text(translate("Accept")),
onPressed: () {
serverModel.sendLoginResponse(
client, true);
}),
]),
])))
.toList()); .toList());
} }
} }
@ -473,17 +463,12 @@ class PaddingCard extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(0, 5, 0, 8), padding: const EdgeInsets.fromLTRB(0, 5, 0, 8),
child: Row( child: Row(
children: [ children: [
titleIcon != null titleIcon?.marginOnly(right: 10) ?? const SizedBox.shrink(),
? Padding(
padding: const EdgeInsets.only(right: 10),
child: titleIcon)
: const SizedBox.shrink(),
Expanded( Expanded(
child: Text(title!, child: Text(title!,
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
.titleLarge .titleLarge
// @todo once the font weight is defined in theme, remove it here to be equal insted of individual
?.merge(TextStyle(fontWeight: FontWeight.bold))), ?.merge(TextStyle(fontWeight: FontWeight.bold))),
) )
], ],
@ -498,9 +483,8 @@ class PaddingCard extends StatelessWidget {
margin: const EdgeInsets.fromLTRB(12.0, 10.0, 12.0, 0), margin: const EdgeInsets.fromLTRB(12.0, 10.0, 12.0, 0),
child: Padding( child: Padding(
padding: padding:
const EdgeInsets.symmetric(vertical: 15.0, horizontal: 30.0), const EdgeInsets.symmetric(vertical: 15.0, horizontal: 20.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: children, children: children,
), ),
), ),
@ -516,7 +500,7 @@ class ClientInfo extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 8), padding: const EdgeInsets.symmetric(vertical: 8),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(children: [
Row( Row(
children: [ children: [
Expanded( Expanded(
@ -533,7 +517,6 @@ class ClientInfo extends StatelessWidget {
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text(client.name, style: const TextStyle(fontSize: 18)), Text(client.name, style: const TextStyle(fontSize: 18)),
const SizedBox(width: 8), const SizedBox(width: 8),