Merge remote-tracking branch 'origin/dev' into gps-toggle-in-settings

# Conflicts: # lib/l10n/app_bg.arb # lib/l10n/app_de.arb # lib/l10n/app_es.arb # lib/l10n/app_fr.arb # lib/l10n/app_hu.arb # lib/l10n/app_it.arb # lib/l10n/app_ja.arb # lib/l10n/app_ko.arb # lib/l10n/app_localizations_es.dart # lib/l10n/app_localizations_it.dart # lib/l10n/app_localizations_nl.dart # lib/l10n/app_localizations_pt.dart # lib/l10n/app_localizations_sv.dart # lib/l10n/app_localizations_uk.dart # lib/l10n/app_nl.arb # lib/l10n/app_pl.arb # lib/l10n/app_pt.arb # lib/l10n/app_ru.arb # lib/l10n/app_sk.arb # lib/l10n/app_sl.arb # lib/l10n/app_sv.arb # lib/l10n/app_uk.arb # lib/l10n/app_zh.arb
2026-07-19 23:31:03 +10:00 · 2026-05-08 13:36:16 -07:00
parent dc3325ec46 f501d11ec6
commit dbe0a5411b
77 changed files with 6783 additions and 1002 deletions
@@ -353,9 +353,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
          ),
          ListTile(
            leading: const Icon(Icons.delete_outline, color: Colors.red),
-            title: Text("Delete All Paths"),
+            title: Text(l10n.settings_deleteAllPaths),
            subtitle: Text(
-              "Clear all path data from contacts.",
+              l10n.settings_deleteAllPathsSubtitle,
              style: TextStyle(color: Colors.red[700]),
            ),
            onTap: () => connector.deleteAllPaths(),
@@ -1023,6 +1023,15 @@ void _privacySettings(BuildContext context, MeshCoreConnector connector) {
                },
              ),
              const SizedBox(height: 8),
+              SwitchListTile(
+                title: Text(l10n.settings_multiAck),
+                value: multiAcks == 1,
+                onChanged: (value) {
+                  setDialogState(() => multiAcks = value ? 1 : 0);
+                },
+                contentPadding: EdgeInsets.zero,
+              ),
+              const SizedBox(height: 16),
              DropdownButtonFormField<int>(
                initialValue: telemetryMode,
                decoration: InputDecoration(
@@ -1064,21 +1073,6 @@ void _privacySettings(BuildContext context, MeshCoreConnector connector) {
                  }
                },
              ),
-              const SizedBox(height: 16),
-              Text(
-                l10n.settings_multiAck(multiAcks.toString()),
-                style: Theme.of(context).textTheme.bodyMedium,
-              ),
-              Slider(
-                value: multiAcks.toDouble(),
-                min: 0,
-                max: 2,
-                divisions: 2,
-                label: multiAcks.toString(),
-                onChanged: (value) {
-                  setDialogState(() => multiAcks = value.round());
-                },
-              ),
            ],
          ),
        ),