chore: postpone timeline search (#23)

Author: Feichtmeier

lib/chat/chat_room/common/timeline_model.dart

@@ -2,6 +2,26 @@ import 'package:matrix/matrix.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 class TimelineModel extends SafeChangeNotifier {
+  final Map<String, String> _timelineQuery = {};
+  String? getTimelineQuery(String roomId) => _timelineQuery[roomId];
+  void setTimelineQuery({required String roomId, required String query}) {
+    if (query == _timelineQuery[roomId]) return;
+    _timelineQuery[roomId] = query;
+    notifyListeners();
+  }
+
+  final Map<String, bool> _timelineSearchActive = {};
+  bool getTimelineSearchActive(String roomId) =>
+      _timelineSearchActive[roomId] == true;
+  void setTimelineSearchActive({
+    required String roomId,
+    required bool value,
+  }) {
+    if (_timelineSearchActive[roomId] == value) return;
+    _timelineSearchActive[roomId] = value;
+    notifyListeners();
+  }
+
   final Map<String, bool> _updatingTimeline = {};
   bool getUpdatingTimeline(String roomId) => _updatingTimeline[roomId] == true;
   void setUpdatingTimeline({

lib/chat/chat_room/common/view/chat_room_timeline_list.dart

@@ -14,7 +14,6 @@ import '../../../common/chat_model.dart';
 import '../../../common/event_x.dart';
 import '../../../events/view/chat_event_tile.dart';
 import '../../../settings/settings_model.dart';
-import '../../titlebar/chat_room_title_bar.dart';
 import '../timeline_model.dart';
 import 'chat_room_pinned_events_dialog.dart';
 import 'chat_seen_by_indicator.dart';
@@ -163,29 +162,6 @@ class _ChatRoomTimelineListState extends State<ChatRoomTimelineList> {
               ),
             ),
           ),
-        if (_showScrollButton)
-          Positioned(
-            right: kBigPadding,
-            bottom: kBigPadding,
-            child: AnimatedContainer(
-              duration: const Duration(milliseconds: 200),
-              padding: EdgeInsets.only(
-                bottom: _showScrollButton ? 3 * kBigPadding : 0,
-              ),
-              child: FloatingActionButton.small(
-                backgroundColor: getMonochromeBg(theme: theme, darkFactor: 5),
-                onPressed: () => showDialog(
-                  context: context,
-                  builder: (context) =>
-                      ChatRoomSearchDialog(room: widget.timeline.room),
-                ),
-                child: Icon(
-                  YaruIcons.search,
-                  color: theme.colorScheme.onSurface,
-                ),
-              ),
-            ),
-          ),
         if (_showScrollButton)
           Positioned(
             right: kBigPadding,

lib/chat/chat_room/common/view/chat_room_users_list.dart

@@ -27,20 +27,13 @@ class ChatRoomUsersList extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final membershipFilter = [Membership.join];
 
-    watchStream(
+    final users = watchStream(
       (ChatModel m) => m.getUsersStreamOfJoinedRoom(
         room,
         membershipFilter: membershipFilter,
       ),
       initialValue: room.getParticipants(membershipFilter),
       preserveState: false,
-    );
-
-    final users = watchFuture(
-      (users) => users,
-      target: room.requestParticipants(membershipFilter),
-      initialValue: room.getParticipants(membershipFilter),
-      preserveState: false,
     ).data?.sorted(
           (a, b) => b.powerLevel.compareTo(a.powerLevel),
         );

lib/chat/chat_room/titlebar/chat_room_title_bar.dart

@@ -3,19 +3,16 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
-import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../../common/view/build_context_x.dart';
-import '../../../common/view/common_widgets.dart';
 import '../../../common/view/space.dart';
 import '../../../common/view/ui_constants.dart';
 import '../../../l10n/l10n.dart';
-import '../../common/chat_model.dart';
-import 'side_bar_button.dart';
 import '../common/view/chat_room_page.dart';
 import 'chat_room_encryption_status_button.dart';
 import 'chat_room_pin_button.dart';
+import 'side_bar_button.dart';
 
 class ChatRoomTitleBar extends StatelessWidget implements PreferredSizeWidget {
   const ChatRoomTitleBar({super.key, required this.room});
@@ -65,85 +62,3 @@ class ChatRoomTitleBar extends StatelessWidget implements PreferredSizeWidget {
   @override
   Size get preferredSize => const Size(0, kYaruTitleBarHeight);
 }
-
-class ChatRoomSearchDialog extends StatefulWidget
-    with WatchItStatefulWidgetMixin {
-  const ChatRoomSearchDialog({
-    super.key,
-    required this.room,
-  });
-
-  final Room room;
-
-  @override
-  State<ChatRoomSearchDialog> createState() => _ChatRoomSearchDialogState();
-}
-
-class _ChatRoomSearchDialogState extends State<ChatRoomSearchDialog> {
-  final TextEditingController _controller = TextEditingController();
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final events = watchFuture(
-      (ChatModel m) => m.getEvents(widget.room),
-      initialValue: <Event>[],
-    ).data;
-
-    final filteredEvents = events?.where(
-      (e) => e.body.toLowerCase().contains(_controller.text.toLowerCase()),
-    );
-
-    return SimpleDialog(
-      titlePadding: EdgeInsets.zero,
-      title: YaruDialogTitleBar(
-        title:
-            Text(context.l10n.searchIn(widget.room.getLocalizedDisplayname())),
-        border: BorderSide.none,
-        backgroundColor: Colors.transparent,
-      ),
-      children: [
-        Padding(
-          padding: const EdgeInsets.all(kBigPadding),
-          child: TextField(
-            autocorrect: true,
-            autofocus: true,
-            controller: _controller,
-            decoration: InputDecoration(
-              label: Text(
-                context.l10n.search,
-              ),
-            ),
-          ),
-        ),
-        filteredEvents == null
-            ? const Center(
-                child: Progress(),
-              )
-            : Padding(
-                padding: const EdgeInsets.all(kMediumPadding),
-                child: SizedBox(
-                  height: 500,
-                  width: 500,
-                  child: ListView.builder(
-                    reverse: true,
-                    itemCount: filteredEvents.length,
-                    itemBuilder: (context, index) {
-                      final event = filteredEvents.elementAt(index);
-                      return ListTile(
-                        dense: true,
-                        title: Text(event.body),
-                      );
-                    },
-                  ),
-                ),
-              ),
-      ],
-    );
-  }
-}

lib/chat/common/chat_model.dart

@@ -3,7 +3,6 @@ import 'package:matrix/matrix.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../../common/logging.dart';
-import 'event_x.dart';
 import 'rooms_filter.dart';
 
 class ChatModel extends SafeChangeNotifier {
@@ -100,11 +99,6 @@ class ChatModel extends SafeChangeNotifier {
   Stream<Event?> getLastEventStream(Room room) =>
       getJoinedRoomUpdate(room.id).map((update) => room.lastEvent);
 
-  Future<List<Event>> getEvents(Room room) async {
-    final timeline = await room.getTimeline();
-    return timeline.events.where((e) => !e.showAsBadge).toList();
-  }
-
   Stream<List<Room>> get spacesStream =>
       syncStream.map((e) => rooms.where((e) => e.isSpace).toList());