Merge pull request #4790 from 21pages/note

fix note dialog
This commit is contained in:
RustDesk 2023-06-29 10:38:05 +08:00 committed by GitHub
commit 8e8033a5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 6 deletions

View File

@ -288,8 +288,8 @@ class MyTheme {
tabBarTheme: const TabBarTheme( tabBarTheme: const TabBarTheme(
labelColor: Colors.black87, labelColor: Colors.black87,
), ),
splashColor: Colors.transparent, splashColor: isDesktop ? Colors.transparent : null,
highlightColor: Colors.transparent, highlightColor: isDesktop ? Colors.transparent : null,
splashFactory: isDesktop ? NoSplash.splashFactory : null, splashFactory: isDesktop ? NoSplash.splashFactory : null,
textButtonTheme: isDesktop textButtonTheme: isDesktop
? TextButtonThemeData( ? TextButtonThemeData(
@ -377,8 +377,8 @@ class MyTheme {
scrollbarTheme: ScrollbarThemeData( scrollbarTheme: ScrollbarThemeData(
thumbColor: MaterialStateProperty.all(Colors.grey[500]), thumbColor: MaterialStateProperty.all(Colors.grey[500]),
), ),
splashColor: Colors.transparent, splashColor: isDesktop ? Colors.transparent : null,
highlightColor: Colors.transparent, highlightColor: isDesktop ? Colors.transparent : null,
splashFactory: isDesktop ? NoSplash.splashFactory : null, splashFactory: isDesktop ? NoSplash.splashFactory : null,
textButtonTheme: isDesktop textButtonTheme: isDesktop
? TextButtonThemeData( ? TextButtonThemeData(

View File

@ -23,6 +23,7 @@ class ChatPage extends StatelessWidget implements PageShape {
@override @override
final appBarActions = [ final appBarActions = [
PopupMenuButton<int>( PopupMenuButton<int>(
tooltip: "",
icon: Icon(Icons.group), icon: Icon(Icons.group),
itemBuilder: (context) { itemBuilder: (context) {
// only mobile need [appBarActions], just bind gFFI.chatModel // only mobile need [appBarActions], just bind gFFI.chatModel

View File

@ -1100,7 +1100,7 @@ showSetOSAccount(
showAuditDialog(SessionID sessionId, dialogManager) async { showAuditDialog(SessionID sessionId, dialogManager) async {
final controller = TextEditingController(); final controller = TextEditingController();
dialogManager.show((setState, close) { dialogManager.show((setState, close, context) {
submit() { submit() {
var text = controller.text.trim(); var text = controller.text.trim();
if (text != '') { if (text != '') {

View File

@ -1403,7 +1403,7 @@ class _AccountState extends State<_Account> {
child: Column( child: Column(
children: [ children: [
text('Username', gFFI.userModel.userName.value), text('Username', gFFI.userModel.userName.value),
text('Group', gFFI.groupModel.groupName.value), // text('Group', gFFI.groupModel.groupName.value),
], ],
), ),
)).marginOnly(left: 18, top: 16); )).marginOnly(left: 18, top: 16);

View File

@ -215,6 +215,7 @@ class _WebMenuState extends State<WebMenu> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
Provider.of<FfiModel>(context); Provider.of<FfiModel>(context);
return PopupMenuButton<String>( return PopupMenuButton<String>(
tooltip: "",
icon: const Icon(Icons.more_vert), icon: const Icon(Icons.more_vert),
itemBuilder: (context) { itemBuilder: (context) {
return (isIOS return (isIOS

View File

@ -131,6 +131,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
), ),
actions: [ actions: [
PopupMenuButton<String>( PopupMenuButton<String>(
tooltip: "",
icon: Icon(Icons.more_vert), icon: Icon(Icons.more_vert),
itemBuilder: (context) { itemBuilder: (context) {
return [ return [
@ -473,6 +474,7 @@ class _FileManagerViewState extends State<FileManagerView> {
setState(() {}); setState(() {});
}) })
: PopupMenuButton<String>( : PopupMenuButton<String>(
tooltip: "",
icon: Icon(Icons.more_vert), icon: Icon(Icons.more_vert),
itemBuilder: (context) { itemBuilder: (context) {
return [ return [
@ -585,6 +587,7 @@ class _FileManagerViewState extends State<FileManagerView> {
onPressed: controller.goToParentDirectory, onPressed: controller.goToParentDirectory,
), ),
PopupMenuButton<SortBy>( PopupMenuButton<SortBy>(
tooltip: "",
icon: Icon(Icons.sort), icon: Icon(Icons.sort),
itemBuilder: (context) { itemBuilder: (context) {
return SortBy.values return SortBy.values

View File

@ -23,6 +23,7 @@ class ServerPage extends StatefulWidget implements PageShape {
@override @override
final appBarActions = [ final appBarActions = [
PopupMenuButton<String>( PopupMenuButton<String>(
tooltip: "",
icon: const Icon(Icons.more_vert), icon: const Icon(Icons.more_vert),
itemBuilder: (context) { itemBuilder: (context) {
listTile(String text, bool checked) { listTile(String text, bool checked) {

View File

@ -165,6 +165,7 @@ class UserModel {
static Future<List<dynamic>> queryLoginOptions() async { static Future<List<dynamic>> queryLoginOptions() async {
try { try {
final url = await bind.mainGetApiServer(); final url = await bind.mainGetApiServer();
if (url.trim().isEmpty) return [];
final resp = await http.get(Uri.parse('$url/api/login-options')); final resp = await http.get(Uri.parse('$url/api/login-options'));
return jsonDecode(resp.body); return jsonDecode(resp.body);
} catch (e) { } catch (e) {