refactor remote menubar with MenuBar for submenu

Signed-off-by: 21pages <pages21@163.com>

flutter/lib/common.dart

@@ -1814,3 +1814,19 @@ class DraggableNeverScrollableScrollPhysics extends ScrollPhysics {
   @override
   bool get allowImplicitScrolling => false;
 }
+
+Widget futureBuilder(
+    {required Future? future, required Widget Function(dynamic data) hasData}) {
+  return FutureBuilder(
+      future: future,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData) {
+          return hasData(snapshot.data!);
+        } else {
+          if (snapshot.hasError) {
+            debugPrint(snapshot.error.toString());
+          }
+          return Container();
+        }
+      });
+}

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -319,7 +319,7 @@ class _GeneralState extends State<_General> {
       bind.mainSetOption(key: 'audio-input', value: device);
     }
 
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       List<String> devices = (await bind.mainGetSoundInputs()).toList();
       if (Platform.isWindows) {
         devices.insert(0, 'System Sound');
@@ -346,7 +346,7 @@ class _GeneralState extends State<_General> {
   }
 
   Widget record(BuildContext context) {
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       String customDirectory =
           await bind.mainGetOption(key: 'video-save-directory');
       String defaultDirectory = await bind.mainDefaultVideoSaveDirectory();
@@ -399,7 +399,7 @@ class _GeneralState extends State<_General> {
   }
 
   Widget language() {
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       String langs = await bind.mainGetLangs();
       String lang = bind.mainGetLocalOption(key: kCommConfKeyLang);
       return {'langs': langs, 'lang': lang};
@@ -487,7 +487,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
 
   Widget _permissions(context, bool stopService) {
     bool enabled = !locked;
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       return await bind.mainGetOption(key: 'access-mode');
     }(), hasData: (data) {
       String accessMode = data! as String;
@@ -744,7 +744,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
     return [
       _OptionCheckBox(context, 'Enable Direct IP Access', 'direct-server',
           update: update, enabled: !locked),
-      _futureBuilder(
+      futureBuilder(
         future: () async {
           String enabled = await bind.mainGetOption(key: 'direct-server');
           String port = await bind.mainGetOption(key: 'direct-access-port');
@@ -805,7 +805,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
 
   Widget whitelist() {
     bool enabled = !locked;
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       return await bind.mainGetOption(key: 'whitelist');
     }(), hasData: (data) {
       RxBool hasWhitelist = (data as String).isNotEmpty.obs;
@@ -931,7 +931,7 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
   }
 
   server(bool enabled) {
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       return await bind.mainGetOptions();
     }(), hasData: (data) {
       // Setting page is not modal, oldOptions should only be used when getting options, never when setting.
@@ -1366,7 +1366,7 @@ class _About extends StatefulWidget {
 class _AboutState extends State<_About> {
   @override
   Widget build(BuildContext context) {
-    return _futureBuilder(future: () async {
+    return futureBuilder(future: () async {
       final license = await bind.mainGetLicense();
       final version = await bind.mainGetVersion();
       final buildDate = await bind.mainGetBuildDate();
@@ -1500,7 +1500,7 @@ Widget _OptionCheckBox(BuildContext context, String label, String key,
     bool enabled = true,
     Icon? checkedIcon,
     bool? fakeValue}) {
-  return _futureBuilder(
+  return futureBuilder(
       future: bind.mainGetOption(key: key),
       hasData: (data) {
         bool value = option2bool(key, data.toString());
@@ -1633,22 +1633,6 @@ Widget _SubLabeledWidget(BuildContext context, String label, Widget child,
   ).marginOnly(left: _kContentHSubMargin);
 }
 
-Widget _futureBuilder(
-    {required Future? future, required Widget Function(dynamic data) hasData}) {
-  return FutureBuilder(
-      future: future,
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData) {
-          return hasData(snapshot.data!);
-        } else {
-          if (snapshot.hasError) {
-            debugPrint(snapshot.error.toString());
-          }
-          return Container();
-        }
-      });
-}
-
 Widget _lock(
   bool locked,
   String label,

src/lang/ca.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "停止语音通话"),
         ("relay_hint_tip", "可能无法直连，可以尝试中继连接。\n另外，如果想直接使用中继连接，可以在 ID 后面添加/r，或者在卡片选项里选择强制走中继连接。"),
         ("Reconnect", "重连"),
+        ("Codec", "编解码"),
+        ("Resolution", "分辨率"),
         ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "Sprachanruf beenden"),
         ("relay_hint_tip", "Wenn eine direkte Verbindung nicht möglich ist, können Sie versuchen, eine Verbindung über einen Relay-Server herzustellen. \nWenn Sie eine Relay-Verbindung beim ersten Versuch herstellen möchten, können Sie das Suffix \"/r\" an die ID anhängen oder die Option \"Immer über Relay-Server verbinden\" auf der Gegenstelle auswählen."),
         ("Reconnect", "Erneut verbinden"),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "Detener llamada de voz"),
         ("relay_hint_tip", "Puede que no sea posible conectar directamente. Puedes tratar de conectar a través de relay. \nAdicionalmente, si quieres usar relay en el primer intento, puedes añadir el sufijo \"/r\" a la ID o seleccionar la opción \"Conectar siempre a través de relay\" en la tarjeta del par."),
         ("Reconnect", "Reconectar"),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "توقف تماس صوتی"),
         ("relay_hint_tip", " را به شناسه اضافه کنید یا گزینه \"همیشه از طریق رله متصل شوید\" را در کارت همتا انتخاب کنید. همچنین، اگر می‌خواهید فوراً از سرور رله استفاده کنید، می‌توانید پسوند \"/r\".\n اتصال مستقیم ممکن است امکان پذیر نباشد. در این صورت می توانید سعی کنید از طریق سرور رله متصل شوید"),
         ("Reconnect", "اتصال مجدد"),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/gr.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "Interrompi la chiamata vocale"),
         ("relay_hint_tip", "Se non è possibile connettersi direttamente, si può provare a farlo tramite relay.\nInoltre, se si desidera utilizzare il relay al primo tentativo, è possibile aggiungere il suffisso \"/r\" all'ID o selezionare l'opzione \"Collegati sempre tramite relay\" nella scheda peer."),
         ("Reconnect", "Riconnetti"),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "Stop spraakoproep"),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/ro.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "Завершить голосовой вызов"),
         ("relay_hint_tip", "Прямое подключение может оказаться невозможным. В этом случае можно попытаться подключиться через сервер ретрансляции. \nКроме того, если вы хотите сразу использовать сервер ретрансляции, можно добавить к ID суффикс  \"/r\" или включить \"Всегда подключаться через ретранслятор\" в настройках удалённого узла."),
         ("Reconnect", "Переподключить"),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/sl.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/sq.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/sr.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/sv.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/th.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", "停止語音聊天"),
         ("relay_hint_tip", "可能無法直連，可以嘗試中繼連接。 \n另外，如果想直接使用中繼連接，可以在ID後面添加/r，或者在卡片選項裡選擇強制走中繼連接。"),
         ("Reconnect", "重連"),
+        ("Codec", "編解碼"),
+        ("Resolution", "分辨率"),
         ].iter().cloned().collect();
 }

src/lang/ua.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }

src/lang/vn.rs

@@ -454,5 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stop voice call", ""),
         ("relay_hint_tip", ""),
         ("Reconnect", ""),
+        ("Codec", ""),
+        ("Resolution", ""),
         ].iter().cloned().collect();
 }