wip: work

@MattsAttack, you'll be pleased to hear that there's less mapping.
I'd forgotten about "collection for", which is like a list comprehension.

packages/app/lib/src/app/wrapper_page.dart

@@ -8,7 +8,7 @@ import 'package:appwrite/appwrite.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -22,8 +22,6 @@ import '../features/home/domain/uploaded_image_entity.dart';
 import '../utils/hooks.dart';
 import 'router.gr.dart';
 
-// final uploadedImageProvider = StateProvider<PlatformFile?>((ref) => null);
-
 /// {@template nexus.app.wrapper_page}
 /// Wrap the pages in a Material Design scaffold.
 /// {@endtemplate}
@@ -100,9 +98,6 @@ class _Dialog extends HookConsumerWidget {
     final userId = ref.watch(idProvider);
     final userName = ref.watch(userNameProvider);
 
-    ///
-    // PlatformFile? selectedFile;
-
     final handleSubmit = useCallback(() async {
       final uploadedImages = ref.watch(uploadedImagesServiceProvider);
       final location = await ref.read(locationServiceProvider.future);
@@ -119,8 +114,6 @@ class _Dialog extends HookConsumerWidget {
       formKey.currentState?.save();
 
       // Create a list off all uploaded images ids
-      final List<String> uploadedImageIDs =
-          uploadedImages.map((image) => image.imageID).toList();
 
       await ref
           .read(postRepositoryProvider)
@@ -135,8 +128,11 @@ class _Dialog extends HookConsumerWidget {
               timestamp: DateTime.timestamp(),
               likes: const IList.empty(),
               id: PostId(ID.unique()),
-              imageID: uploadedImageIDs, //Read in list of uploaded images ids
+              imageID:
+                  // Read in the list of uploaded images ids.
+                  uploadedImages.map((image) => image.imageID).toIList(),
             ),
+            uploadedImages,
           );
 
       if (!context.mounted) return;
@@ -257,18 +253,21 @@ class _UploadedImagesView extends HookConsumerWidget {
       width: 500,
       child: ListView(
         scrollDirection: Axis.horizontal,
-        children:
-            uploadedImages.map((image) {
-              final file = image.file;
-              //TODOadd a way to remove an image
-              if (kIsWeb && file.bytes != null) {
-                return Image.memory(file.bytes!, width: 400, height: 400);
-              } else if (file.path != null) {
-                return Image.file(File(file.path!), width: 400, height: 400);
-              }
-
-              return const Placeholder();
-            }).toList(),
+        children: [
+          for (final image in uploadedImages)
+            Builder(
+              builder: (context) {
+                final file = image.file;
+                // TODO(MattsAttack): add a way to remove an image
+                if (kIsWeb && file.bytes != null) {
+                  return Image.memory(file.bytes!, width: 400, height: 400);
+                } else if (file.path != null) {
+                  return Image.file(File(file.path!), width: 400, height: 400);
+                }
+                return const Placeholder();
+              },
+            ),
+        ],
       ),
     );
   }

packages/app/lib/src/features/home/application/feed_service.dart

@@ -102,9 +102,5 @@ base class WipPost extends _$WipPost {
 
 @riverpod
 Future<Uint8List> image(Ref ref, String id) {
-  return ref
-      .watch(
-        postRepositoryProvider,
-      )
-      .getImages(id);
+  return ref.watch(postRepositoryProvider).getImages(id);
 }

packages/app/lib/src/features/home/data/post_repository.dart

@@ -10,9 +10,9 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import '../../../env/env.dart';
 import '../../../utils/api.dart';
 import '../../auth/domain/user.dart';
-import '../application/uploaded_image_service.dart';
 import '../domain/feed_entity.dart';
 import '../domain/post_entity.dart';
+import '../domain/uploaded_image_entity.dart';
 
 part 'post_repository.g.dart';
 
@@ -29,15 +29,14 @@ abstract interface class PostRepository {
   /// Returns the created post.
   Future<void> createNewPost(
     PostEntity post,
+    IList<UploadedImageEntity> images,
   );
 
   /// Toggle if a user is listed as having liked a post.
   Future<void> toggleLikePost(PostId postId, UserId userId, Likes likes);
 
-  ///Uploads image to Appwrite and returns id
-  Future<void> uploadImage(
-    int index,
-  );
+  /// Upload an image to Appwrite.
+  Future<void> uploadImage(UploadedImageEntity file);
 
   Future<Uint8List> getImages(String id);
 }
@@ -48,7 +47,6 @@ final class _AppwritePostRepository implements PostRepository {
     required this.storage,
     required this.databaseId,
     required this.collectionId,
-    required this.ref,
   });
 
   final Databases database;
@@ -57,8 +55,6 @@ final class _AppwritePostRepository implements PostRepository {
   final String databaseId;
   final String collectionId;
 
-  final Ref ref; //@lishaduck is this the correct way to access a ref here?
-
   @override
   Future<IList<PostEntity>> readPosts(FeedEntity feed, PostId? cursor) async {
     final documentList = await database.listDocuments(
@@ -91,23 +87,18 @@ final class _AppwritePostRepository implements PostRepository {
 
   @override
   Future<Uint8List> getImages(String id) async {
-    // Update for multi image
+    // TODO(MattsAttack): Update for multi-image support.
     return await storage.getFileView(bucketId: 'post-media', fileId: id);
   }
 
   @override
   Future<void> createNewPost(
     PostEntity post,
+    IList<UploadedImageEntity> images,
   ) async {
-    //Need to figure out why images aren't uploading
-    final imageID =
-        post.imageID; // Extracting locally reduces chance for null upon access
-    if (imageID != null) {
-      for (var i = 0; i < imageID.length; i++) {
-        await uploadImage(
-          i,
-        ); // Could be cool to implement a upload status bar. Posts with 10 images will take a while and that should help
-      }
+    // Could be cool to implement a upload status bar. Posts with 10 images will take a while and that should help
+    for (final image in images) {
+      await uploadImage(image);
     }
 
     await database.createDocument(
@@ -129,37 +120,34 @@ final class _AppwritePostRepository implements PostRepository {
   }
 
   @override
-  Future<void> uploadImage(
-    int index,
-  ) async {
-    final uploadedImages = ref.watch(uploadedImagesServiceProvider);
-    final selectedFile = uploadedImages[index].file;
-
+  Future<void> uploadImage(UploadedImageEntity file) async {
     //Path is for non web
     if (!kIsWeb) {
-      final path = selectedFile.path;
+      final path = file.file.path;
       if (path != null) {
         // Upload via path
-        final fileName = '${DateTime.now().microsecondsSinceEpoch}'
+        final fileName =
+            '${DateTime.now().microsecondsSinceEpoch}'
             "${path.split(".").last}";
 
-        final file = await storage.createFile(
+        await storage.createFile(
           bucketId: 'post-media', //maybe change to env variable
-          fileId: uploadedImages[index].imageID,
+          fileId: file.imageID,
           file: InputFile.fromPath(path: path, filename: fileName),
         );
       }
     }
     //Byte upload is for web
     else if (kIsWeb) {
-      final bytes = selectedFile.bytes;
+      final bytes = file.file.bytes;
       if (bytes != null) {
         // Upload via bytes
-        final fileName = '${DateTime.now().microsecondsSinceEpoch}'
-            '-${selectedFile.name}'; //TODOimplement time here
-        final file = await storage.createFile(
-          bucketId: 'post-media', //maybe change to env variable
-          fileId: uploadedImages[index].imageID,
+        final fileName =
+            '${DateTime.now().microsecondsSinceEpoch}'
+            '-${file.file.name}'; // TODO(MattsAttack): Add time here.
+        await storage.createFile(
+          bucketId: 'post-media', // TODO(MattsAttack): Use an dotenv variable.
+          fileId: file.imageID,
           file: InputFile.fromBytes(bytes: bytes, filename: fileName),
         );
       }
@@ -179,6 +167,5 @@ PostRepository postRepository(Ref ref) {
     storage: storage,
     databaseId: Env.databaseId,
     collectionId: Env.postsCollectionId,
-    ref: ref,
   );
 }

packages/app/lib/src/features/home/domain/post_entity.dart

@@ -48,7 +48,7 @@ sealed class PostEntity with _$PostEntity {
     @JsonKey(includeToJson: false) required PostId id,
 
     /// Contains ID of image in bucket
-    List<String?>? imageID,
+    required IList<String> imageID,
   }) = _PostEntity;
 
   factory PostEntity.fromJson(Map<String, dynamic> json) =>

packages/app/lib/src/features/home/domain/uploaded_image_entity.dart

@@ -6,8 +6,6 @@ part 'uploaded_image_entity.freezed.dart';
 @immutable
 @freezed
 class UploadedImageEntity with _$UploadedImageEntity {
-  // Might need to add IsWeb in here
-
   const factory UploadedImageEntity({
     required String imageID,
     required PlatformFile file,

packages/app/lib/src/features/home/presentation/home/post.dart

@@ -179,42 +179,24 @@ class _PostImage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    //TODOfix images not caching correctly
+    // TODO(lishaduck): fix images not caching correctly.
     final post = ref.watch(wipPostProvider(postId))!;
-    if (post.imageID != null) {
-      final imageIDs = post.imageID;
-      final imageIDsLength = imageIDs?.length;
-      if (imageIDsLength == null) return const SizedBox(height: 1);
-      if (imageIDsLength == 1) {
-        final image = ref.watch(imageProvider(imageIDs![0]!));
-        return switch (image) {
-          AsyncData(:final value) => Image.memory(value),
-          AsyncError() => const Text('Error loading image'),
-          _ => const CircularProgressIndicator(),
-        };
-      } else if (imageIDsLength > 1) {
-        final List<AsyncValue<Uint8List>> images = [];
-        for (var i = 0; i < imageIDsLength; i++) {
-          images.add(ref.watch(imageProvider(imageIDs![i]!)));
-        }
-        return SizedBox(
-          height: 500,
-          width: MediaQuery.sizeOf(context).width / 1.5,
-          child: ListView(
-            scrollDirection: Axis.horizontal,
-            children:
-                images.map((image) {
-                  return switch (image) {
-                    AsyncData(:final value) => Image.memory(value),
-                    AsyncError() => const Text('Error loading image'),
-                    _ => const CircularProgressIndicator(),
-                  };
-                }).toList(),
-          ),
-        );
-      }
-    }
-    return const SizedBox(height: 1);
+
+    return SizedBox(
+      height: 500,
+      width: MediaQuery.sizeOf(context).width / 1.5,
+      child: ListView(
+        scrollDirection: Axis.horizontal,
+        children: [
+          for (final imageId in post.imageID)
+            switch (ref.watch(imageProvider(imageId))) {
+              AsyncData(:final value) => Image.memory(value),
+              AsyncError() => const Text('Error loading image'),
+              _ => const CircularProgressIndicator(),
+            },
+        ],
+      ),
+    );
   }
 
   @override