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

remove mobile web setting, remove web/ios relay server setting (#9575)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-10-06 16:20:37 +08:00 committed by GitHub
parent e7353be0cd
commit 560c1effe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/desktop/pages/desktop_setting_page.dart
View File

@ -1451,6 +1451,7 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
children: [ children: [
Obx(() => _LabeledTextField(context, 'ID Server', idController, Obx(() => _LabeledTextField(context, 'ID Server', idController,
idErrMsg.value, enabled, secure)), idErrMsg.value, enabled, secure)),
if (!isWeb)
Obx(() => _LabeledTextField(context, 'Relay Server', Obx(() => _LabeledTextField(context, 'Relay Server',
relayController, relayErrMsg.value, enabled, secure)), relayController, relayErrMsg.value, enabled, secure)),
Obx(() => _LabeledTextField(context, 'API Server', Obx(() => _LabeledTextField(context, 'API Server',

1
flutter/lib/mobile/widgets/dialog.dart
View File

@ -205,6 +205,7 @@ void showServerSettingsWithValue(
) )
] + ] +
[ [
if (isAndroid)
TextFormField( TextFormField(
controller: relayCtrl, controller: relayCtrl,
decoration: InputDecoration( decoration: InputDecoration(

71
flutter/lib/web/settings_page.dart
View File

@ -1,23 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/desktop/pages/desktop_setting_page.dart'; import 'package:flutter_hbb/desktop/pages/desktop_setting_page.dart';
import 'package:flutter_hbb/mobile/pages/scan_page.dart';
import 'package:flutter_hbb/mobile/pages/settings_page.dart';
import 'package:provider/provider.dart';
import '../../common.dart';
import '../../common/widgets/login.dart';
import '../../models/model.dart';
class WebSettingsPage extends StatelessWidget { class WebSettingsPage extends StatelessWidget {
const WebSettingsPage({Key? key}) : super(key: key); const WebSettingsPage({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (isWebDesktop) {
return _buildDesktopButton(context); return _buildDesktopButton(context);
} else {
return _buildMobileMenu(context);
}
} }
Widget _buildDesktopButton(BuildContext context) { Widget _buildDesktopButton(BuildContext context) {
@ -34,64 +23,4 @@ class WebSettingsPage extends StatelessWidget {
}, },
); );
} }
Widget _buildMobileMenu(BuildContext context) {
Provider.of<FfiModel>(context);
return PopupMenuButton<String>(
tooltip: "",
icon: const Icon(Icons.more_vert),
itemBuilder: (context) {
return (isIOS
? [
const PopupMenuItem(
value: "scan",
child: Icon(Icons.qr_code_scanner, color: Colors.black),
)
]
: <PopupMenuItem<String>>[]) +
[
PopupMenuItem(
value: "server",
child: Text(translate('ID/Relay Server')),
)
] +
[
PopupMenuItem(
value: "login",
child: Text(gFFI.userModel.userName.value.isEmpty
? translate("Login")
: '${translate("Logout")} (${gFFI.userModel.userName.value})'),
)
] +
[
PopupMenuItem(
value: "about",
child: Text(translate('About RustDesk')),
)
];
},
onSelected: (value) {
if (value == 'server') {
showServerSettings(gFFI.dialogManager);
}
if (value == 'about') {
showAbout(gFFI.dialogManager);
}
if (value == 'login') {
if (gFFI.userModel.userName.value.isEmpty) {
loginDialog();
} else {
logOutConfirmDialog();
}
}
if (value == 'scan') {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => ScanPage(),
),
);
}
});
}
} }