Resetting filter doesn't reset sorting, some bugfixes and UI updates

lib/features/saved_view/cubit/saved_view_cubit.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:injectable/injectable.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
 import 'package:paperless_mobile/features/saved_view/cubit/saved_view_state.dart';
@@ -12,22 +11,26 @@ class SavedViewCubit extends Cubit<SavedViewState> {
 
   SavedViewCubit(this._repository) : super(SavedViewState(value: {})) {
     _subscription = _repository.savedViews.listen(
-      (savedViews) => emit(state.copyWith(value: savedViews)),
+      (savedViews) {
+        if (savedViews == null) {
+          emit(state.copyWith(isLoaded: false));
+        } else {
+          emit(state.copyWith(value: savedViews, isLoaded: true));
+        }
+      },
     );
   }
 
   void selectView(SavedView? view) {
-    emit(SavedViewState(value: state.value, selectedSavedViewId: view?.id));
+    emit(state.copyWith(
+      selectedSavedViewId: view?.id,
+      overwriteSelectedSavedViewId: true,
+    ));
   }
 
   Future<SavedView> add(SavedView view) async {
     final savedView = await _repository.create(view);
-    emit(
-      SavedViewState(
-        value: {...state.value, savedView.id!: savedView},
-        selectedSavedViewId: state.selectedSavedViewId,
-      ),
-    );
+    emit(state.copyWith(value: {...state.value, savedView.id!: savedView}));
     return savedView;
   }
 
@@ -42,11 +45,16 @@ class SavedViewCubit extends Cubit<SavedViewState> {
   Future<void> initialize() async {
     final views = await _repository.findAll();
     final values = {for (var element in views) element.id!: element};
-    emit(SavedViewState(value: values));
+    emit(SavedViewState(value: values, isLoaded: true));
   }
 
+  Future<void> reload() => initialize();
+
   void resetSelection() {
-    emit(SavedViewState(value: state.value));
+    emit(SavedViewState(
+      value: state.value,
+      isLoaded: true,
+    ));
   }
 
   @override

lib/features/saved_view/cubit/saved_view_state.dart

@@ -2,11 +2,13 @@ import 'package:equatable/equatable.dart';
 import 'package:paperless_api/paperless_api.dart';
 
 class SavedViewState with EquatableMixin {
+  final bool isLoaded;
   final Map<int, SavedView> value;
   final int? selectedSavedViewId;
 
   SavedViewState({
     required this.value,
+    this.isLoaded = false,
     this.selectedSavedViewId,
   });
 
@@ -20,9 +22,11 @@ class SavedViewState with EquatableMixin {
     Map<int, SavedView>? value,
     int? selectedSavedViewId,
     bool overwriteSelectedSavedViewId = false,
+    bool? isLoaded,
   }) {
     return SavedViewState(
       value: value ?? this.value,
+      isLoaded: isLoaded ?? this.isLoaded,
       selectedSavedViewId: overwriteSelectedSavedViewId
           ? selectedSavedViewId
           : this.selectedSavedViewId,

lib/features/saved_view/view/saved_view_selection_widget.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
@@ -8,6 +10,7 @@ import 'package:paperless_mobile/features/saved_view/cubit/saved_view_state.dart
 import 'package:paperless_mobile/features/saved_view/view/add_saved_view_page.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/util.dart';
+import 'package:shimmer/shimmer.dart';
 
 class SavedViewSelectionWidget extends StatelessWidget {
   final DocumentFilter currentFilter;
@@ -29,6 +32,9 @@ class SavedViewSelectionWidget extends StatelessWidget {
       children: [
         BlocBuilder<SavedViewCubit, SavedViewState>(
           builder: (context, state) {
+            if (!state.isLoaded) {
+              return _buildLoadingWidget(context);
+            }
             if (state.value.isEmpty) {
               return Text(S.of(context).savedViewsEmptyStateText);
             }
@@ -58,32 +64,61 @@ class SavedViewSelectionWidget extends StatelessWidget {
             );
           },
         ),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(
-              S.of(context).savedViewsLabel,
-              style: Theme.of(context).textTheme.titleSmall,
-            ),
-            BlocBuilder<DocumentsCubit, DocumentsState>(
-              buildWhen: (previous, current) =>
-                  previous.filter != current.filter,
-              builder: (context, docState) {
-                return TextButton.icon(
-                  icon: const Icon(Icons.add),
-                  onPressed: enabled
-                      ? () => _onCreatePressed(context, docState.filter)
-                      : null,
-                  label: Text(S.of(context).savedViewCreateNewLabel),
-                );
-              },
-            ),
-          ],
+        BlocBuilder<SavedViewCubit, SavedViewState>(
+          builder: (context, state) {
+            return Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  S.of(context).savedViewsLabel,
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+                BlocBuilder<DocumentsCubit, DocumentsState>(
+                  buildWhen: (previous, current) =>
+                      previous.filter != current.filter,
+                  builder: (context, docState) {
+                    return TextButton.icon(
+                      icon: const Icon(Icons.add),
+                      onPressed: (enabled && state.isLoaded)
+                          ? () => _onCreatePressed(context, docState.filter)
+                          : null,
+                      label: Text(S.of(context).savedViewCreateNewLabel),
+                    );
+                  },
+                ),
+              ],
+            );
+          },
         ),
       ],
     );
   }
 
+  Widget _buildLoadingWidget(BuildContext context) {
+    final r = Random(123456789);
+    return SizedBox(
+      height: height,
+      width: double.infinity,
+      child: Shimmer.fromColors(
+        baseColor: Theme.of(context).brightness == Brightness.light
+            ? Colors.grey[300]!
+            : Colors.grey[900]!,
+        highlightColor: Theme.of(context).brightness == Brightness.light
+            ? Colors.grey[100]!
+            : Colors.grey[600]!,
+        child: ListView.separated(
+          scrollDirection: Axis.horizontal,
+          physics: const NeverScrollableScrollPhysics(),
+          itemCount: 10,
+          itemBuilder: (context, index) => FilterChip(
+              label: SizedBox(width: r.nextInt((index * 20) + 50).toDouble()),
+              onSelected: null),
+          separatorBuilder: (context, index) => SizedBox(width: 8.0),
+        ),
+      ),
+    );
+  }
+
   void _onCreatePressed(BuildContext context, DocumentFilter filter) async {
     final newView = await Navigator.of(context).push<SavedView?>(
       MaterialPageRoute(