This patch enables the noVNC console view on iOS devices. It also
includes a refactor of the function responsible for displaying the
webview. Additionally, an `AppBar` has been added to the console view on
iOS to allow users to easily close the view.
Signed-off-by: Shan Shaji <s.sh...@proxmox.com>
---
lib/widgets/pve_console_menu_widget.dart | 86 +++++++++++-------------
1 file changed, 40 insertions(+), 46 deletions(-)
diff --git a/lib/widgets/pve_console_menu_widget.dart
b/lib/widgets/pve_console_menu_widget.dart
index f4bd8d3..e9481c0 100644
--- a/lib/widgets/pve_console_menu_widget.dart
+++ b/lib/widgets/pve_console_menu_widget.dart
@@ -103,45 +103,19 @@ class PveConsoleMenu extends StatelessWidget {
}
},
),
- if (Platform.isAndroid) // web_view is only available for mobile :(
+
+ // web_view is only available for mobile :(
+ // xterm.js doesn't work that well on mobile
+ if (Platform.isAndroid || Platform.isIOS)
ListTile(
title: const Text(
- //type == "qemu" ? "noVNC Console" : "xterm.js Console",
- "noVNC Console", // xterm.js doesn't work that well on mobile
+ "noVNC Console",
style: TextStyle(fontWeight: FontWeight.bold),
),
subtitle: const Text("Open console view"),
- onTap: () async {
- if (Platform.isAndroid) {
- if (['qemu', 'lxc'].contains(type)) {
- SystemChrome.setEnabledSystemUIMode(
- SystemUiMode.immersive);
- Navigator.of(context)
- .push(_createHTMLConsoleRoute())
- .then((completion) {
- SystemChrome.setEnabledSystemUIMode(
- SystemUiMode.edgeToEdge,
- overlays: [
- SystemUiOverlay.top,
- SystemUiOverlay.bottom
- ]);
- });
- } else if (type == 'node') {
- SystemChrome.setEnabledSystemUIMode(
- SystemUiMode.immersive);
- Navigator.of(context)
- .push(_createHTMLConsoleRoute())
- .then((completion) {
- SystemChrome.setEnabledSystemUIMode(
- SystemUiMode.edgeToEdge,
- overlays: [
- SystemUiOverlay.top,
- SystemUiOverlay.bottom
- ]);
- });
- }
- } else {
- print('not implemented for current platform');
+ onTap: () {
+ if (['qemu', 'lxc'].contains(type) || type == 'node') {
+ _openNoVncConsole(context);
}
},
),
@@ -151,6 +125,18 @@ class PveConsoleMenu extends StatelessWidget {
);
}
+ Future<void> _openNoVncConsole(BuildContext context) async {
+ SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+ await Navigator.push(context, _createHTMLConsoleRoute());
+ SystemChrome.setEnabledSystemUIMode(
+ SystemUiMode.edgeToEdge,
+ overlays: [
+ SystemUiOverlay.top,
+ SystemUiOverlay.bottom,
+ ],
+ );
+ }
+
void showTextDialog(BuildContext context, String title, String content) {
showDialog(
context: context,
@@ -232,14 +218,16 @@ class PVEWebConsoleState extends State<PVEWebConsole> {
WidgetsFlutterBinding.ensureInitialized();
return FutureBuilder(
- future: CookieManager.instance().setCookie(
- url: WebUri(consoleUrl),
- name: 'PVEAuthCookie',
- value: ticket,
- ),
- builder: (context, snapshot) {
- return ColoredSafeArea(
- child: InAppWebView(
+ future: CookieManager.instance().setCookie(
+ url: WebUri(consoleUrl),
+ name: 'PVEAuthCookie',
+ value: ticket,
+ ),
+ builder: (context, snapshot) {
+ return ColoredSafeArea(
+ child: Scaffold(
+ appBar: Platform.isIOS ? AppBar() : null,
+ body: InAppWebView(
onReceivedServerTrustAuthRequest: (controller, challenge) async {
final cert = challenge.protectionSpace.sslCertificate;
final certBytes = cert?.x509Certificate?.encoded;
@@ -294,12 +282,18 @@ class PVEWebConsoleState extends State<PVEWebConsole> {
urlRequest: URLRequest(url: WebUri(consoleUrl)));
},
),
- );
- });
+ ),
+ );
+ },
+ );
}
- Future<bool> showTLSWarning(BuildContext context, String sslError,
- String issuedTo, String hash) async {
+ Future<bool> showTLSWarning(
+ BuildContext context,
+ String sslError,
+ String issuedTo,
+ String hash,
+ ) async {
return await showDialog(
context: context,
barrierDismissible: false,
--
2.39.5 (Apple Git-154)
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
