From 6d5383453c5d14878c378d4a6f7a318d7c6dde36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Sun, 21 Dec 2025 10:26:08 +0100
Subject: [PATCH 1/2] build: Use matrix sdk vom pub.dev again

---
 pubspec.lock | 11 +++++------
 pubspec.yaml |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 6e6aee693..c39bc7535 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1087,12 +1087,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "9bf0a7fe207deb483ccb99c939a001fa9999036c"
-      url: "https://github.com/famedly/matrix-dart-sdk.git"
-    source: git
-    version: "4.0.1"
+      name: matrix
+      sha256: fb116ee89f6871441f22f76a988db15cfcfb6dfac97e3e2d654c240080015707
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   meta:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index e004e0edf..0bf428f2b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -53,8 +53,7 @@ dependencies:
   just_audio: ^0.10.5
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  matrix: #^4.0.1
-    git: https://github.com/famedly/matrix-dart-sdk.git
+  matrix: ^4.1.0
   mime: ^2.0.0
   native_imaging: ^0.2.0
   opus_caf_converter_dart: ^1.0.1

From 043189cb477fc3be513b29eed8942022c5fae3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Sun, 21 Dec 2025 10:38:52 +0100
Subject: [PATCH 2/2] chore: Follow up better search

---
 .../chat_search/chat_search_images_tab.dart   | 30 +------------------
 .../chat_search/chat_search_message_tab.dart  |  5 +---
 lib/pages/chat_search/search_footer.dart      |  7 ++++-
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/lib/pages/chat_search/chat_search_images_tab.dart b/lib/pages/chat_search/chat_search_images_tab.dart
index e5cd62a38..5b018ccc4 100644
--- a/lib/pages/chat_search/chat_search_images_tab.dart
+++ b/lib/pages/chat_search/chat_search_images_tab.dart
@@ -4,11 +4,9 @@ import 'package:intl/intl.dart';
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pages/chat/events/video_player.dart';
 import 'package:fluffychat/pages/chat_search/search_footer.dart';
 import 'package:fluffychat/pages/image_viewer/image_viewer.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/mxc_image.dart';
 
 class ChatSearchImagesTab extends StatelessWidget {
@@ -32,33 +30,7 @@ class ChatSearchImagesTab extends StatelessWidget {
   Widget build(BuildContext context) {
     final borderRadius = BorderRadius.circular(AppConfig.borderRadius / 2);
     final theme = Theme.of(context);
-    if (events.isEmpty) {
-      if (isLoading) {
-        return const Center(child: CircularProgressIndicator.adaptive());
-      }
-      return Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          const CircularProgressIndicator.adaptive(strokeWidth: 2),
-          const SizedBox(height: 8),
-          Text(
-            L10n.of(context).searchIn(
-              room.getLocalizedDisplayname(MatrixLocals(L10n.of(context))),
-            ),
-          ),
-        ],
-      );
-    }
-    if (events.isEmpty) {
-      return Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          const Icon(Icons.photo_outlined, size: 64),
-          const SizedBox(height: 8),
-          Text(L10n.of(context).nothingFound),
-        ],
-      );
-    }
+
     final eventsByMonth = <DateTime, List<Event>>{};
     for (final event in events) {
       final month = DateTime(
diff --git a/lib/pages/chat_search/chat_search_message_tab.dart b/lib/pages/chat_search/chat_search_message_tab.dart
index 10b8ef8ad..c58a2de35 100644
--- a/lib/pages/chat_search/chat_search_message_tab.dart
+++ b/lib/pages/chat_search/chat_search_message_tab.dart
@@ -33,10 +33,7 @@ class ChatSearchMessageTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    if (events.isEmpty) {
-      if (isLoading) {
-        return const Center(child: CircularProgressIndicator.adaptive());
-      }
+    if (events.isEmpty && searchQuery.isEmpty) {
       return Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
diff --git a/lib/pages/chat_search/search_footer.dart b/lib/pages/chat_search/search_footer.dart
index 3b4e30c91..cac19c4ea 100644
--- a/lib/pages/chat_search/search_footer.dart
+++ b/lib/pages/chat_search/search_footer.dart
@@ -51,7 +51,12 @@ class SearchFooter extends StatelessWidget {
               ),
               onPressed: isLoading ? null : onStartSearch,
               icon: isLoading
-                  ? const CircularProgressIndicator.adaptive()
+                  ? SizedBox.square(
+                      dimension: 18,
+                      child: const CircularProgressIndicator.adaptive(
+                        strokeWidth: 2,
+                      ),
+                    )
                   : const Icon(Icons.arrow_downward_outlined),
               label: Text(L10n.of(context).searchMore),
             ),