From 2d90946a4d64532ec0c4a536d25f13bd05289432 Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Mon, 1 Aug 2022 12:44:13 +0800
Subject: [PATCH] fix mobile UI overflowed

---
 flutter/lib/pages/remote_page.dart |  2 +-
 flutter/lib/pages/server_page.dart | 46 +++++++++++++++++-------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/flutter/lib/pages/remote_page.dart b/flutter/lib/pages/remote_page.dart
index 81349ef3b..a308496ea 100644
--- a/flutter/lib/pages/remote_page.dart
+++ b/flutter/lib/pages/remote_page.dart
@@ -659,7 +659,7 @@ class _RemotePageState extends State<RemotePage> {
     more.add(PopupMenuItem<String>(
         child: Row(
             children: ([
-          Container(width: 100.0, child: Text(translate('OS Password'))),
+          Text(translate('OS Password')),
           TextButton(
             style: flatButtonStyle,
             onPressed: () {
diff --git a/flutter/lib/pages/server_page.dart b/flutter/lib/pages/server_page.dart
index bb80b8d51..8e79466d6 100644
--- a/flutter/lib/pages/server_page.dart
+++ b/flutter/lib/pages/server_page.dart
@@ -200,7 +200,8 @@ class ServerInfo extends StatelessWidget {
                   Icon(Icons.warning_amber_sharp,
                       color: Colors.redAccent, size: 24),
                   SizedBox(width: 10),
-                  Text(
+                  Expanded(
+                      child: Text(
                     translate("Service is not running"),
                     style: TextStyle(
                       fontFamily: 'WorkSans',
@@ -208,7 +209,7 @@ class ServerInfo extends StatelessWidget {
                       fontSize: 18,
                       color: MyTheme.accent80,
                     ),
-                  )
+                  ))
                 ],
               )),
               SizedBox(height: 5),
@@ -316,30 +317,35 @@ class PermissionRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        Row(
-          children: [
-            SizedBox(
-                width: 140,
+        Expanded(
+            flex: 5,
+            child: FittedBox(
+                fit: BoxFit.scaleDown,
+                alignment: Alignment.centerLeft,
                 child: Text(name,
-                    style: TextStyle(fontSize: 16.0, color: MyTheme.accent50))),
-            SizedBox(
-              width: 50,
+                    style:
+                        TextStyle(fontSize: 16.0, color: MyTheme.accent50)))),
+        Expanded(
+          flex: 2,
+          child: FittedBox(
+              fit: BoxFit.scaleDown,
               child: Text(isOk ? translate("ON") : translate("OFF"),
                   style: TextStyle(
                       fontSize: 16.0,
-                      color: isOk ? Colors.green : Colors.grey)),
-            )
-          ],
+                      color: isOk ? Colors.green : Colors.grey))),
         ),
-        TextButton(
-            onPressed: onPressed,
-            child: Text(
-              translate(isOk ? "CLOSE" : "OPEN"),
-              style: TextStyle(fontWeight: FontWeight.bold),
-            )),
-        const Divider(height: 0)
+        Expanded(
+            flex: 3,
+            child: FittedBox(
+                fit: BoxFit.scaleDown,
+                alignment: Alignment.centerRight,
+                child: TextButton(
+                    onPressed: onPressed,
+                    child: Text(
+                      translate(isOk ? "CLOSE" : "OPEN"),
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    )))),
       ],
     );
   }