Redesign search

LinwoodDev · Dec 15, 2024 · 6563df8 · 6563df8
1 parent be13d38
commit 6563df8
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 259 deletions.
diff --git a/api/lib/src/helpers/search.dart b/api/lib/src/helpers/search.dart
@@ -33,14 +33,6 @@ sealed class SearchResult with _$SearchResult {
     int index,
   ) = ToolResult;
 
-  String getDisplay() => switch (this) {
-        PageResult e => e.name,
-        ElementResult e => e.text,
-        AreaResult e => e.area.name,
-        WaypointResult e => e.waypoint.name,
-        ToolResult e => e.name,
-      };
-
   String? getPage() => switch (this) {
         PageResult e => e.name,
         ElementResult e => e.page,

diff --git a/app/lib/actions/search.dart b/app/lib/actions/search.dart
diff --git a/app/lib/dialogs/export/general.dart b/app/lib/dialogs/export/general.dart
@@ -260,6 +260,7 @@ class _GeneralExportDialogState extends State<GeneralExportDialog> {
                     _regeneratePreviewImage();
                   },
                   icon: const PhosphorIcon(PhosphorIconsLight.userRectangle),
+                  tooltip: AppLocalizations.of(context).view,
                   selectedIcon:
                       const PhosphorIcon(PhosphorIconsFill.userRectangle),
                   isSelected: _preset == ExportTransformPreset.view,
@@ -289,6 +290,7 @@ class _GeneralExportDialogState extends State<GeneralExportDialog> {
                     _regeneratePreviewImage();
                   },
                   icon: const PhosphorIcon(PhosphorIconsLight.file),
+                  tooltip: AppLocalizations.of(context).page,
                   selectedIcon: const PhosphorIcon(PhosphorIconsFill.file),
                   isSelected: _preset == ExportTransformPreset.page,
                 ),

diff --git a/app/lib/dialogs/search.dart b/app/lib/dialogs/search.dart
diff --git a/app/lib/views/app_bar.dart b/app/lib/views/app_bar.dart
@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:butterfly/actions/change_path.dart';
-import 'package:butterfly/actions/search.dart';
 import 'package:butterfly/actions/settings.dart';
 import 'package:butterfly/actions/svg_export.dart';
 import 'package:butterfly/api/file_system.dart';
@@ -12,6 +11,7 @@ import 'package:butterfly/services/import.dart';
 import 'package:butterfly/services/network.dart';
 import 'package:butterfly/views/edit.dart';
 import 'package:butterfly/visualizer/asset.dart';
+import 'package:butterfly/widgets/search.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -298,14 +298,7 @@ class _AppBarTitleState extends State<_AppBarTitle> {
                       state.location.fileType.icon(PhosphorIconsStyle.light)),
                   tooltip: AppLocalizations.of(context).export,
                   onPressed: () => context.read<ImportService>().export()),
-            IconButton(
-              icon: const PhosphorIcon(PhosphorIconsLight.magnifyingGlass),
-              tooltip: AppLocalizations.of(context).search,
-              onPressed: () {
-                Actions.maybeInvoke<SearchIntent>(
-                    context, SearchIntent(context));
-              },
-            ),
+            SearchButton(),
             if (state.location.path != '' && state.embedding == null) ...[
               IconButton(
                 icon: const PhosphorIcon(PhosphorIconsLight.folder),

diff --git a/app/lib/views/main.dart b/app/lib/views/main.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:butterfly/actions/search.dart';
 import 'package:butterfly/api/close.dart';
 import 'package:butterfly/api/file_system.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
@@ -98,7 +97,6 @@ class _ProjectPageState extends State<ProjectPage> {
     ImageExportIntent: ImageExportAction(),
     PdfExportIntent: PdfExportAction(),
     ExportIntent: ExportAction(),
-    SearchIntent: SearchAction(),
     SettingsIntent: SettingsAction(),
     ColorPaletteIntent: ColorPaletteAction(),
     BackgroundIntent: BackgroundAction(),
@@ -366,9 +364,6 @@ class _ProjectPageState extends State<ProjectPage> {
                                   LogicalKeySet(LogicalKeyboardKey.control,
                                           LogicalKeyboardKey.keyA):
                                       SelectAllIntent(context),
-                                  LogicalKeySet(LogicalKeyboardKey.control,
-                                          LogicalKeyboardKey.keyK):
-                                      SearchIntent(context),
                                   if (widget.embedding == null) ...{
                                     LogicalKeySet(LogicalKeyboardKey.control,
                                             LogicalKeyboardKey.keyE):

diff --git a/app/lib/visualizer/tool.dart b/app/lib/visualizer/tool.dart
@@ -15,6 +15,11 @@ import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 
 extension ToolVisualizer on Tool {
+  String getDisplay(BuildContext context) {
+    if (name.trim().isEmpty) return getLocalizedName(context);
+    return name;
+  }
+
   String getLocalizedName(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return switch (this) {