xevion/paperless-mobile
1
0
Fork 0
mirror of https://github.com/Xevion/paperless-mobile.git synced 2025-12-07 11:15:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update search

Browse Source
This commit is contained in:
Anton Stubenbord
2023-05-25 23:06:48 +02:00
parent 06611e0355
commit a36c96c7bb
6 changed files with 159 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/features/document_search/cubit/document_search_cubit.dart
View File

@@ -87,6 +87,10 @@ class DocumentSearchCubit extends Cubit<DocumentSearchState> with DocumentPaging
}
Future<void> suggest(String query) async {
final normalizedQuery = query.trim();
if (normalizedQuery.isEmpty) {
return;
}
emit(
state.copyWith(
isLoading: true,
@@ -96,10 +100,13 @@ class DocumentSearchCubit extends Cubit<DocumentSearchState> with DocumentPaging
),
);
final suggestions = await api.autocomplete(query);
emit(state.copyWith(
suggestions: suggestions,
isLoading: false,
));
print("Suggestions found: $suggestions");
emit(
state.copyWith(
suggestions: suggestions,
isLoading: false,
),
);
}
void reset() {

372
lib/features/document_search/view/document_search_bar.dart
View File

@@ -1,18 +1,15 @@
import 'dart:async';
import 'dart:math' as math;
import 'package:collection/collection.dart';
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:hive_flutter/adapters.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/config/hive/hive_config.dart';
import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
import 'package:paperless_mobile/core/navigation/push_routes.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/core/database/tables/local_user_app_state.dart';
import 'package:paperless_mobile/core/repository/label_repository.dart';
import 'package:paperless_mobile/core/repository/user_repository.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/selection/view_type_selection_widget.dart';
import 'package:paperless_mobile/features/document_search/view/document_search_page.dart';
import 'package:paperless_mobile/features/home/view/model/api_version.dart';
import 'package:paperless_mobile/features/settings/view/manage_accounts_page.dart';
import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart';
@@ -28,280 +25,113 @@ class DocumentSearchBar extends StatefulWidget {
}
class _DocumentSearchBarState extends State<DocumentSearchBar> {
Timer? _debounceTimer;
final _controller = SearchController();
@override
void initState() {
super.initState();
_controller.addListener(() {
_debounceTimer?.cancel();
_debounceTimer = Timer(const Duration(milliseconds: 500), () {
print("Searching for $query");
context.read<DocumentSearchCubit>().suggest(query);
});
});
}
String get query => _controller.text;
@override
Widget build(BuildContext context) {
return Theme(
data: Theme.of(context).copyWith(
inputDecorationTheme: const InputDecorationTheme(),
return OpenContainer(
transitionType: ContainerTransitionType.fadeThrough,
closedElevation: 1,
middleColor: Theme.of(context).colorScheme.surfaceVariant,
openColor: Theme.of(context).colorScheme.background,
closedColor: Theme.of(context).colorScheme.surfaceVariant,
closedShape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(56),
),
child: BlocBuilder<DocumentSearchCubit, DocumentSearchState>(
builder: (context, state) {
return Padding(
padding: const EdgeInsets.only(top: 4),
child: SearchAnchor(
searchController: _controller,
viewHintText: S.of(context)!.searchDocuments,
builder: (context, controller) {
return SearchBar(
focusNode: FocusNode(),
controller: controller,
leading: IconButton(
icon: const Icon(Icons.menu),
onPressed: Scaffold.of(context).openDrawer,
),
trailing: [
IconButton(
icon: GlobalSettingsBuilder(
builder: (context, settings) {
return ValueListenableBuilder(
valueListenable:
Hive.box<LocalUserAccount>(HiveBoxes.localUserAccount).listenable(),
builder: (context, box, _) {
final account = box.get(settings.currentLoggedInUser!)!;
return UserAvatar(
userId: settings.currentLoggedInUser!,
account: account,
);
},
);
},
),
onPressed: () {
final apiVersion = context.read<ApiVersion>();
showDialog(
context: context,
builder: (context) => Provider.value(
value: apiVersion,
child: const ManageAccountsPage(),
closedBuilder: (_, action) {
return InkWell(
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 720,
minWidth: 360,
maxHeight: 56,
minHeight: 48,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Row(
children: [
IconButton(
icon: Icon(Icons.menu),
onPressed: Scaffold.of(context).openDrawer,
),
Expanded(
child: Hero(
tag: "search_hero_tag",
child: TextField(
enabled: false,
decoration: InputDecoration(
border: InputBorder.none,
hintText: S.of(context)!.searchDocuments,
hintStyle: TextStyle(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
),
);
},
),
],
),
],
hintText: S.of(context)!.searchDocuments,
onTap: () {
controller.openView().then((value) => FocusScope.of(context).unfocus());
},
);
},
suggestionsBuilder: (context, controller) {
switch (state.view) {
case SearchView.suggestions:
return _buildSuggestionItems(state);
case SearchView.results:
return _buildResultsList(state);
}
},
),
);
return SearchAnchor.bar(
barPadding: MaterialStatePropertyAll(EdgeInsets.only(left: 8, right: 0)),
viewLeading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
// FocusManager.instance.primaryFocus?.unfocus();
_controller.clear();
_controller.closeView(null);
Future.delayed(const Duration(milliseconds: 100), () {
FocusManager.instance.primaryFocus?.unfocus();
});
},
),
searchController: _controller,
barLeading: IconButton(
icon: const Icon(Icons.menu),
onPressed: Scaffold.of(context).openDrawer,
),
barHintText: S.of(context)!.searchDocuments,
barTrailing: [
IconButton(
icon: GlobalSettingsBuilder(
builder: (context, settings) {
return ValueListenableBuilder(
valueListenable:
Hive.box<LocalUserAccount>(HiveBoxes.localUserAccount).listenable(),
builder: (context, box, _) {
final account = box.get(settings.currentLoggedInUser!)!;
return UserAvatar(
userId: settings.currentLoggedInUser!,
account: account,
);
},
);
},
),
),
onPressed: () {
final apiVersion = context.read<ApiVersion>();
showDialog(
context: context,
builder: (context) => Provider.value(
value: apiVersion,
child: const ManageAccountsPage(),
),
);
},
),
],
suggestionsBuilder: (context, controller) {
switch (state.view) {
case SearchView.suggestions:
return _buildSuggestionItems(state);
case SearchView.results:
return _buildResultsList(state);
}
},
);
},
),
);
}
Iterable<Widget> _buildSuggestionItems(DocumentSearchState state) sync* {
final suggestions =
state.suggestions.whereNot((element) => state.searchHistory.contains(element));
final historyMatches = state.searchHistory.where((element) => element.startsWith(query));
for (var match in historyMatches.take(5)) {
yield ListTile(
title: Text(match),
leading: const Icon(Icons.history),
onLongPress: () => _onDeleteHistoryEntry(match),
onTap: () => _selectSuggestion(match),
trailing: _buildInsertSuggestionButton(match),
);
}
for (var suggestion in suggestions) {
yield ListTile(
title: Text(suggestion),
leading: const Icon(Icons.search),
onTap: () => _selectSuggestion(suggestion),
trailing: _buildInsertSuggestionButton(suggestion),
);
}
}
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: const Icon(Icons.arrow_outward),
onPressed: () {
_controller.text = '$suggestion ';
_controller.selection = TextSelection.fromPosition(
TextPosition(offset: _controller.text.length),
);
},
),
);
}
Iterable<Widget> _buildResultsList(DocumentSearchState state) sync* {
if (state.hasLoaded && !state.isLoading && state.documents.isEmpty) {
yield Center(
child: Text(S.of(context)!.noMatchesFound),
);
return;
}
yield DefaultAdaptiveDocumentsView(
viewType: state.viewType,
documents: state.documents,
hasInternetConnection: true,
isLabelClickable: false,
isLoading: state.isLoading,
hasLoaded: state.hasLoaded,
enableHeroAnimation: false,
onTap: (document) {
pushDocumentDetailsRoute(
context,
document: document,
isLabelClickable: false,
_buildUserAvatar(context),
],
),
),
);
},
openBuilder: (_, action) {
return MultiProvider(
providers: [
Provider.value(value: context.read<LabelRepository>()),
Provider.value(value: context.read<PaperlessDocumentsApi>()),
Provider.value(value: context.read<CacheManager>()),
Provider.value(value: context.read<ApiVersion>()),
Provider.value(value: context.read<UserRepository>()),
],
child: Provider(
create: (_) => DocumentSearchCubit(
context.read(),
context.read(),
context.read(),
Hive.box<LocalUserAppState>(HiveBoxes.localUserAppState)
.get(LocalUserAccount.current.id)!,
),
builder: (_, __) => const DocumentSearchPage(),
),
);
},
);
}
Widget _buildResultsView(DocumentSearchState state) {
final header = Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
S.of(context)!.results,
style: Theme.of(context).textTheme.bodySmall,
),
BlocBuilder<DocumentSearchCubit, DocumentSearchState>(
builder: (context, state) {
return ViewTypeSelectionWidget(
viewType: state.viewType,
onChanged: (type) => context.read<DocumentSearchCubit>().updateViewType(type),
);
},
)
],
).padded();
return CustomScrollView(
slivers: [
SliverToBoxAdapter(child: header),
if (state.hasLoaded && !state.isLoading && state.documents.isEmpty)
SliverToBoxAdapter(
child: Center(
child: Text(S.of(context)!.noMatchesFound),
),
)
else
SliverAdaptiveDocumentsView(
viewType: state.viewType,
documents: state.documents,
hasInternetConnection: true,
isLabelClickable: false,
isLoading: state.isLoading,
hasLoaded: state.hasLoaded,
enableHeroAnimation: false,
onTap: (document) {
pushDocumentDetailsRoute(
context,
document: document,
isLabelClickable: false,
IconButton _buildUserAvatar(BuildContext context) {
return IconButton(
icon: GlobalSettingsBuilder(
builder: (context, settings) {
return ValueListenableBuilder(
valueListenable: Hive.box<LocalUserAccount>(HiveBoxes.localUserAccount).listenable(),
builder: (context, box, _) {
final account = box.get(settings.currentLoggedInUser!)!;
return UserAvatar(
userId: settings.currentLoggedInUser!,
account: account,
);
},
)
],
);
},
),
onPressed: () {
final apiVersion = context.read<ApiVersion>();
showDialog(
context: context,
builder: (context) => Provider.value(
value: apiVersion,
child: const ManageAccountsPage(),
),
);
},
);
}
void _selectSuggestion(String suggestion) {
_controller.text = suggestion;
context.read<DocumentSearchCubit>().search(suggestion);
FocusScope.of(context).unfocus();
}
}

86
lib/features/document_search/view/document_search_page.dart
View File

@@ -32,38 +32,38 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
backgroundColor: theme.colorScheme.surface,
backgroundColor: theme.colorScheme.surfaceVariant,
toolbarHeight: 72,
leading: BackButton(
color: theme.colorScheme.onSurface,
color: theme.colorScheme.onSurfaceVariant,
),
title: TextField(
autofocus: true,
style: theme.textTheme.bodyLarge?.apply(
color: theme.colorScheme.onSurface,
),
focusNode: _queryFocusNode,
decoration: InputDecoration(
contentPadding: EdgeInsets.zero,
hintStyle: theme.textTheme.bodyLarge?.apply(
color: theme.colorScheme.onSurfaceVariant,
title: Hero(
tag: "search_hero_tag",
child: TextField(
autofocus: true,
// style: theme.textTheme.bodyLarge?.apply(
// color: theme.colorScheme.onSurface,
// ),
focusNode: _queryFocusNode,
decoration: InputDecoration(
contentPadding: EdgeInsets.zero,
hintText: S.of(context)!.searchDocuments,
border: InputBorder.none,
),
hintText: S.of(context)!.searchDocuments,
border: InputBorder.none,
controller: _queryController,
onChanged: (query) {
_debounceTimer?.cancel();
_debounceTimer = Timer(const Duration(milliseconds: 500), () {
context.read<DocumentSearchCubit>().suggest(query);
});
},
textInputAction: TextInputAction.search,
onSubmitted: (query) {
FocusScope.of(context).unfocus();
_debounceTimer?.cancel();
context.read<DocumentSearchCubit>().search(query);
},
),
controller: _queryController,
onChanged: (query) {
_debounceTimer?.cancel();
_debounceTimer = Timer(const Duration(milliseconds: 500), () {
context.read<DocumentSearchCubit>().suggest(query);
});
},
textInputAction: TextInputAction.search,
onSubmitted: (query) {
FocusScope.of(context).unfocus();
_debounceTimer?.cancel();
context.read<DocumentSearchCubit>().search(query);
},
),
actions: [
IconButton(
@@ -75,22 +75,22 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
},
).padded(),
],
bottom: PreferredSize(
preferredSize: const Size.fromHeight(1),
child: Divider(
color: theme.colorScheme.outline,
),
),
),
body: BlocBuilder<DocumentSearchCubit, DocumentSearchState>(
builder: (context, state) {
switch (state.view) {
case SearchView.suggestions:
return _buildSuggestionsView(state);
case SearchView.results:
return _buildResultsView(state);
}
},
body: Column(
children: [
Expanded(
child: BlocBuilder<DocumentSearchCubit, DocumentSearchState>(
builder: (context, state) {
switch (state.view) {
case SearchView.suggestions:
return _buildSuggestionsView(state);
case SearchView.results:
return _buildResultsView(state);
}
},
),
),
],
),
);
}
@@ -134,7 +134,7 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
),
childCount: suggestions.length,
),
)
),
],
);
}