Add list/grid view modes, category filter bar, in-place encrypt/decrypt, and cancel token support

README.md

@@ -136,5 +136,11 @@ Follow the Dart style guide.
 MIT, see [LICENSE](LICENSE). Free, no ads, no paid features.
 
 ## Contributors
-
+  
 - [@ultraelectronica](https://github.com/ultraelectronica) (creator)
+
+## Transparency
+
+I build this with [OpenCode](https://opencode.ai). It writes some of the
+comments and docs, and it's bailed me out of more than a few nasty-ass bugs.
+The code, the design calls, and the fuck-ups are all mine.

lib/main.dart

@@ -83,10 +83,10 @@ class _AppInitializerState extends ConsumerState<AppInitializer> {
     _checkAuthStatus();
 
     final updateService = ref.read(updateServiceProvider);
-    _updateSub = updateService.onUpdateCheck.listen((update) {
-      if (update != null) {
-        _showUpdateDialog(update);
-      }
+    _updateSub = updateService.onUpdateCheck.listen((update) async {
+      if (update == null) return;
+      if (await updateService.isVersionSkipped(update.latestVersion)) return;
+      _showUpdateDialog(update);
     });
   }
 
@@ -120,6 +120,16 @@ class _AppInitializerState extends ConsumerState<AppInitializer> {
             onPressed: () => Navigator.pop(dialogContext),
             child: const Text('Later'),
           ),
+          if (!isPlayStore && update.latestVersion != null)
+            TextButton(
+              onPressed: () {
+                ref
+                    .read(updateServiceProvider)
+                    .skipVersion(update.latestVersion!);
+                Navigator.pop(dialogContext);
+              },
+              child: const Text("Don't show again"),
+            ),
           FilledButton(
             onPressed: () {
               Navigator.pop(dialogContext);

lib/providers/explorer_providers.dart

@@ -6,22 +6,22 @@ import 'vault_providers.dart';
 
 /// View modes supported by the vault file explorer
 enum ExplorerViewMode {
-  sidebar,
-  navigation;
+  grid,
+  list;
 
   String get displayName {
     switch (this) {
-      case ExplorerViewMode.sidebar:
-        return 'Sidebar Tree';
-      case ExplorerViewMode.navigation:
-        return 'Grid Navigation';
+      case ExplorerViewMode.grid:
+        return 'Grid View';
+      case ExplorerViewMode.list:
+        return 'List View';
     }
   }
 }
 
 /// Provider for current explorer view mode
 final explorerViewModeProvider = StateProvider<ExplorerViewMode>((ref) {
-  return ExplorerViewMode.navigation;
+  return ExplorerViewMode.grid;
 });
 
 /// Provider for the currently viewed folder ID (null represents the root vault folder)

lib/providers/vault_providers.dart

@@ -1,7 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_riverpod/legacy.dart';
 import '../models/album.dart';
-import '../models/encryption_algorithm.dart';
 import '../models/vault_folder.dart';
 import '../models/vaulted_file.dart';
 import '../services/vault_service.dart';
@@ -494,63 +493,7 @@ final fileCountSummaryProvider = FutureProvider<String>((ref) async {
   return '$total files';
 });
 
-class ReEncryptProgress {
-  final bool isInProgress;
-  final int current;
-  final int total;
-  final String? error;
-
-  const ReEncryptProgress({
-    this.isInProgress = false,
-    this.current = 0,
-    this.total = 0,
-    this.error,
-  });
-}
-
-class ReEncryptNotifier extends Notifier<ReEncryptProgress> {
-  @override
-  ReEncryptProgress build() {
-    return const ReEncryptProgress();
-  }
-
-  VaultService get _vaultService => ref.read(vaultServiceProvider);
-
-  Future<int> reEncryptVault(EncryptionAlgorithm targetAlgorithm, {Set<String>? fileFilter}) async {
-    state = const ReEncryptProgress(isInProgress: true, current: 0, total: 0);
-    try {
-      final result = await _vaultService.reEncryptVault(
-        targetAlgorithm,
-        fileFilter: fileFilter,
-        onProgress: (current, total) {
-          state = ReEncryptProgress(
-            isInProgress: true,
-            current: current,
-            total: total,
-          );
-        },
-      );
-
-      if (result < 0) {
-        state = const ReEncryptProgress(error: 'Re-encryption failed');
-      } else {
-        state = ReEncryptProgress(current: result, total: result);
-      }
-
-      ref.invalidate(vaultSettingsProvider);
-      ref.invalidate(vaultNotifierProvider);
-      return result;
-    } catch (e) {
-      state = ReEncryptProgress(error: e.toString());
-      return -1;
-    }
-  }
-}
-
-final reEncryptProvider =
-    NotifierProvider<ReEncryptNotifier, ReEncryptProgress>(() {
-  return ReEncryptNotifier();
-});
+enum VaultEncryptionAction { encrypt, removeEncryption }
 
 // ========== UPDATE PROVIDERS ==========
 

lib/screens/album_detail_screen.dart

@@ -50,6 +50,7 @@ class _AlbumDetailScreenState extends ConsumerState<AlbumDetailScreen> {
       floatingActionButton: _isSelectionMode
           ? null
           : FloatingActionButton.extended(
+              elevation: 0,
               onPressed: _showAddFilesSheet,
               backgroundColor: context.accentColor,
               icon: const Icon(Icons.add, color: Colors.white),

lib/screens/albums_screen.dart

@@ -66,6 +66,7 @@ class _AlbumsScreenState extends ConsumerState<AlbumsScreen> {
         data: (albums) => _buildAlbumsList(albums),
       ),
       floatingActionButton: FloatingActionButton.extended(
+        elevation: 0,
         onPressed: _showCreateAlbumDialog,
         backgroundColor: context.accentColor,
         icon: const Icon(Icons.add, color: Colors.white),