Merge pull request #3844 from grummbeer/unify-dialog-tiles

Dialogs Mobile. Cleanup dialogs with radio/checkbox tiles.

flutter/lib/common.dart

@@ -1154,25 +1154,32 @@ class AndroidPermissionManager {
   }
 }
 
+// TODO move this to mobile/widgets.
+// Used only for mobile, pages remote, settings, dialog
+// TODO remove argument contentPadding, it’s not used, getToggle() has not
 RadioListTile<T> getRadio<T>(
     String name, T toValue, T curValue, void Function(T?) onChange,
     {EdgeInsetsGeometry? contentPadding}) {
   return RadioListTile<T>(
-    contentPadding: contentPadding,
+    contentPadding: contentPadding ?? EdgeInsets.zero,
+    visualDensity: VisualDensity.compact,
     controlAffinity: ListTileControlAffinity.trailing,
     title: Text(translate(name)),
     value: toValue,
     groupValue: curValue,
     onChanged: onChange,
-    dense: true,
   );
 }
 
+// TODO move this to mobile/widgets.
+// Used only for mobile, pages remote, settings, dialog
 CheckboxListTile getToggle(
     String id, void Function(void Function()) setState, option, name,
     {FFI? ffi}) {
   final opt = bind.sessionGetToggleOptionSync(id: id, arg: option);
   return CheckboxListTile(
+      contentPadding: EdgeInsets.zero,
+      visualDensity: VisualDensity.compact,
       value: opt,
       onChanged: (v) {
         setState(() {
@@ -1182,7 +1189,6 @@ CheckboxListTile getToggle(
           (ffi ?? gFFI).qualityMonitorModel.checkShowQualityMonitor(id);
         }
       },
-      dense: true,
       title: Text(translate(name)));
 }
 

flutter/lib/mobile/pages/remote_page.dart

@@ -696,10 +696,8 @@ class _RemotePageState extends State<RemotePage> {
   //     return CustomAlertDialog(
   //         title: Text(translate('Physical Keyboard Input Mode')),
   //         content: Column(mainAxisSize: MainAxisSize.min, children: [
-  //           getRadio('Legacy mode', 'legacy', current, setMode,
-  //               contentPadding: EdgeInsets.zero),
-  //           getRadio('Map mode', 'map', current, setMode,
-  //               contentPadding: EdgeInsets.zero),
+  //           getRadio('Legacy mode', 'legacy', current, setMode),
+  //           getRadio('Map mode', 'map', current, setMode),
   //         ]));
   //   }, clickMaskDismiss: true);
   // }
@@ -1069,7 +1067,6 @@ void showOptions(
       content: Column(
           mainAxisSize: MainAxisSize.min,
           children: displays + radios + toggles + more),
-      contentPadding: 0,
     );
   }, clickMaskDismiss: true, backDismiss: true);
 }

flutter/lib/mobile/pages/settings_page.dart

@@ -502,19 +502,18 @@ void showLanguageSettings(OverlayDialogManager dialogManager) async {
       }
 
       return CustomAlertDialog(
-          title: SizedBox.shrink(),
-          content: Column(
-            children: [
-                  getRadio('Default', '', lang, setLang),
-                  Divider(color: MyTheme.border),
-                ] +
-                langs.map((e) {
-                  final key = e[0] as String;
-                  final name = e[1] as String;
-                  return getRadio(name, key, lang, setLang);
-                }).toList(),
-          ),
-          actions: []);
+        content: Column(
+          children: [
+                getRadio('Default', '', lang, setLang),
+                Divider(color: MyTheme.border),
+              ] +
+              langs.map((e) {
+                final key = e[0] as String;
+                final name = e[1] as String;
+                return getRadio(name, key, lang, setLang);
+              }).toList(),
+        ),
+      );
     }, backDismiss: true, clickMaskDismiss: true);
   } catch (e) {
     //
@@ -536,14 +535,12 @@ void showThemeSettings(OverlayDialogManager dialogManager) async {
     }
 
     return CustomAlertDialog(
-        title: SizedBox.shrink(),
-        contentPadding: 10,
-        content: Column(children: [
-          getRadio('Light', ThemeMode.light, themeMode, setTheme),
-          getRadio('Dark', ThemeMode.dark, themeMode, setTheme),
-          getRadio('Follow System', ThemeMode.system, themeMode, setTheme)
-        ]),
-        actions: []);
+      content: Column(children: [
+        getRadio('Light', ThemeMode.light, themeMode, setTheme),
+        getRadio('Dark', ThemeMode.dark, themeMode, setTheme),
+        getRadio('Follow System', ThemeMode.system, themeMode, setTheme)
+      ]),
+    );
   }, backDismiss: true, clickMaskDismiss: true);
 }
 

flutter/lib/mobile/widgets/dialog.dart

@@ -128,12 +128,19 @@ void setTemporaryPasswordLengthDialog(
 
     return CustomAlertDialog(
       title: Text(translate("Set one-time password length")),
-      content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children:
-              lengths.map((e) => getRadio(e, e, length, setLength)).toList()),
-      actions: [],
-      contentPadding: 14,
+      content: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: lengths
+              .map(
+                (value) => Row(
+                  children: [
+                    Text(value),
+                    Radio(
+                        value: value, groupValue: length, onChanged: setLength),
+                  ],
+                ),
+              )
+              .toList()),
     );
   }, backDismiss: true, clickMaskDismiss: true);
 }