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

fix android client chat mode;update UI

Browse Source
This commit is contained in:
csf 2022-04-12 22:38:39 +08:00
parent bc00375c44
commit a65e32f023
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common.dart
View File

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:flutter_easyloading/flutter_easyloading.dart';
final globalKey = GlobalKey<NavigatorState>();
final navigationBarKey = GlobalKey();
final navigationBarKey = GlobalKey();
var isAndroid = false;
var isIOS = false;
@ -49,6 +49,7 @@ void showLoading(String text) {
constraints: BoxConstraints(maxWidth: 240),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
SizedBox(height: 30),
Center(child: CircularProgressIndicator()),
SizedBox(height: 20),
Center(
@ -69,7 +70,6 @@ void showLoading(String text) {
}
backToHome() {
// use [popUntil()] to make sure pop action can't close the current MaterialApp context
Navigator.popUntil(globalKey.currentContext!, ModalRoute.withName("/"));
}

7
lib/pages/remote_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_hbb/models/chat_model.dart';
import 'package:flutter_hbb/widgets/gesture_help.dart';
import 'package:provider/provider.dart';
import 'package:flutter/services.dart';
@ -282,7 +283,11 @@ class _RemotePageState extends State<RemotePage> {
IconButton(
color: Colors.white,
icon: Icon(Icons.message),
onPressed: toggleChatOverlay,
onPressed: () {
FFI.chatModel
.changeCurrentID(ChatModel.clientModeID);
toggleChatOverlay();
},
)
]) +
[

41
lib/pages/server_page.dart
View File

@ -204,17 +204,36 @@ class _PermissionCheckerState extends State<PermissionChecker> {
style: TextStyle(color: MyTheme.darkGray),
),
SizedBox(height: 8),
serverModel.mediaOk
? ElevatedButton.icon(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.red)),
icon: Icon(Icons.stop),
onPressed: serverModel.toggleService,
label: Text(translate("Stop service")))
: ElevatedButton.icon(
icon: Icon(Icons.play_arrow),
onPressed: serverModel.toggleService,
label: Text(translate("Start Service"))),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
serverModel.mediaOk
? ElevatedButton.icon(
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all(Colors.red)),
icon: Icon(Icons.stop),
onPressed: serverModel.toggleService,
label: Text(translate("Stop service")))
: ElevatedButton.icon(
icon: Icon(Icons.play_arrow),
onPressed: serverModel.toggleService,
label: Text(translate("Start Service"))),
serverModel.mediaOk
? Row(
children: [
Padding(
padding: EdgeInsets.only(left: 20, right: 5),
child: Icon(Icons.circle,
color: Colors.greenAccent, size: 10)),
Text(translate("Ready"),
style: TextStyle(
fontSize: 16.0, color: MyTheme.accent50))
],
)
: SizedBox.shrink()
],
),
],
));
}