TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-22 11:03:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

new dialog impl based on Overlay

Browse Source
This commit is contained in:
csf
2022-08-12 18:42:02 +08:00
parent 2e9a6ed4f6
commit e6329dc7eb
22 changed files with 526 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
flutter/lib/mobile/pages/remote_page.dart
View File

@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hbb/mobile/widgets/gesture_help.dart';
import 'package:flutter_hbb/models/chat_model.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:provider/provider.dart';
import 'package:wakelock/wakelock.dart';
@@ -51,7 +50,8 @@ class _RemotePageState extends State<RemotePage> {
gFFI.connect(widget.id);
WidgetsBinding.instance.addPostFrameCallback((_) {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
showLoading(translate('Connecting...'));
gFFI.dialogManager
.showLoading(translate('Connecting...'), cancelToClose: true);
_interval =
Timer.periodic(Duration(milliseconds: 30), (timer) => interval());
});
@@ -71,7 +71,7 @@ class _RemotePageState extends State<RemotePage> {
gFFI.close();
_interval?.cancel();
_timer?.cancel();
SmartDialog.dismiss();
gFFI.dialogManager.dismissAll();
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
overlays: SystemUiOverlay.values);
Wakelock.disable();
@@ -226,7 +226,7 @@ class _RemotePageState extends State<RemotePage> {
return WillPopScope(
onWillPop: () async {
clientClose();
clientClose(gFFI.dialogManager);
return false;
},
child: getRawPointerAndKeyBody(
@@ -401,7 +401,7 @@ class _RemotePageState extends State<RemotePage> {
color: Colors.white,
icon: Icon(Icons.clear),
onPressed: () {
clientClose();
clientClose(gFFI.dialogManager);
},
)
] +
@@ -411,7 +411,7 @@ class _RemotePageState extends State<RemotePage> {
icon: Icon(Icons.tv),
onPressed: () {
setState(() => _showEdit = false);
showOptions(widget.id);
showOptions(widget.id, gFFI.dialogManager);
},
)
] +
@@ -671,7 +671,7 @@ class _RemotePageState extends State<RemotePage> {
style: flatButtonStyle,
onPressed: () {
Navigator.pop(context);
showSetOSPassword(id, false);
showSetOSPassword(id, false, gFFI.dialogManager);
},
child: Icon(Icons.edit, color: MyTheme.accent),
)
@@ -739,12 +739,12 @@ class _RemotePageState extends State<RemotePage> {
if (password != null) {
bind.sessionInputOsPassword(id: widget.id, value: password);
} else {
showSetOSPassword(id, true);
showSetOSPassword(id, true, gFFI.dialogManager);
}
} else if (value == 'reset_canvas') {
gFFI.cursorModel.reset();
} else if (value == 'restart') {
showRestartRemoteDevice(pi, widget.id);
showRestartRemoteDevice(pi, widget.id, gFFI.dialogManager);
}
}();
}
@@ -1008,7 +1008,7 @@ class QualityMonitor extends StatelessWidget {
: SizedBox.shrink())));
}
void showOptions(String id) async {
void showOptions(String id, OverlayDialogManager dialogManager) async {
String quality = await bind.getSessionImageQuality(id: id) ?? 'balanced';
if (quality == '') quality = 'balanced';
String viewStyle =
@@ -1026,7 +1026,7 @@ void showOptions(String id) async {
onTap: () {
if (i == cur) return;
bind.sessionSwitchDisplay(id: id, value: i);
SmartDialog.dismiss();
gFFI.dialogManager.dismissAll();
},
child: Ink(
width: 40,
@@ -1051,7 +1051,7 @@ void showOptions(String id) async {
}
final perms = gFFI.ffiModel.permissions;
DialogManager.show((setState, close) {
dialogManager.show((setState, close) {
final more = <Widget>[];
if (perms['audio'] != false) {
more.add(getToggle(id, setState, 'disable-audio', 'Mute'));
@@ -1107,9 +1107,10 @@ void showOptions(String id) async {
}, clickMaskDismiss: true, backDismiss: true);
}
void showRestartRemoteDevice(PeerInfo pi, String id) async {
void showRestartRemoteDevice(
PeerInfo pi, String id, OverlayDialogManager dialogManager) async {
final res =
await DialogManager.show<bool>((setState, close) => CustomAlertDialog(
await dialogManager.show<bool>((setState, close) => CustomAlertDialog(
title: Row(children: [
Icon(Icons.warning_amber_sharp,
color: Colors.redAccent, size: 28),
@@ -1128,12 +1129,13 @@ void showRestartRemoteDevice(PeerInfo pi, String id) async {
if (res == true) bind.sessionRestartRemoteDevice(id: id);
}
void showSetOSPassword(String id, bool login) async {
void showSetOSPassword(
String id, bool login, OverlayDialogManager dialogManager) async {
final controller = TextEditingController();
var password = await bind.getSessionOption(id: id, arg: "os-password") ?? "";
var autoLogin = await bind.getSessionOption(id: id, arg: "auto-login") != "";
controller.text = password;
DialogManager.show((setState, close) {
dialogManager.show((setState, close) {
return CustomAlertDialog(
title: Text(translate('OS Password')),
content: Column(mainAxisSize: MainAxisSize.min, children: [