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

imporove setting page

Browse Source
This commit is contained in:
rustdesk 2022-09-21 18:49:28 +08:00
parent 752a94a5b5
commit 4377baf062
1 changed files with 161 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import 'package:flutter_hbb/models/server_model.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher_string.dart'; import 'package:url_launcher/url_launcher_string.dart';
import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
import '../../common/widgets/dialog.dart'; import '../../common/widgets/dialog.dart';
@ -44,7 +45,6 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
with TickerProviderStateMixin, AutomaticKeepAliveClientMixin { with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
final List<_TabInfo> settingTabs = <_TabInfo>[ final List<_TabInfo> settingTabs = <_TabInfo>[
_TabInfo('General', Icons.settings_outlined, Icons.settings), _TabInfo('General', Icons.settings_outlined, Icons.settings),
_TabInfo('Language', Icons.language_outlined, Icons.language),
_TabInfo('Security', Icons.enhanced_encryption_outlined, _TabInfo('Security', Icons.enhanced_encryption_outlined,
Icons.enhanced_encryption), Icons.enhanced_encryption),
_TabInfo('Network', Icons.link_outlined, Icons.link), _TabInfo('Network', Icons.link_outlined, Icons.link),
@ -84,17 +84,18 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
Expanded( Expanded(
child: Container( child: Container(
color: MyTheme.color(context).grayBg, color: MyTheme.color(context).grayBg,
child: DesktopScrollWrapper(
scrollController: controller,
child: PageView( child: PageView(
controller: controller, controller: controller,
children: const [ children: const [
_General(), _General(),
_Language(),
_Safety(), _Safety(),
_Network(), _Network(),
_Acount(), _Acount(),
_About(), _About(),
], ],
), )),
), ),
) )
], ],
@ -123,14 +124,18 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
} }
Widget _listView({required List<_TabInfo> tabs}) { Widget _listView({required List<_TabInfo> tabs}) {
return ListView( final scrollController = ScrollController();
controller: ScrollController(), return DesktopScrollWrapper(
scrollController: scrollController,
child: ListView(
physics: NeverScrollableScrollPhysics(),
controller: scrollController,
children: tabs children: tabs
.asMap() .asMap()
.entries .entries
.map((tab) => _listItem(tab: tab.value, index: tab.key)) .map((tab) => _listItem(tab: tab.value, index: tab.key))
.toList(), .toList(),
); ));
} }
Widget _listItem({required _TabInfo tab, required int index}) { Widget _listItem({required _TabInfo tab, required int index}) {
@ -183,15 +188,20 @@ class _General extends StatefulWidget {
class _GeneralState extends State<_General> { class _GeneralState extends State<_General> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListView( final scrollController = ScrollController();
controller: ScrollController(), return DesktopScrollWrapper(
scrollController: scrollController,
child: ListView(
physics: NeverScrollableScrollPhysics(),
controller: scrollController,
children: [ children: [
theme(), theme(),
abr(), abr(),
hwcodec(), hwcodec(),
audio(context), audio(context),
_Card(title: 'Language', children: [language()]),
], ],
).marginOnly(bottom: _kListViewBottomMargin); ).marginOnly(bottom: _kListViewBottomMargin));
} }
Widget theme() { Widget theme() {
@ -273,30 +283,6 @@ class _GeneralState extends State<_General> {
]); ]);
}); });
} }
}
class _Language extends StatefulWidget {
const _Language({Key? key}) : super(key: key);
@override
State<_Language> createState() => _LanguageState();
}
class _LanguageState extends State<_Language>
with AutomaticKeepAliveClientMixin {
@override
bool get wantKeepAlive => true;
@override
Widget build(BuildContext context) {
super.build(context);
return ListView(
controller: ScrollController(),
children: [
_Card(title: 'Language', children: [language()]),
],
).marginOnly(bottom: _kListViewBottomMargin);
}
Widget language() { Widget language() {
return _futureBuilder(future: () async { return _futureBuilder(future: () async {
@ -340,14 +326,17 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
@override @override
bool get wantKeepAlive => true; bool get wantKeepAlive => true;
bool locked = true; bool locked = true;
final scrollController = ScrollController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
return ListView( return DesktopScrollWrapper(
controller: ScrollController(), scrollController: scrollController,
children: [ child: SingleChildScrollView(
Column( physics: NeverScrollableScrollPhysics(),
controller: scrollController,
child: Column(
children: [ children: [
_lock(locked, 'Unlock Security Settings', () { _lock(locked, 'Unlock Security Settings', () {
locked = false; locked = false;
@ -358,13 +347,16 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
child: Column(children: [ child: Column(children: [
permissions(context), permissions(context),
password(context), password(context),
_Card(title: 'ID', children: [changeId()]),
connection(context), connection(context),
]), ]),
), ),
], ],
) )).marginOnly(bottom: _kListViewBottomMargin));
], }
).marginOnly(bottom: _kListViewBottomMargin);
Widget changeId() {
return _Button('Change ID', changeIdDialog, enabled: !locked);
} }
Widget permissions(context) { Widget permissions(context) {
@ -378,6 +370,8 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
enabled: enabled), enabled: enabled),
_OptionCheckBox(context, 'Enable Audio', 'enable-audio', _OptionCheckBox(context, 'Enable Audio', 'enable-audio',
enabled: enabled), enabled: enabled),
_OptionCheckBox(context, 'Enable TCP Tunneling', 'enable-tunnel',
enabled: enabled),
_OptionCheckBox(context, 'Enable Remote Restart', 'enable-remote-restart', _OptionCheckBox(context, 'Enable Remote Restart', 'enable-remote-restart',
enabled: enabled), enabled: enabled),
_OptionCheckBox(context, 'Enable remote configuration modification', _OptionCheckBox(context, 'Enable remote configuration modification',
@ -470,15 +464,13 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
Widget connection(BuildContext context) { Widget connection(BuildContext context) {
bool enabled = !locked; bool enabled = !locked;
return _Card(title: 'Connection', children: [ return _Card(title: 'Security', children: [
_OptionCheckBox(context, 'Deny remote access', 'stop-service', _OptionCheckBox(context, 'Deny remote access', 'stop-service',
checkedIcon: const Icon( checkedIcon: const Icon(
Icons.warning, Icons.warning,
color: Colors.yellowAccent, color: Colors.yellowAccent,
), ),
enabled: enabled), enabled: enabled),
_OptionCheckBox(context, 'Enable TCP Tunneling', 'enable-tunnel',
enabled: enabled),
Offstage( Offstage(
offstage: !Platform.isWindows, offstage: !Platform.isWindows,
child: _OptionCheckBox(context, 'Enable RDP', 'enable-rdp', child: _OptionCheckBox(context, 'Enable RDP', 'enable-rdp',
@ -615,8 +607,12 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
bool enabled = !locked; bool enabled = !locked;
return ListView(controller: ScrollController(), children: [ final scrollController = ScrollController();
Column( return DesktopScrollWrapper(
scrollController: scrollController,
child: ListView(
controller: scrollController,
physics: NeverScrollableScrollPhysics(),
children: [ children: [
_lock(locked, 'Unlock Network Settings', () { _lock(locked, 'Unlock Network Settings', () {
locked = false; locked = false;
@ -629,13 +625,12 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
_Button('ID/Relay Server', changeServer, enabled: enabled), _Button('ID/Relay Server', changeServer, enabled: enabled),
]), ]),
_Card(title: 'Proxy', children: [ _Card(title: 'Proxy', children: [
_Button('Socks5 Proxy', changeSocks5Proxy, enabled: enabled), _Button('Socks5 Proxy', changeSocks5Proxy,
enabled: enabled),
]), ]),
]), ]),
), ),
], ]).marginOnly(bottom: _kListViewBottomMargin));
)
]).marginOnly(bottom: _kListViewBottomMargin);
} }
} }
@ -649,13 +644,16 @@ class _Acount extends StatefulWidget {
class _AcountState extends State<_Acount> { class _AcountState extends State<_Acount> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListView( final scrollController = ScrollController();
controller: ScrollController(), return DesktopScrollWrapper(
scrollController: scrollController,
child: ListView(
physics: NeverScrollableScrollPhysics(),
controller: scrollController,
children: [ children: [
_Card(title: 'Acount', children: [login()]), _Card(title: 'Acount', children: [login()]),
_Card(title: 'ID', children: [changeId()]),
], ],
).marginOnly(bottom: _kListViewBottomMargin); ).marginOnly(bottom: _kListViewBottomMargin));
} }
Widget login() { Widget login() {
@ -675,10 +673,6 @@ class _AcountState extends State<_Acount> {
}); });
}); });
} }
Widget changeId() {
return _Button('Change ID', changeIdDialog);
}
} }
class _About extends StatefulWidget { class _About extends StatefulWidget {
@ -699,8 +693,13 @@ class _AboutState extends State<_About> {
final license = data['license'].toString(); final license = data['license'].toString();
final version = data['version'].toString(); final version = data['version'].toString();
const linkStyle = TextStyle(decoration: TextDecoration.underline); const linkStyle = TextStyle(decoration: TextDecoration.underline);
return ListView(controller: ScrollController(), children: [ final scrollController = ScrollController();
_Card(title: "About RustDesk", children: [ return DesktopScrollWrapper(
scrollController: scrollController,
child: SingleChildScrollView(
controller: scrollController,
physics: NeverScrollableScrollPhysics(),
child: _Card(title: "About RustDesk", children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -753,7 +752,7 @@ class _AboutState extends State<_About> {
], ],
).marginOnly(left: _kContentHMargin) ).marginOnly(left: _kContentHMargin)
]), ]),
]); ));
}); });
} }
} }