From 11189455ed6150c8fb3b152c1b723731a9f5d635 Mon Sep 17 00:00:00 2001 From: PartyDonut Date: Fri, 7 Feb 2025 16:56:50 +0100 Subject: [PATCH] fix: Sorting of items in option dialog fix: Translation of sizes --- .../settings/client_sections/client_settings_advanced.dart | 2 +- lib/util/option_dialogue.dart | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/screens/settings/client_sections/client_settings_advanced.dart b/lib/screens/settings/client_sections/client_settings_advanced.dart index c4465fa..a0f1272 100644 --- a/lib/screens/settings/client_sections/client_settings_advanced.dart +++ b/lib/screens/settings/client_sections/client_settings_advanced.dart @@ -26,7 +26,7 @@ List buildClientSettingsAdvanced(BuildContext context, WidgetRef ref) { contentPadding: EdgeInsets.zero, value: selected, onChanged: (value) => tap(), - title: Text(type.name), + title: Text(type.label(context)), ), ); ref.read(homeSettingsProvider.notifier).setViewSize(newItems.toSet()); diff --git a/lib/util/option_dialogue.dart b/lib/util/option_dialogue.dart index 88acdfa..9544e6c 100644 --- a/lib/util/option_dialogue.dart +++ b/lib/util/option_dialogue.dart @@ -1,3 +1,5 @@ +import 'dart:collection'; + import 'package:flutter/material.dart'; Future> openMultiSelectOptions( @@ -40,6 +42,10 @@ Future> openMultiSelectOptions( currentSelection = {item}; } }); + currentSelection = SplayTreeSet.of( + currentSelection, + (a, b) => items.indexOf(a).compareTo(items.indexOf(b)), + ); onChanged?.call(currentSelection.toList()); }, );