Bugfixes, finished filter rework

lib/features/scan/view/scanner_page.dart

@@ -9,11 +9,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:mime/mime.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart';
 import 'package:paperless_mobile/core/global/constants.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/repository/provider/label_repositories_provider.dart';
 import 'package:paperless_mobile/core/service/file_service.dart';
 import 'package:paperless_mobile/core/store/local_vault.dart';
+import 'package:paperless_mobile/core/widgets/offline_banner.dart';
 import 'package:paperless_mobile/di_initializer.dart';
 import 'package:paperless_mobile/features/document_upload/cubit/document_upload_cubit.dart';
 import 'package:paperless_mobile/features/document_upload/view/document_upload_preparation_page.dart';
@@ -38,23 +40,28 @@ class _ScannerPageState extends State<ScannerPage>
     with SingleTickerProviderStateMixin {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      drawer: const InfoDrawer(),
-      floatingActionButton: FloatingActionButton(
-        onPressed: () => _openDocumentScanner(context),
-        child: const Icon(Icons.add_a_photo_outlined),
-      ),
-      appBar: _buildAppBar(context),
-      body: Padding(
-        padding: const EdgeInsets.all(8.0),
-        child: _buildBody(),
-      ),
+    return BlocBuilder<ConnectivityCubit, ConnectivityState>(
+      builder: (context, connectedState) {
+        return Scaffold(
+          drawer: const InfoDrawer(),
+          floatingActionButton: FloatingActionButton(
+            onPressed: () => _openDocumentScanner(context),
+            child: const Icon(Icons.add_a_photo_outlined),
+          ),
+          appBar: _buildAppBar(context, connectedState.isConnected),
+          body: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: _buildBody(connectedState.isConnected),
+          ),
+        );
+      },
     );
   }
 
-  AppBar _buildAppBar(BuildContext context) {
+  AppBar _buildAppBar(BuildContext context, bool isConnected) {
     return AppBar(
       title: Text(S.of(context).documentScannerPageTitle),
+      bottom: !isConnected ? const OfflineBanner() : null,
       actions: [
         BlocBuilder<DocumentScannerCubit, List<File>>(
           builder: (context, state) {
@@ -86,7 +93,7 @@ class _ScannerPageState extends State<ScannerPage>
         BlocBuilder<DocumentScannerCubit, List<File>>(
           builder: (context, state) {
             return IconButton(
-              onPressed: state.isEmpty
+              onPressed: state.isEmpty || !isConnected
                   ? null
                   : () => _onPrepareDocumentUpload(context),
               icon: const Icon(Icons.done),
@@ -127,35 +134,39 @@ class _ScannerPageState extends State<ScannerPage>
       BlocProvider.of<DocumentScannerCubit>(context).state,
     );
     final bytes = await doc.save();
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (_) => LabelRepositoriesProvider(
-          child: BlocProvider(
-            create: (context) => DocumentUploadCubit(
-              localVault: getIt<LocalVault>(),
-              documentApi: getIt<PaperlessDocumentsApi>(),
-              correspondentRepository:
-                  RepositoryProvider.of<LabelRepository<Correspondent>>(
-                context,
+    final uploaded = await Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (_) => LabelRepositoriesProvider(
+              child: BlocProvider(
+                create: (context) => DocumentUploadCubit(
+                  localVault: getIt<LocalVault>(),
+                  documentApi: getIt<PaperlessDocumentsApi>(),
+                  correspondentRepository:
+                      RepositoryProvider.of<LabelRepository<Correspondent>>(
+                    context,
+                  ),
+                  documentTypeRepository:
+                      RepositoryProvider.of<LabelRepository<DocumentType>>(
+                    context,
+                  ),
+                  tagRepository: RepositoryProvider.of<LabelRepository<Tag>>(
+                    context,
+                  ),
+                ),
+                child: DocumentUploadPreparationPage(
+                  fileBytes: bytes,
+                ),
               ),
-              documentTypeRepository:
-                  RepositoryProvider.of<LabelRepository<DocumentType>>(
-                context,
-              ),
-              tagRepository: RepositoryProvider.of<LabelRepository<Tag>>(
-                context,
-              ),
-            ),
-            child: DocumentUploadPreparationPage(
-              fileBytes: bytes,
             ),
           ),
-        ),
-      ),
-    );
+        ) ??
+        false;
+    if (uploaded) {
+      BlocProvider.of<DocumentScannerCubit>(context).reset();
+    }
   }
 
-  Widget _buildBody() {
+  Widget _buildBody(bool isConnected) {
     return BlocBuilder<DocumentScannerCubit, List<File>>(
       builder: (context, scans) {
         if (scans.isNotEmpty) {
@@ -181,7 +192,7 @@ class _ScannerPageState extends State<ScannerPage>
                   child: Text(S
                       .of(context)
                       .documentScannerPageUploadFromThisDeviceButtonLabel),
-                  onPressed: _onUploadFromFilesystem,
+                  onPressed: isConnected ? _onUploadFromFilesystem : null,
                 ),
               ],
             ),
@@ -195,7 +206,7 @@ class _ScannerPageState extends State<ScannerPage>
     return GridView.builder(
         itemCount: scans.length,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 2,
+          crossAxisCount: 3,
           childAspectRatio: 1 / sqrt(2),
           crossAxisSpacing: 10,
           mainAxisSpacing: 10,

lib/features/scan/view/widgets/grid_image_item_widget.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:photo_view/photo_view.dart';
 
 typedef DeleteCallback = void Function();
@@ -28,7 +29,6 @@ class GridImageItemWidget extends StatefulWidget {
 }
 
 class _GridImageItemWidgetState extends State<GridImageItemWidget> {
-  bool isProcessing = false;
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
@@ -37,70 +37,86 @@ class _GridImageItemWidgetState extends State<GridImageItemWidget> {
     );
   }
 
-  Card _buildImageItem(BuildContext context) {
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.only(bottom: 8.0),
+  Widget _buildImageItem(BuildContext context) {
+    final borderRadius = BorderRadius.circular(12);
+    return ClipRRect(
+      child: Card(
+        shape: RoundedRectangleBorder(
+          borderRadius: borderRadius,
+        ),
+        clipBehavior: Clip.antiAliasWithSaveLayer,
         child: Stack(
+          clipBehavior: Clip.antiAliasWithSaveLayer,
           children: [
-            Align(alignment: Alignment.bottomCenter, child: _buildNumbering()),
             Align(
-              alignment: Alignment.topRight,
-              child: IconButton(
-                onPressed: widget.onDelete,
-                icon: const Icon(Icons.close),
+              alignment: Alignment.topCenter,
+              child: ClipRRect(
+                borderRadius: borderRadius,
+                child: SizedBox(
+                  height: 100,
+                  child: Stack(
+                    children: [
+                      SizedBox(
+                        width: double.infinity,
+                        height: 100,
+                        child: FittedBox(
+                          fit: BoxFit.fill,
+                          clipBehavior: Clip.antiAliasWithSaveLayer,
+                          alignment: Alignment.center,
+                          child: Image.file(
+                            widget.file,
+                          ),
+                        ),
+                      ),
+                      Positioned(
+                        top: 0,
+                        right: 0,
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8.0,
+                            vertical: 4.0,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Theme.of(context).colorScheme.background,
+                            borderRadius: const BorderRadius.only(
+                              bottomLeft: Radius.circular(12),
+                            ),
+                          ),
+                          child: Text(
+                            "${widget.index + 1}/${widget.totalNumberOfFiles}",
+                            style: Theme.of(context).textTheme.caption,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            Align(
+              alignment: Alignment.bottomCenter,
+              child: TextButton(
+                onPressed: widget.onDelete,
+                child: Text("Remove"),
               ),
             ),
-            isProcessing
-                ? _buildIsProcessing()
-                : Align(
-                    alignment: Alignment.center,
-                    child: AspectRatio(
-                      aspectRatio: 4 / 3,
-                      child: Image.file(
-                        widget.file,
-                        fit: BoxFit.contain,
-                      ),
-                    ),
-                  ),
           ],
         ),
       ),
     );
   }
 
-  Center _buildIsProcessing() {
-    return Center(
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.spaceAround,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: const [
-          CircularProgressIndicator(),
-          Text(
-            "Processing transformation...",
-            textAlign: TextAlign.center,
-          ),
-        ],
-      ),
-    );
-  }
-
   void _showImage(BuildContext context) {
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (context) => Scaffold(
           appBar: AppBar(
-            title: _buildNumbering(prefix: "Image"),
+            title: Text(
+                "${S.of(context).scannerPageImagePreviewTitle} ${widget.index + 1}/${widget.totalNumberOfFiles}"),
           ),
           body: PhotoView(imageProvider: FileImage(widget.file)),
         ),
       ),
     );
   }
-
-  Widget _buildNumbering({String? prefix}) {
-    return Text(
-      "${prefix ?? ""} ${widget.index + 1}/${widget.totalNumberOfFiles}",
-    );
-  }
 }