mirror of
https://github.com/Xevion/paperless-mobile.git
synced 2025-12-08 14:07:49 -06:00
feat: Add inline suggestion in document search, allow removing history entries
This commit is contained in:
17
lib/core/widgets/dialog_utils/dialog_cancel_button.dart
Normal file
17
lib/core/widgets/dialog_utils/dialog_cancel_button.dart
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/src/widgets/framework.dart';
|
||||||
|
import 'package:flutter/src/widgets/placeholder.dart';
|
||||||
|
import 'package:paperless_mobile/generated/l10n.dart';
|
||||||
|
|
||||||
|
class DialogCancelButton extends StatelessWidget {
|
||||||
|
final void Function()? onTap;
|
||||||
|
const DialogCancelButton({super.key, this.onTap});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return TextButton(
|
||||||
|
child: Text(S.of(context).genericActionCancelLabel),
|
||||||
|
onPressed: onTap ?? () => Navigator.pop(context),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,6 @@ import 'package:hydrated_bloc/hydrated_bloc.dart';
|
|||||||
import 'package:paperless_api/paperless_api.dart';
|
import 'package:paperless_api/paperless_api.dart';
|
||||||
import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
|
import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
|
||||||
import 'package:paperless_mobile/features/paged_document_view/cubit/document_paging_bloc_mixin.dart';
|
import 'package:paperless_mobile/features/paged_document_view/cubit/document_paging_bloc_mixin.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
|
||||||
import 'package:json_annotation/json_annotation.dart';
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
import 'package:paperless_mobile/features/paged_document_view/cubit/paged_documents_state.dart';
|
import 'package:paperless_mobile/features/paged_document_view/cubit/paged_documents_state.dart';
|
||||||
|
|
||||||
@@ -49,6 +48,16 @@ class DocumentSearchCubit extends HydratedCubit<DocumentSearchState>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void removeHistoryEntry(String entry) {
|
||||||
|
emit(
|
||||||
|
state.copyWith(
|
||||||
|
searchHistory: state.searchHistory
|
||||||
|
.whereNot((element) => element == entry)
|
||||||
|
.toList(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> suggest(String query) async {
|
Future<void> suggest(String query) async {
|
||||||
emit(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:collection/collection.dart';
|
import 'package:collection/collection.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
|
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
|
||||||
import 'package:paperless_mobile/features/document_search/cubit/document_search_cubit.dart';
|
import 'package:paperless_mobile/features/document_search/cubit/document_search_cubit.dart';
|
||||||
|
import 'package:paperless_mobile/features/document_search/view/remove_history_entry_dialog.dart';
|
||||||
import 'package:paperless_mobile/features/documents/view/widgets/adaptive_documents_view.dart';
|
import 'package:paperless_mobile/features/documents/view/widgets/adaptive_documents_view.dart';
|
||||||
import 'package:paperless_mobile/generated/l10n.dart';
|
import 'package:paperless_mobile/generated/l10n.dart';
|
||||||
import 'package:paperless_mobile/routes/document_details_route.dart';
|
import 'package:paperless_mobile/routes/document_details_route.dart';
|
||||||
|
import 'dart:math' as math;
|
||||||
|
|
||||||
Future<void> showDocumentSearchPage(BuildContext context) {
|
Future<void> showDocumentSearchPage(BuildContext context) {
|
||||||
return Navigator.of(context).push(
|
return Navigator.of(context).push(
|
||||||
@@ -30,6 +34,9 @@ class DocumentSearchPage extends StatefulWidget {
|
|||||||
|
|
||||||
class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
||||||
final _queryController = TextEditingController(text: '');
|
final _queryController = TextEditingController(text: '');
|
||||||
|
final _queryFocusNode = FocusNode();
|
||||||
|
|
||||||
|
Timer? _debounceTimer;
|
||||||
|
|
||||||
String get query => _queryController.text;
|
String get query => _queryController.text;
|
||||||
@override
|
@override
|
||||||
@@ -47,6 +54,7 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
|||||||
style: theme.textTheme.bodyLarge?.apply(
|
style: theme.textTheme.bodyLarge?.apply(
|
||||||
color: theme.colorScheme.onSurface,
|
color: theme.colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
|
focusNode: _queryFocusNode,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
contentPadding: EdgeInsets.zero,
|
contentPadding: EdgeInsets.zero,
|
||||||
hintStyle: theme.textTheme.bodyLarge?.apply(
|
hintStyle: theme.textTheme.bodyLarge?.apply(
|
||||||
@@ -56,7 +64,12 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
|||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
),
|
),
|
||||||
controller: _queryController,
|
controller: _queryController,
|
||||||
onChanged: context.read<DocumentSearchCubit>().suggest,
|
onChanged: (query) {
|
||||||
|
_debounceTimer?.cancel();
|
||||||
|
_debounceTimer = Timer(const Duration(milliseconds: 700), () {
|
||||||
|
context.read<DocumentSearchCubit>().suggest(query);
|
||||||
|
});
|
||||||
|
},
|
||||||
textInputAction: TextInputAction.search,
|
textInputAction: TextInputAction.search,
|
||||||
onSubmitted: (query) {
|
onSubmitted: (query) {
|
||||||
FocusScope.of(context).unfocus();
|
FocusScope.of(context).unfocus();
|
||||||
@@ -109,7 +122,9 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
|||||||
(context, index) => ListTile(
|
(context, index) => ListTile(
|
||||||
title: Text(historyMatches[index]),
|
title: Text(historyMatches[index]),
|
||||||
leading: const Icon(Icons.history),
|
leading: const Icon(Icons.history),
|
||||||
|
onLongPress: () => _onDeleteHistoryEntry(historyMatches[index]),
|
||||||
onTap: () => _selectSuggestion(historyMatches[index]),
|
onTap: () => _selectSuggestion(historyMatches[index]),
|
||||||
|
trailing: _buildInsertSuggestionButton(historyMatches[index]),
|
||||||
),
|
),
|
||||||
childCount: historyMatches.length,
|
childCount: historyMatches.length,
|
||||||
),
|
),
|
||||||
@@ -127,6 +142,7 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
|||||||
title: Text(suggestions[index]),
|
title: Text(suggestions[index]),
|
||||||
leading: const Icon(Icons.search),
|
leading: const Icon(Icons.search),
|
||||||
onTap: () => _selectSuggestion(suggestions[index]),
|
onTap: () => _selectSuggestion(suggestions[index]),
|
||||||
|
trailing: _buildInsertSuggestionButton(suggestions[index]),
|
||||||
),
|
),
|
||||||
childCount: suggestions.length,
|
childCount: suggestions.length,
|
||||||
),
|
),
|
||||||
@@ -135,6 +151,34 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onDeleteHistoryEntry(String entry) async {
|
||||||
|
final shouldRemove = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => RemoveHistoryEntryDialog(entry: entry),
|
||||||
|
) ??
|
||||||
|
false;
|
||||||
|
if (shouldRemove) {
|
||||||
|
context.read<DocumentSearchCubit>().removeHistoryEntry(entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildInsertSuggestionButton(String suggestion) {
|
||||||
|
return Transform(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
transform: Matrix4.rotationY(math.pi),
|
||||||
|
child: IconButton(
|
||||||
|
icon: Icon(Icons.arrow_outward),
|
||||||
|
onPressed: () {
|
||||||
|
_queryController.text = '$suggestion ';
|
||||||
|
_queryController.selection = TextSelection.fromPosition(
|
||||||
|
TextPosition(offset: _queryController.text.length),
|
||||||
|
);
|
||||||
|
_queryFocusNode.requestFocus();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Widget _buildResultsView(DocumentSearchState state) {
|
Widget _buildResultsView(DocumentSearchState state) {
|
||||||
final header = Text(
|
final header = Text(
|
||||||
S.of(context).documentSearchResults,
|
S.of(context).documentSearchResults,
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:paperless_mobile/core/widgets/dialog_utils/dialog_cancel_button.dart';
|
||||||
|
import 'package:paperless_mobile/generated/l10n.dart';
|
||||||
|
|
||||||
|
class RemoveHistoryEntryDialog extends StatelessWidget {
|
||||||
|
final String entry;
|
||||||
|
const RemoveHistoryEntryDialog({super.key, required this.entry});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return AlertDialog(
|
||||||
|
title: Text(entry),
|
||||||
|
content: Text(S.of(context).documentSearchRemoveHistoryEntryText),
|
||||||
|
actions: [
|
||||||
|
const DialogCancelButton(),
|
||||||
|
TextButton(
|
||||||
|
child: Text(S.of(context).genericActionRemoveLabel),
|
||||||
|
onPressed: () {
|
||||||
|
Navigator.pop(context, true);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -667,5 +667,7 @@
|
|||||||
"viewTypeGridOption": "Grid",
|
"viewTypeGridOption": "Grid",
|
||||||
"@viewTypeGridOption": {},
|
"@viewTypeGridOption": {},
|
||||||
"viewTypeListOption": "List",
|
"viewTypeListOption": "List",
|
||||||
"@viewTypeListOption": {}
|
"@viewTypeListOption": {},
|
||||||
|
"genericActionRemoveLabel": "Remove",
|
||||||
|
"documentSearchRemoveHistoryEntryText": "Remove query from search history?"
|
||||||
}
|
}
|
||||||
@@ -667,5 +667,7 @@
|
|||||||
"viewTypeGridOption": "Raster",
|
"viewTypeGridOption": "Raster",
|
||||||
"@viewTypeGridOption": {},
|
"@viewTypeGridOption": {},
|
||||||
"viewTypeListOption": "Liste",
|
"viewTypeListOption": "Liste",
|
||||||
"@viewTypeListOption": {}
|
"@viewTypeListOption": {},
|
||||||
|
"genericActionRemoveLabel": "Remove",
|
||||||
|
"documentSearchRemoveHistoryEntryText": "Remove query from search history?"
|
||||||
}
|
}
|
||||||
@@ -667,5 +667,7 @@
|
|||||||
"viewTypeGridOption": "Grid",
|
"viewTypeGridOption": "Grid",
|
||||||
"@viewTypeGridOption": {},
|
"@viewTypeGridOption": {},
|
||||||
"viewTypeListOption": "List",
|
"viewTypeListOption": "List",
|
||||||
"@viewTypeListOption": {}
|
"@viewTypeListOption": {},
|
||||||
|
"genericActionRemoveLabel": "Remove",
|
||||||
|
"documentSearchRemoveHistoryEntryText": "Remove query from search history?"
|
||||||
}
|
}
|
||||||
@@ -667,5 +667,7 @@
|
|||||||
"viewTypeGridOption": "Grid",
|
"viewTypeGridOption": "Grid",
|
||||||
"@viewTypeGridOption": {},
|
"@viewTypeGridOption": {},
|
||||||
"viewTypeListOption": "List",
|
"viewTypeListOption": "List",
|
||||||
"@viewTypeListOption": {}
|
"@viewTypeListOption": {},
|
||||||
|
"genericActionRemoveLabel": "Remove",
|
||||||
|
"documentSearchRemoveHistoryEntryText": "Remove query from search history?"
|
||||||
}
|
}
|
||||||
@@ -667,5 +667,7 @@
|
|||||||
"viewTypeGridOption": "Grid",
|
"viewTypeGridOption": "Grid",
|
||||||
"@viewTypeGridOption": {},
|
"@viewTypeGridOption": {},
|
||||||
"viewTypeListOption": "List",
|
"viewTypeListOption": "List",
|
||||||
"@viewTypeListOption": {}
|
"@viewTypeListOption": {},
|
||||||
|
"genericActionRemoveLabel": "Remove",
|
||||||
|
"documentSearchRemoveHistoryEntryText": "Remove query from search history?"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user