From bb6afad32667b2aed1176969611292edd80751a7 Mon Sep 17 00:00:00 2001 From: ericz Date: Sat, 28 Mar 2026 16:48:36 +0100 Subject: [PATCH] fix set fixed width, and naming. --- lib/screens/contacts_screen.dart | 9 +++------ lib/screens/discovery_screen.dart | 4 ++-- lib/services/ui_view_state_service.dart | 3 ++- lib/utils/contact_filter_types.dart | 2 +- lib/widgets/list_filter_widget.dart | 4 ++-- macos/Flutter/GeneratedPluginRegistrant.swift | 2 ++ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/screens/contacts_screen.dart b/lib/screens/contacts_screen.dart index 24dffad..cb8ddb1 100644 --- a/lib/screens/contacts_screen.dart +++ b/lib/screens/contacts_screen.dart @@ -672,7 +672,7 @@ class _ContactsScreenState extends State : "", ); break; - case ContactTypeFilter.chat: + case ContactTypeFilter.activeChat: hintText = context.l10n.contacts_searchContacts( filteredAndSorted.length, viewState.contactsShowUnreadOnly @@ -694,10 +694,7 @@ class _ContactsScreenState extends State 97.0, double.infinity, ); // allow expansion up to 72% of screen width, but not less than the collapsed width - final searchCollapsedWidth = (screenWidth * 0.22).clamp( - 97.0, - 97.0, - ); //two 48px icon buttons + 1px divider + final searchCollapsedWidth = 97.0; //two 48px icon buttons + 1px divider return Column( children: [ @@ -928,7 +925,7 @@ class _ContactsScreenState extends State return contact.type == advTypeRepeater; case ContactTypeFilter.rooms: return contact.type == advTypeRoom; - case ContactTypeFilter.chat: + case ContactTypeFilter.activeChat: return connector.getMessages(contact).isNotEmpty; } } diff --git a/lib/screens/discovery_screen.dart b/lib/screens/discovery_screen.dart index c4f41cb..0311f06 100644 --- a/lib/screens/discovery_screen.dart +++ b/lib/screens/discovery_screen.dart @@ -306,7 +306,7 @@ class _DiscoveryScreenState extends State { showUnreadOnly ? " ${context.l10n.contacts_unread}" : "", ); break; - case ContactTypeFilter.chat: + case ContactTypeFilter.activeChat: hintText = context.l10n.contacts_searchContacts( filteredAndSorted.length, showUnreadOnly ? " ${context.l10n.contacts_unread}" : "", @@ -430,7 +430,7 @@ class _DiscoveryScreenState extends State { return contact.type == advTypeRepeater; case ContactTypeFilter.rooms: return contact.type == advTypeRoom; - case ContactTypeFilter.chat: + case ContactTypeFilter.activeChat: return false; default: return false; diff --git a/lib/services/ui_view_state_service.dart b/lib/services/ui_view_state_service.dart index 7f2a03a..cb370ad 100644 --- a/lib/services/ui_view_state_service.dart +++ b/lib/services/ui_view_state_service.dart @@ -57,8 +57,9 @@ class UiViewStateService extends ChangeNotifier { final typeStr = prefs.getString(_keyContactsTypeFilter); if (typeStr != null) { + final normalizedTypeStr = typeStr == 'chat' ? 'activeChat' : typeStr; _contactsTypeFilter = ContactTypeFilter.values.firstWhere( - (e) => e.name == typeStr, + (e) => e.name == normalizedTypeStr, orElse: () => ContactTypeFilter.all, ); } diff --git a/lib/utils/contact_filter_types.dart b/lib/utils/contact_filter_types.dart index cdab35f..3d3e222 100644 --- a/lib/utils/contact_filter_types.dart +++ b/lib/utils/contact_filter_types.dart @@ -1,3 +1,3 @@ enum ContactSortOption { lastSeen, recentMessages, name } -enum ContactTypeFilter { all, favorites, users, repeaters, rooms, chat } +enum ContactTypeFilter { all, favorites, users, repeaters, rooms, activeChat } diff --git a/lib/widgets/list_filter_widget.dart b/lib/widgets/list_filter_widget.dart index 4642d80..9866dfc 100644 --- a/lib/widgets/list_filter_widget.dart +++ b/lib/widgets/list_filter_widget.dart @@ -158,9 +158,9 @@ class ContactsFilterMenu extends StatelessWidget { checked: typeFilter == ContactTypeFilter.all, ), SortFilterMenuOption( - value: _TypeFilterAction(ContactTypeFilter.chat), + value: _TypeFilterAction(ContactTypeFilter.activeChat), label: l10n.listFilter_activeChat, - checked: typeFilter == ContactTypeFilter.chat, + checked: typeFilter == ContactTypeFilter.activeChat, ), SortFilterMenuOption( value: _TypeFilterAction(ContactTypeFilter.favorites), diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index ffc8c59..2428a77 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,6 +9,7 @@ import flutter_blue_plus_darwin import flutter_local_notifications import mobile_scanner import package_info_plus +import path_provider_foundation import share_plus import shared_preferences_foundation import sqflite_darwin @@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))