add link to #35 from readme

Reviewed-on: Nexus/nexus#34

README.md

@@ -110,7 +110,7 @@ A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
 - [x] Member list
     - [ ] Colors based off of power level
     - [ ] Sort by power level
-- [ ] Notifications using UnifiedPush
+- [ ] Notifications using UnifiedPush ([#35](https://git.federated.nexus/Nexus/nexus/issues/35))
 - [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
 - [ ] Invites
 - [ ] Settings

lib/controllers/emoji_controller.dart

@@ -78,8 +78,7 @@ class EmojiController extends AsyncNotifier<EmojiTuple> {
     return (customCategories, customKeywords);
   }
 
-  static final provider =
-      AsyncNotifierProvider.autoDispose<EmojiController, EmojiTuple>(
-        EmojiController.new,
-      );
+  static final provider = AsyncNotifierProvider<EmojiController, EmojiTuple>(
+    EmojiController.new,
+  );
 }

lib/controllers/room_chat_controller.dart

@@ -38,16 +38,13 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
       loadOlder();
     }
 
-    return IMap<int, int?>.fromValues(
-          keyMapper: (id) => 9999999999 + (id ?? 0),
-          values: room.sticky,
-        )
-        .addAll(room.timeline)
-        .toEntryIList(compare: (a, b) => (b?.key ?? 0).compareTo(a?.key ?? 0))
+    return room.timeline
+        .toEntryIList(compare: (a, b) => (a?.key ?? 0).compareTo(b?.key ?? 0))
+        .map((element) => element.value)
+        .toIList()
+        .addAll(room.sticky)
         .map((entry) {
-          final foundEvent = entry.value == null
-              ? null
-              : room.events[entry.value!];
+          final foundEvent = entry == null ? null : room.events[entry];
 
           final editedEvent =
               foundEvent == null || foundEvent.lastEditRowId == 0

lib/pages/chat_page.dart

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/emoji_controller.dart";
 import "package:nexus/controllers/init_complete_controller.dart";
 import "package:nexus/controllers/key_controller.dart";
 import "package:nexus/widgets/appbar.dart";
@@ -17,6 +18,7 @@ class ChatPage extends ConsumerWidget {
       final showMembersByDefault = constraints.maxWidth > 1000;
       final initComplete = ref.watch(InitCompleteController.provider);
       final roomId = ref.watch(KeyController.provider(KeyController.roomKey));
+      ref.read(EmojiController.provider);
 
       return Scaffold(
         appBar: initComplete ? null : Appbar(),

lib/widgets/room_chat.dart

@@ -77,10 +77,73 @@ class RoomChat extends HookConsumerWidget {
 
     final listController = useRef(ListController());
     final scrollController = useScrollController();
+    final controllerData = ref.watch(controllerProvider);
+
+    final topEventBeforeLoad = useState<String?>(null);
+
+    Future<void> loadOlder() async {
+      if (controllerData case AsyncData(:final value)) {
+        topEventBeforeLoad.value = value.firstOrNull?.eventId;
+        await notifier.loadOlder();
+      }
+    }
+
+    useEffect(() {
+      ref
+          .read(controllerProvider.future)
+          .then(
+            (_) => WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (scrollController.hasClients) {
+                scrollController.jumpTo(
+                  scrollController.position.maxScrollExtent - .000001,
+                );
+              }
+            }),
+          );
+
+      return null;
+    }, [scrollController.hasClients]);
+
+    useEffect(() {
+      if (controllerData case AsyncData(
+        :final value,
+      ) when scrollController.hasClients) {
+        if (topEventBeforeLoad.value != null) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (scrollController.hasClients) {
+              final index = value.indexWhere(
+                (event) => event.eventId == topEventBeforeLoad.value,
+              );
+              if (index != -1) {
+                listController.value.jumpToItem(
+                  index: index,
+                  scrollController: scrollController,
+                  alignment: 0,
+                );
+              }
+            }
+            topEventBeforeLoad.value = null;
+          });
+        } else if (scrollController.position.atEdge &&
+            scrollController.position.pixels != 0) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (scrollController.hasClients) {
+              scrollController.jumpTo(
+                scrollController.position.maxScrollExtent,
+              );
+            }
+          });
+        }
+      }
+
+      return null;
+    }, [controllerData]);
 
     useEffect(() {
       Future<void> listener() async {
-        if (!scrollController.position.atEdge) return;
+        if (!scrollController.hasClients || !scrollController.position.atEdge) {
+          return;
+        }
 
         final room = ref.watch(
           RoomsController.provider.select((value) => value[roomId]),
@@ -88,15 +151,17 @@ class RoomChat extends HookConsumerWidget {
         if (room == null) return;
 
         if (scrollController.position.pixels == 0) {
-          await client.markRead(room);
+          if (room.hasMore) {
+            await loadOlder();
+          }
         } else {
-          if (room.hasMore) await notifier.loadOlder();
+          await client.markRead(room);
         }
       }
 
       scrollController.addListener(listener);
       return () => scrollController.removeListener(listener);
-    }, [roomId]);
+    }, [roomId, controllerData]);
 
     final composerNode = useFocusNode(
       onKeyEvent: (_, event) {
@@ -316,8 +381,6 @@ class RoomChat extends HookConsumerWidget {
       ].toIList();
     }
 
-    final controllerData = ref.watch(controllerProvider);
-
     return Scaffold(
       appBar: RoomAppbar(
         roomId: roomId,
@@ -339,11 +402,20 @@ class RoomChat extends HookConsumerWidget {
                     child: switch (controllerData) {
                       AsyncData(:final value) ||
                       AsyncLoading(:final value?) => CustomScrollView(
-                        reverse: true,
                         controller: scrollController,
                         slivers: [
-                          SliverPadding(
-                            padding: .only(bottom: composerSize.value),
+                          SliverToBoxAdapter(
+                            child: Padding(
+                              padding: .symmetric(vertical: 36),
+                              child: Center(
+                                child: ElevatedButton(
+                                  onPressed: controllerData is AsyncData
+                                      ? loadOlder
+                                      : null,
+                                  child: Text("Load More"),
+                                ),
+                              ),
+                            ),
                           ),
 
                           SuperSliverList.builder(
@@ -351,7 +423,7 @@ class RoomChat extends HookConsumerWidget {
                             itemCount: value.length,
                             itemBuilder: (_, index) {
                               final event = value[index];
-                              final previousEvent = value.getOrNull(index + 1);
+                              final previousEvent = value.getOrNull(index - 1);
                               return FlashWrapper(
                                 EventRenderer(
                                   event,
@@ -389,18 +461,8 @@ class RoomChat extends HookConsumerWidget {
                             },
                           ),
 
-                          SliverToBoxAdapter(
-                            child: Padding(
-                              padding: .symmetric(vertical: 36),
-                              child: Center(
-                                child: controllerData is AsyncLoading
-                                    ? Loading()
-                                    : ElevatedButton(
-                                        onPressed: notifier.loadOlder,
-                                        child: Text("Load More"),
-                                      ),
-                              ),
-                            ),
+                          SliverPadding(
+                            padding: .only(bottom: composerSize.value),
                           ),
                         ],
                       ),