From afcb4888389b6d20e181e2b866d8b3500e6adc0f Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Sat, 10 Jun 2023 07:08:10 +0800
Subject: [PATCH] fix mobile language update

Signed-off-by: 21pages <pages21@163.com>
---
 flutter/lib/common/widgets/peer_tab_page.dart | 16 +++++++++++-----
 flutter/lib/mobile/pages/settings_page.dart   |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index e01dce390..39c633963 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -450,16 +450,22 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
 
   @override
   Widget build(BuildContext context) {
+    final enableStyle = TextStyle(
+        color: Theme.of(context).textTheme.titleLarge?.color,
+        fontSize: MenuConfig.fontSize,
+        fontWeight: FontWeight.normal);
+    final disableStyle = TextStyle(
+        color: Colors.grey,
+        fontSize: MenuConfig.fontSize,
+        fontWeight: FontWeight.normal);
     List<PopupMenuEntry> items = List.empty(growable: true);
     items.add(PopupMenuItem(
         enabled: false,
-        child: Text(
-          translate("Sort by"),
-          style: TextStyle(fontWeight: FontWeight.bold),
-        )));
+        child: Text(translate("Sort by"), style: disableStyle)));
     for (var e in PeerSortType.values) {
       items.add(PopupMenuItem(
-          child: Obx(() => getRadio(Text(translate(e)), e, peerSort.value,
+          child: Obx(() => getRadio(
+                  Text(translate(e), style: enableStyle), e, peerSort.value,
                   (String? v) async {
                 if (v != null) {
                   peerSort.value = v;
diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart
index c08a3b1b4..7d85b8c85 100644
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -317,8 +317,8 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
                   await AndroidPermissionManager.request(
                       kRequestIgnoreBatteryOptimizations);
                 } else {
-                  final res = await gFFI.dialogManager
-                      .show<bool>((setState, close, context) => CustomAlertDialog(
+                  final res = await gFFI.dialogManager.show<bool>(
+                      (setState, close, context) => CustomAlertDialog(
                             title: Text(translate("Open System Setting")),
                             content: Text(translate(
                                 "android_open_battery_optimizations_tip")),
@@ -506,12 +506,12 @@ void showLanguageSettings(OverlayDialogManager dialogManager) async {
     final langs = json.decode(await bind.mainGetLangs()) as List<dynamic>;
     var lang = bind.mainGetLocalOption(key: "lang");
     dialogManager.show((setState, close, context) {
-      setLang(v) {
+      setLang(v) async {
         if (lang != v) {
           setState(() {
             lang = v;
           });
-          bind.mainSetLocalOption(key: "lang", value: v);
+          await bind.mainSetLocalOption(key: "lang", value: v);
           HomePage.homeKey.currentState?.refreshPages();
           Future.delayed(Duration(milliseconds: 200), close);
         }