From a65e32f0235bc21db02deecaaa13c7451942ba6e Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Tue, 12 Apr 2022 22:38:39 +0800
Subject: [PATCH] fix android client chat mode;update UI

---
 lib/common.dart            |  4 ++--
 lib/pages/remote_page.dart |  7 ++++++-
 lib/pages/server_page.dart | 41 ++++++++++++++++++++++++++++----------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/lib/common.dart b/lib/common.dart
index 033519164..fc5fdb8ea 100644
--- a/lib/common.dart
+++ b/lib/common.dart
@@ -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("/"));
 }
 
diff --git a/lib/pages/remote_page.dart b/lib/pages/remote_page.dart
index ad890b071..aea29a67b 100644
--- a/lib/pages/remote_page.dart
+++ b/lib/pages/remote_page.dart
@@ -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();
+                            },
                           )
                         ]) +
                   [
diff --git a/lib/pages/server_page.dart b/lib/pages/server_page.dart
index 5db82ddf6..bd89f5ba3 100644
--- a/lib/pages/server_page.dart
+++ b/lib/pages/server_page.dart
@@ -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()
+              ],
+            ),
           ],
         ));
   }