feat: Update translations, finish saved views rework, some other fixes

2025-12-07 07:15:47 -06:00 · 2023-09-22 00:46:24 +02:00
parent f3560f00ea
commit 18ab657932
55 changed files with 2049 additions and 1087 deletions
--- a/lib/features/document_search/cubit/document_search_cubit.dart
+++ b/lib/features/document_search/cubit/document_search_cubit.dart
@@ -24,8 +24,10 @@ class DocumentSearchCubit extends Cubit<DocumentSearchState>
    this.api,
    this.notifier,
    this._userAppState,
-  ) : super(DocumentSearchState(
-            searchHistory: _userAppState.documentSearchHistory)) {
+  ) : super(
+          DocumentSearchState(
+              searchHistory: _userAppState.documentSearchHistory),
+        ) {
    notifier.addListener(
      this,
      onDeleted: remove,
@@ -34,22 +36,25 @@ class DocumentSearchCubit extends Cubit<DocumentSearchState>
  }

  Future<void> search(String query) async {
-    emit(state.copyWith(
-      isLoading: true,
-      suggestions: [],
-      view: SearchView.results,
-    ));
+    final normalizedQuery = query.trim();
+    emit(
+      state.copyWith(
+        isLoading: true,
+        suggestions: [],
+        view: SearchView.results,
+      ),
+    );
    final searchFilter = DocumentFilter(
-      query: TextQuery.extended(query),
+      query: TextQuery.extended(normalizedQuery),
    );

    await updateFilter(filter: searchFilter);
    emit(
      state.copyWith(
        searchHistory: [
-          query,
+          normalizedQuery,
          ...state.searchHistory
-              .whereNot((previousQuery) => previousQuery == query)
+              .whereNot((previousQuery) => previousQuery == normalizedQuery)
        ],
      ),
    );
--- a/lib/features/document_search/view/document_search_bar.dart
+++ b/lib/features/document_search/view/document_search_bar.dart
@@ -21,75 +21,70 @@ class DocumentSearchBar extends StatefulWidget {
 class _DocumentSearchBarState extends State<DocumentSearchBar> {
  @override
  Widget build(BuildContext context) {
-    return Container(
-      margin: EdgeInsets.only(top: 8),
-      child: OpenContainer(
-        transitionDuration: const Duration(milliseconds: 200),
-        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),
-        ),
-        closedBuilder: (_, action) {
-          return InkWell(
-            onTap: action,
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(
-                maxWidth: 720,
-                minWidth: 360,
-                maxHeight: 56,
-                minHeight: 48,
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Flexible(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          IconButton(
-                            icon: const Icon(Icons.menu),
-                            onPressed: Scaffold.of(context).openDrawer,
+    return OpenContainer(
+      transitionDuration: const Duration(milliseconds: 200),
+      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),
+      ),
+      closedBuilder: (_, action) {
+        return InkWell(
+          onTap: action,
+          child: ConstrainedBox(
+            constraints: const BoxConstraints(
+              maxWidth: 720,
+              minWidth: 360,
+              maxHeight: 56,
+              minHeight: 48,
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Flexible(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        IconButton(
+                          icon: const Icon(Icons.menu),
+                          onPressed: Scaffold.of(context).openDrawer,
+                        ),
+                        Flexible(
+                          child: Text(
+                            S.of(context)!.searchDocuments,
+                            style:
+                                Theme.of(context).textTheme.bodyLarge?.copyWith(
+                                      fontWeight: FontWeight.w500,
+                                      color: Theme.of(context).hintColor,
+                                    ),
                          ),
-                          Flexible(
-                            child: Text(
-                              S.of(context)!.searchDocuments,
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .bodyLarge
-                                  ?.copyWith(
-                                    fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).hintColor,
-                                  ),
-                            ),
-                          ),
-                        ],
-                      ),
+                        ),
+                      ],
                    ),
                  ),
-                  _buildUserAvatar(context),
-                ],
-              ),
+                ),
+                _buildUserAvatar(context),
+              ],
            ),
-          );
-        },
-        openBuilder: (_, action) {
-          return Provider(
-            create: (_) => DocumentSearchCubit(
-              context.read(),
-              context.read(),
-              Hive.box<LocalUserAppState>(HiveBoxes.localUserAppState)
-                  .get(context.read<LocalUserAccount>().id)!,
-            ),
-            child: const DocumentSearchPage(),
-          );
-        },
-      ),
+          ),
+        );
+      },
+      openBuilder: (_, action) {
+        return Provider(
+          create: (_) => DocumentSearchCubit(
+            context.read(),
+            context.read(),
+            Hive.box<LocalUserAppState>(HiveBoxes.localUserAppState)
+                .get(context.read<LocalUserAccount>().id)!,
+          ),
+          child: const DocumentSearchPage(),
+        );
+      },
    );
  }

--- a/lib/features/document_search/view/document_search_page.dart
+++ b/lib/features/document_search/view/document_search_page.dart
@@ -4,8 +4,6 @@ import 'dart:math' as math;
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:paperless_mobile/core/navigation/push_routes.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/view/remove_history_entry_dialog.dart';
@@ -188,7 +186,7 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
      children: [
        Text(
          S.of(context)!.results,
-          style: Theme.of(context).textTheme.bodySmall,
+          style: Theme.of(context).textTheme.labelMedium,
        ),
        BlocBuilder<DocumentSearchCubit, DocumentSearchState>(
          builder: (context, state) {
@@ -200,15 +198,15 @@ class _DocumentSearchPageState extends State<DocumentSearchPage> {
          },
        )
      ],
-    ).padded();
+    ).paddedLTRB(16, 8, 8, 8);
    return CustomScrollView(
      slivers: [
        SliverToBoxAdapter(child: header),
        if (state.hasLoaded && !state.isLoading && state.documents.isEmpty)
          SliverToBoxAdapter(
            child: Center(
-              child: Text(S.of(context)!.noMatchesFound),
-            ),
+              child: Text(S.of(context)!.noDocumentsFound),
+            ).paddedOnly(top: 8),
          )
        else
          SliverAdaptiveDocumentsView(
--- a/lib/features/document_search/view/sliver_search_bar.dart
+++ b/lib/features/document_search/view/sliver_search_bar.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hive_flutter/adapters.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/config/hive/hive_config.dart';
@@ -8,6 +9,7 @@ import 'package:paperless_mobile/features/settings/view/manage_accounts_page.dar
 import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart';
 import 'package:paperless_mobile/features/settings/view/widgets/user_avatar.dart';
 import 'package:provider/provider.dart';
+import 'package:sliver_tools/sliver_tools.dart';

 class SliverSearchBar extends StatelessWidget {
  final bool floating;
@@ -22,14 +24,13 @@ class SliverSearchBar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
    if (context.watch<LocalUserAccount>().paperlessUser.canViewDocuments) {
      return SliverAppBar(
-        toolbarHeight: kToolbarHeight,
-        flexibleSpace: Container(
-          margin: const EdgeInsets.symmetric(horizontal: 16.0),
-          child: const DocumentSearchBar(),
-        ),
+        titleSpacing: 8,
        automaticallyImplyLeading: false,
+        title: DocumentSearchBar(),
      );
    } else {
      return SliverAppBar(