Fixed saved view model, slightly changed sorting dialog, fixed open document in system viewer not working because file has folder-like structure.

lib/features/documents/view/widgets/search/sort_field_selection_bottom_sheet.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/translation/sort_field_localization_mapper.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/labels/bloc/label_cubit.dart';
 import 'package:paperless_mobile/features/labels/bloc/label_state.dart';
@@ -8,9 +10,9 @@ import 'package:paperless_mobile/generated/l10n.dart';
 
 class SortFieldSelectionBottomSheet extends StatefulWidget {
   final SortOrder initialSortOrder;
-  final SortField initialSortField;
+  final SortField? initialSortField;
 
-  final Future Function(SortField field, SortOrder order) onSubmit;
+  final Future Function(SortField? field, SortOrder order) onSubmit;
 
   const SortFieldSelectionBottomSheet({
     super.key,
@@ -26,7 +28,7 @@ class SortFieldSelectionBottomSheet extends StatefulWidget {
 
 class _SortFieldSelectionBottomSheetState
     extends State<SortFieldSelectionBottomSheet> {
-  late SortField _currentSortField;
+  late SortField? _currentSortField;
   late SortOrder _currentSortOrder;
 
   @override
@@ -39,61 +41,90 @@ class _SortFieldSelectionBottomSheetState
   @override
   Widget build(BuildContext context) {
     return ClipRRect(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                S.of(context).documentsPageOrderByLabel,
-                style: Theme.of(context).textTheme.bodySmall,
-                textAlign: TextAlign.start,
-              ),
-              TextButton(
-                child: Text(S.of(context).documentFilterApplyFilterLabel),
-                onPressed: () {
-                  widget.onSubmit(
-                    _currentSortField,
-                    _currentSortOrder,
-                  );
-                  Navigator.pop(context);
-                },
-              ),
-            ],
-          ).paddedSymmetrically(horizontal: 16, vertical: 8.0),
-          Column(
-            children: [
-              _buildSortOption(SortField.archiveSerialNumber),
-              BlocBuilder<LabelCubit<Correspondent>, LabelState<Correspondent>>(
-                builder: (context, state) {
-                  return _buildSortOption(
-                    SortField.correspondentName,
-                    enabled: state.labels.values.fold<bool>(
-                        false,
-                        (previousValue, element) =>
-                            previousValue || (element.documentCount ?? 0) > 0),
-                  );
-                },
-              ),
-              _buildSortOption(SortField.title),
-              BlocBuilder<LabelCubit<DocumentType>, LabelState<DocumentType>>(
-                builder: (context, state) {
-                  return _buildSortOption(
-                    SortField.documentType,
-                    enabled: state.labels.values.fold<bool>(
-                        false,
-                        (previousValue, element) =>
-                            previousValue || (element.documentCount ?? 0) > 0),
-                  );
-                },
-              ),
-              _buildSortOption(SortField.created),
-              _buildSortOption(SortField.added),
-              _buildSortOption(SortField.modified),
-            ],
-          ),
-        ],
+      child: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  S.of(context).documentsPageOrderByLabel,
+                  style: Theme.of(context).textTheme.bodySmall,
+                  textAlign: TextAlign.start,
+                ),
+                TextButton(
+                  child: Text(S.of(context).documentFilterApplyFilterLabel),
+                  onPressed: () {
+                    widget.onSubmit(
+                      _currentSortField,
+                      _currentSortOrder,
+                    );
+                    Navigator.pop(context);
+                  },
+                ),
+              ],
+            ).paddedOnly(left: 16, right: 16, top: 8),
+            Column(
+              children: [
+                _buildSortOption(SortField.archiveSerialNumber),
+                BlocBuilder<LabelCubit<Correspondent>,
+                    LabelState<Correspondent>>(
+                  builder: (context, state) {
+                    return _buildSortOption(
+                      SortField.correspondentName,
+                      enabled: state.labels.values.fold<bool>(
+                          false,
+                          (previousValue, element) =>
+                              previousValue ||
+                              (element.documentCount ?? 0) > 0),
+                    );
+                  },
+                ),
+                _buildSortOption(SortField.title),
+                BlocBuilder<LabelCubit<DocumentType>, LabelState<DocumentType>>(
+                  builder: (context, state) {
+                    return _buildSortOption(
+                      SortField.documentType,
+                      enabled: state.labels.values.fold<bool>(
+                          false,
+                          (previousValue, element) =>
+                              previousValue ||
+                              (element.documentCount ?? 0) > 0),
+                    );
+                  },
+                ),
+                _buildSortOption(SortField.created),
+                _buildSortOption(SortField.added),
+                _buildSortOption(SortField.modified),
+                const SizedBox(height: 16),
+                Center(
+                  child: SegmentedButton(
+                    multiSelectionEnabled: false,
+                    showSelectedIcon: false,
+                    segments: [
+                      ButtonSegment(
+                        icon: const FaIcon(FontAwesomeIcons.arrowDownAZ),
+                        value: SortOrder.descending,
+                        label: Text(S.of(context).sortDocumentDescending),
+                      ),
+                      ButtonSegment(
+                        icon: const FaIcon(FontAwesomeIcons.arrowUpZA),
+                        value: SortOrder.ascending,
+                        label: Text(S.of(context).sortDocumentAscending),
+                      ),
+                    ],
+                    emptySelectionAllowed: false,
+                    selected: {_currentSortOrder},
+                    onSelectionChanged: (selection) {
+                      setState(() => _currentSortOrder = selection.first);
+                    },
+                  ),
+                ).paddedOnly(bottom: 16),
+              ],
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -101,47 +132,10 @@ class _SortFieldSelectionBottomSheetState
   Widget _buildSortOption(SortField field, {bool enabled = true}) {
     return ListTile(
       enabled: enabled,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 32),
-      title: Text(
-        _localizedSortField(field),
-      ),
-      trailing: _currentSortField == field
-          ? _buildOrderIcon(_currentSortOrder)
-          : null,
-      onTap: () {
-        setState(() {
-          _currentSortOrder = (_currentSortField == field
-              ? _currentSortOrder.toggle()
-              : SortOrder.descending);
-          _currentSortField = field;
-        });
-      },
+      contentPadding: const EdgeInsets.only(left: 32, right: 16),
+      title: Text(translateSortField(context, field)),
+      trailing: _currentSortField == field ? const Icon(Icons.done) : null,
+      onTap: () => setState(() => _currentSortField = field),
     );
   }
-
-  Widget _buildOrderIcon(SortOrder order) {
-    if (order == SortOrder.ascending) {
-      return const Icon(Icons.arrow_upward);
-    }
-    return const Icon(Icons.arrow_downward);
-  }
-
-  String _localizedSortField(SortField sortField) {
-    switch (sortField) {
-      case SortField.archiveSerialNumber:
-        return S.of(context).documentArchiveSerialNumberPropertyShortLabel;
-      case SortField.correspondentName:
-        return S.of(context).documentCorrespondentPropertyLabel;
-      case SortField.title:
-        return S.of(context).documentTitlePropertyLabel;
-      case SortField.documentType:
-        return S.of(context).documentDocumentTypePropertyLabel;
-      case SortField.created:
-        return S.of(context).documentCreatedPropertyLabel;
-      case SortField.added:
-        return S.of(context).documentAddedPropertyLabel;
-      case SortField.modified:
-        return S.of(context).documentModifiedPropertyLabel;
-    }
-  }
 }

lib/features/documents/view/widgets/sort_documents_button.dart

@@ -16,60 +16,55 @@ class SortDocumentsButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return IconButton(
       icon: const Icon(Icons.sort),
-      onPressed: () => _onOpenSortBottomSheet(context),
-    );
-  }
-
-  void _onOpenSortBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      elevation: 2,
-      context: context,
-      isScrollControlled: true,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(16),
-          topRight: Radius.circular(16),
-        ),
-      ),
-      builder: (_) => BlocProvider<DocumentsCubit>.value(
-        value: context.read<DocumentsCubit>(),
-        child: FractionallySizedBox(
-          heightFactor: .6,
-          child: MultiBlocProvider(
-            providers: [
-              BlocProvider(
-                create: (context) => LabelCubit<DocumentType>(
-                  context.read<
-                      LabelRepository<DocumentType,
-                          DocumentTypeRepositoryState>>(),
-                ),
-              ),
-              BlocProvider(
-                create: (context) => LabelCubit<Correspondent>(
-                  context.read<
-                      LabelRepository<Correspondent,
-                          CorrespondentRepositoryState>>(),
-                ),
-              ),
-            ],
-            child: BlocBuilder<DocumentsCubit, DocumentsState>(
-              builder: (context, state) {
-                return SortFieldSelectionBottomSheet(
-                  initialSortField: state.filter.sortField,
-                  initialSortOrder: state.filter.sortOrder,
-                  onSubmit: (field, order) =>
-                      context.read<DocumentsCubit>().updateCurrentFilter(
-                            (filter) => filter.copyWith(
-                              sortField: field,
-                              sortOrder: order,
-                            ),
-                          ),
-                );
-              },
+      onPressed: () {
+        showModalBottomSheet(
+          elevation: 2,
+          context: context,
+          isScrollControlled: true,
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(16),
+              topRight: Radius.circular(16),
             ),
           ),
-        ),
-      ),
+          builder: (_) => BlocProvider<DocumentsCubit>.value(
+            value: context.read<DocumentsCubit>(),
+            child: MultiBlocProvider(
+              providers: [
+                BlocProvider(
+                  create: (context) => LabelCubit<DocumentType>(
+                    context.read<
+                        LabelRepository<DocumentType,
+                            DocumentTypeRepositoryState>>(),
+                  ),
+                ),
+                BlocProvider(
+                  create: (context) => LabelCubit<Correspondent>(
+                    context.read<
+                        LabelRepository<Correspondent,
+                            CorrespondentRepositoryState>>(),
+                  ),
+                ),
+              ],
+              child: BlocBuilder<DocumentsCubit, DocumentsState>(
+                builder: (context, state) {
+                  return SortFieldSelectionBottomSheet(
+                    initialSortField: state.filter.sortField,
+                    initialSortOrder: state.filter.sortOrder,
+                    onSubmit: (field, order) =>
+                        context.read<DocumentsCubit>().updateCurrentFilter(
+                              (filter) => filter.copyWith(
+                                sortField: field,
+                                sortOrder: order,
+                              ),
+                            ),
+                  );
+                },
+              ),
+            ),
+          ),
+        );
+      },
     );
   }
 }