improvements

lib/foreign_types/memory.dart

@@ -1,5 +1,8 @@
+import 'dart:io';
+
 import 'package:path/path.dart';
 import 'package:share_location/enums.dart';
+import 'package:share_location/managers/file_manager.dart';
 
 class Memory {
   final String id;
@@ -30,4 +33,9 @@ class Memory {
 
   MemoryType get type =>
       filename.split('.').last == 'jpg' ? MemoryType.photo : MemoryType.video;
+
+  Future<File> downloadToFile() => FileManager.downloadFile(
+        'memories',
+        location,
+      );
 }

lib/managers/file_manager.dart

@@ -3,6 +3,7 @@ import 'dart:typed_data';
 
 import 'package:path_provider/path_provider.dart';
 import 'package:share_location/enums.dart';
+import 'package:share_location/foreign_types/memory.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:uuid/uuid.dart';
 
@@ -13,15 +14,19 @@ final supabase = Supabase.instance.client;
 class FileManager {
   static Map<String, Uint8List> fileCache = {};
 
-  static Future<User> getUser(final String userID) async {
+  static Future<Memory> getMemoryMetadata(final String id) async {
     final response = await supabase
-        .from('users')
+        .from('memories')
         .select()
-        .eq('id', userID)
+        .eq('id', id)
         .single()
         .execute();
 
-    return response.data;
+    if (response.error != null) {
+      throw Exception(response.error);
+    }
+
+    return Memory.parse(response.data);
   }
 
   static uploadFile(final User user, final File file) async {
@@ -66,7 +71,7 @@ class FileManager {
         location.split('.').last == 'jpg' ? MemoryType.photo : MemoryType.video;
 
     try {
-      final file = await getFileData('memories', location);
+      final file = await _getFileData('memories', location);
 
       return [file, memoryType];
     } catch (error) {
@@ -74,7 +79,7 @@ class FileManager {
     }
   }
 
-  static Future<Uint8List> getFileData(final String table, final String path,
+  static Future<Uint8List> _getFileData(final String table, final String path,
       {final bool disableCache = false}) async {
     final key = '$table:$path';
 
@@ -110,7 +115,7 @@ class FileManager {
     }
 
     final data =
-        await getFileData(table, path, disableCache: disableDownloadCache);
+        await _getFileData(table, path, disableCache: disableDownloadCache);
 
     // Create file
     await file.create(recursive: true);

lib/widgets/memory.dart

@@ -4,33 +4,25 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:share_location/constants/spacing.dart';
 import 'package:share_location/enums.dart';
-import 'package:share_location/managers/file_manager.dart';
+import 'package:share_location/foreign_types/memory.dart';
-import 'package:share_location/utils/auth_required.dart';
 import 'package:share_location/widgets/raw_memory_display.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:video_player/video_player.dart';
 
 enum MemoryFetchStatus {
-  preparing,
-  loadingMetadata,
   downloading,
   error,
   done,
 }
 
 class MemoryView extends StatefulWidget {
-  final String location;
+  final Memory memory;
-  final DateTime creationDate;
-  final String filename;
   final bool loopVideo;
   final void Function(VideoPlayerController)? onVideoControllerInitialized;
   final VoidCallback? onFileDownloaded;
 
   const MemoryView({
     Key? key,
-    required this.location,
+    required this.memory,
-    required this.creationDate,
-    required this.filename,
     this.loopVideo = false,
     this.onVideoControllerInitialized,
     this.onFileDownloaded,
@@ -40,11 +32,9 @@ class MemoryView extends StatefulWidget {
   State<MemoryView> createState() => _MemoryViewState();
 }
 
-class _MemoryViewState extends AuthRequiredState<MemoryView> {
+class _MemoryViewState extends State<MemoryView> {
-  late final User _user;
+  MemoryFetchStatus status = MemoryFetchStatus.downloading;
-  MemoryFetchStatus status = MemoryFetchStatus.preparing;
   Uint8List? data;
-  MemoryType? type;
 
   @override
   void initState() {
@@ -53,61 +43,23 @@ class _MemoryViewState extends AuthRequiredState<MemoryView> {
     loadMemoryFile();
   }
 
-  @override
-  void onAuthenticated(Session session) {
-    final user = session.user;
-
-    if (user != null) {
-      _user = user;
-    }
-  }
-
   Future<void> loadMemoryFile() async {
-    final filename = widget.location.split('/').last;
-
-    setState(() {
-      status = MemoryFetchStatus.loadingMetadata;
-    });
-
-    final response = await supabase
-        .from('memories')
-        .select()
-        .eq('location', '${_user.id}/$filename')
-        .limit(1)
-        .single()
-        .execute();
-
-    if (!mounted) {
-      return;
-    }
-
-    if (response.data == null) {
-      setState(() {
-        status = MemoryFetchStatus.error;
-      });
-      return;
-    }
-
     setState(() {
       status = MemoryFetchStatus.downloading;
     });
 
-    final memory = response.data;
-    final location = memory['location'];
-    final memoryType =
-        location.split('.').last == 'jpg' ? MemoryType.photo : MemoryType.video;
-
     try {
-      final fileData = await FileManager.getFileData('memories', location);
+      final file = await widget.memory.downloadToFile();
 
       if (!mounted) {
         return;
       }
 
+      final fileData = await file.readAsBytes();
+
       setState(() {
         status = MemoryFetchStatus.done;
         data = fileData;
-        type = memoryType;
       });
 
       if (widget.onFileDownloaded != null) {
@@ -138,21 +90,21 @@ class _MemoryViewState extends AuthRequiredState<MemoryView> {
         fit: StackFit.expand,
         alignment: Alignment.center,
         children: <Widget>[
-          if (type == MemoryType.photo)
+          if (widget.memory.type == MemoryType.photo)
             ImageFiltered(
               imageFilter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
               child: RawMemoryDisplay(
-                filename: widget.filename,
+                filename: widget.memory.filename,
                 data: data!,
-                type: type!,
+                type: widget.memory.type,
                 loopVideo: widget.loopVideo,
                 fit: BoxFit.cover,
               ),
             ),
           RawMemoryDisplay(
-            filename: widget.filename,
+            filename: widget.memory.filename,
             data: data!,
-            type: type!,
+            type: widget.memory.type,
             fit: BoxFit.contain,
             loopVideo: widget.loopVideo,
             onVideoControllerInitialized: widget.onVideoControllerInitialized,
@@ -169,11 +121,6 @@ class _MemoryViewState extends AuthRequiredState<MemoryView> {
         const SizedBox(height: SMALL_SPACE),
         () {
           switch (status) {
-            // ADD dot loading text
-            case MemoryFetchStatus.preparing:
-              return const Text('Preparing to download memory');
-            case MemoryFetchStatus.loadingMetadata:
-              return const Text('Loading memory metadata');
             case MemoryFetchStatus.downloading:
               return const Text('Downloading memory');
             default:

lib/widgets/memory_sheet.dart

@@ -36,8 +36,7 @@ class _MemorySheetState extends State<MemorySheet> with Loadable {
 
   Future<void> downloadFile() async {
     try {
-      final file =
+      final file = await widget.memory.downloadToFile();
-          await FileManager.downloadFile('memories', widget.memory.location);
 
       if (!mounted) {
         return;

lib/widgets/memory_slide.dart

@@ -92,9 +92,7 @@ class _MemorySlideState extends State<MemorySlide>
           paused: timeline.paused,
           hideProgressBar: !timelineOverlay.showOverlay,
           child: MemoryView(
-            creationDate: widget.memory.creationDate,
+            memory: widget.memory,
-            location: widget.memory.location,
-            filename: widget.memory.filename,
             loopVideo: false,
             onFileDownloaded: () {
               if (widget.memory.type == MemoryType.photo) {