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

2025-12-10 16:07:58 -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/home/view/home_shell_widget.dart
+++ b/lib/features/home/view/home_shell_widget.dart
@@ -1,5 +1,4 @@
 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';
@@ -17,14 +16,9 @@ import 'package:paperless_mobile/features/documents/cubit/documents_cubit.dart';
 import 'package:paperless_mobile/features/home/view/model/api_version.dart';
 import 'package:paperless_mobile/features/inbox/cubit/inbox_cubit.dart';
 import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
-import 'package:paperless_mobile/features/login/cubit/authentication_cubit.dart';
 import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart';
 import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart';
 import 'package:paperless_mobile/features/tasks/cubit/task_status_cubit.dart';
-import 'package:paperless_mobile/routes/typed/branches/landing_route.dart';
-import 'package:paperless_mobile/routes/typed/top_level/login_route.dart';
-import 'package:paperless_mobile/routes/typed/top_level/switching_accounts_route.dart';
-import 'package:paperless_mobile/routes/typed/top_level/verify_identity_route.dart';
 import 'package:provider/provider.dart';

 class HomeShellWidget extends StatelessWidget {
--- a/lib/features/home/view/scaffold_with_navigation_bar.dart
+++ b/lib/features/home/view/scaffold_with_navigation_bar.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/features/app_drawer/view/app_drawer.dart';
 import 'package:paperless_mobile/features/inbox/cubit/inbox_cubit.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
+import 'package:paperless_mobile/theme.dart';

 const _landingPage = 0;
 const _documentsIndex = 1;
@@ -28,96 +30,105 @@ class ScaffoldWithNavigationBar extends StatefulWidget {

 class ScaffoldWithNavigationBarState extends State<ScaffoldWithNavigationBar> {
  @override
-  Widget build(BuildContext context) {
-    final primaryColor = Theme.of(context).colorScheme.primary;
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+  }

-    return Scaffold(
-      drawer: const AppDrawer(),
-      bottomNavigationBar: NavigationBar(
-        selectedIndex: widget.navigationShell.currentIndex,
-        onDestinationSelected: (index) {
-          widget.navigationShell.goBranch(
-            index,
-            initialLocation: index == widget.navigationShell.currentIndex,
-          );
-        },
-        destinations: [
-          NavigationDestination(
-            icon: const Icon(Icons.home_outlined),
-            selectedIcon: Icon(
-              Icons.home,
-              color: primaryColor,
-            ),
-            label: "Home", //TODO: INTL
-          ),
-          _toggleDestination(
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: buildOverlayStyle(theme),
+      child: Scaffold(
+        drawer: const AppDrawer(),
+        bottomNavigationBar: NavigationBar(
+          elevation: 3,
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          selectedIndex: widget.navigationShell.currentIndex,
+          onDestinationSelected: (index) {
+            widget.navigationShell.goBranch(
+              index,
+              initialLocation: index == widget.navigationShell.currentIndex,
+            );
+          },
+          destinations: [
            NavigationDestination(
-              icon: const Icon(Icons.description_outlined),
+              icon: const Icon(Icons.home_outlined),
              selectedIcon: Icon(
-                Icons.description,
-                color: primaryColor,
+                Icons.home,
+                color: theme.colorScheme.primary,
              ),
-              label: S.of(context)!.documents,
+              label: S.of(context)!.home, 
            ),
-            disableWhen: !widget.authenticatedUser.canViewDocuments,
-          ),
-          _toggleDestination(
-            NavigationDestination(
-              icon: const Icon(Icons.document_scanner_outlined),
-              selectedIcon: Icon(
-                Icons.document_scanner,
-                color: primaryColor,
+            _toggleDestination(
+              NavigationDestination(
+                icon: const Icon(Icons.description_outlined),
+                selectedIcon: Icon(
+                  Icons.description,
+                  color: theme.colorScheme.primary,
+                ),
+                label: S.of(context)!.documents,
              ),
-              label: S.of(context)!.scanner,
+              disableWhen: !widget.authenticatedUser.canViewDocuments,
            ),
-            disableWhen: !widget.authenticatedUser.canCreateDocuments,
-          ),
-          _toggleDestination(
-            NavigationDestination(
-              icon: const Icon(Icons.sell_outlined),
-              selectedIcon: Icon(
-                Icons.sell,
-                color: primaryColor,
+            _toggleDestination(
+              NavigationDestination(
+                icon: const Icon(Icons.document_scanner_outlined),
+                selectedIcon: Icon(
+                  Icons.document_scanner,
+                  color: theme.colorScheme.primary,
+                ),
+                label: S.of(context)!.scanner,
              ),
-              label: S.of(context)!.labels,
+              disableWhen: !widget.authenticatedUser.canCreateDocuments,
            ),
-            disableWhen: !widget.authenticatedUser.canViewAnyLabel,
-          ),
-          _toggleDestination(
-            NavigationDestination(
-              icon: Builder(
-                builder: (context) {
-                  return BlocBuilder<InboxCubit, InboxState>(
-                    builder: (context, state) {
-                      return Badge.count(
-                        isLabelVisible: state.itemsInInboxCount > 0,
-                        count: state.itemsInInboxCount,
-                        child: const Icon(Icons.inbox_outlined),
-                      );
-                    },
-                  );
-                },
+            _toggleDestination(
+              NavigationDestination(
+                icon: const Icon(Icons.sell_outlined),
+                selectedIcon: Icon(
+                  Icons.sell,
+                  color: theme.colorScheme.primary,
+                ),
+                label: S.of(context)!.labels,
              ),
-              selectedIcon: BlocBuilder<InboxCubit, InboxState>(
-                builder: (context, state) {
-                  return Badge.count(
-                    isLabelVisible: state.itemsInInboxCount > 0 &&
-                        widget.authenticatedUser.canViewInbox,
-                    count: state.itemsInInboxCount,
-                    child: Icon(
-                      Icons.inbox,
-                      color: primaryColor,
-                    ),
-                  );
-                },
-              ),
-              label: S.of(context)!.inbox,
+              disableWhen: !widget.authenticatedUser.canViewAnyLabel,
            ),
-            disableWhen: !widget.authenticatedUser.canViewInbox,
-          ),
-        ],
+            _toggleDestination(
+              NavigationDestination(
+                icon: Builder(
+                  builder: (context) {
+                    return BlocBuilder<InboxCubit, InboxState>(
+                      builder: (context, state) {
+                        return Badge.count(
+                          isLabelVisible: state.itemsInInboxCount > 0,
+                          count: state.itemsInInboxCount,
+                          child: const Icon(Icons.inbox_outlined),
+                        );
+                      },
+                    );
+                  },
+                ),
+                selectedIcon: BlocBuilder<InboxCubit, InboxState>(
+                  builder: (context, state) {
+                    return Badge.count(
+                      isLabelVisible: state.itemsInInboxCount > 0 &&
+                          widget.authenticatedUser.canViewInbox,
+                      count: state.itemsInInboxCount,
+                      child: Icon(
+                        Icons.inbox,
+                        color: theme.colorScheme.primary,
+                      ),
+                    );
+                  },
+                ),
+                label: S.of(context)!.inbox,
+              ),
+              disableWhen: !widget.authenticatedUser.canViewInbox,
+            ),
+          ],
+        ),
+        body: widget.navigationShell,
      ),
-      body: widget.navigationShell,
    );
  }