From cf6b34f8c009fc4ac29fdb8e531fbd5fd16a17e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Wed, 25 Jun 2025 10:15:15 +0200
Subject: [PATCH 1/3] chore: Remove lifecyclestate logs

---
 lib/widgets/matrix.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index 2b7a1797b..3bf20b123 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -377,7 +377,6 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
-    Logs().v('AppLifecycleState = $state');
     final foreground = state != AppLifecycleState.inactive &&
         state != AppLifecycleState.paused;
     for (final client in widget.clients) {

From b63a1d3e5c33f2a02141802f82498b2310e529b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Wed, 25 Jun 2025 10:29:28 +0200
Subject: [PATCH 2/3] fix: Design glitches in sticker dialog

---
 lib/pages/chat/sticker_picker_dialog.dart | 45 +++++++++++++----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/lib/pages/chat/sticker_picker_dialog.dart b/lib/pages/chat/sticker_picker_dialog.dart
index 782d55d32..090be367b 100644
--- a/lib/pages/chat/sticker_picker_dialog.dart
+++ b/lib/pages/chat/sticker_picker_dialog.dart
@@ -73,26 +73,29 @@ class StickerPickerDialogState extends State<StickerPickerDialog> {
             physics: const NeverScrollableScrollPhysics(),
             itemBuilder: (BuildContext context, int imageIndex) {
               final image = pack.images[imageKeys[imageIndex]]!;
-              return InkWell(
-                radius: AppConfig.borderRadius,
-                key: ValueKey(image.url.toString()),
-                onTap: () {
-                  // copy the image
-                  final imageCopy =
-                      ImagePackImageContent.fromJson(image.toJson().copy());
-                  // set the body, if it doesn't exist, to the key
-                  imageCopy.body ??= imageKeys[imageIndex];
-                  widget.onSelected(imageCopy);
-                },
-                child: AbsorbPointer(
-                  absorbing: true,
-                  child: MxcImage(
-                    uri: image.url,
-                    fit: BoxFit.contain,
-                    width: 128,
-                    height: 128,
-                    animated: true,
-                    isThumbnail: false,
+              return Tooltip(
+                message: image.body ?? imageKeys[imageIndex],
+                child: InkWell(
+                  radius: AppConfig.borderRadius,
+                  key: ValueKey(image.url.toString()),
+                  onTap: () {
+                    // copy the image
+                    final imageCopy =
+                        ImagePackImageContent.fromJson(image.toJson().copy());
+                    // set the body, if it doesn't exist, to the key
+                    imageCopy.body ??= imageKeys[imageIndex];
+                    widget.onSelected(imageCopy);
+                  },
+                  child: AbsorbPointer(
+                    absorbing: true,
+                    child: MxcImage(
+                      uri: image.url,
+                      fit: BoxFit.contain,
+                      width: 128,
+                      height: 128,
+                      animated: true,
+                      isThumbnail: false,
+                    ),
                   ),
                 ),
               );
@@ -111,6 +114,7 @@ class StickerPickerDialogState extends State<StickerPickerDialog> {
             SliverAppBar(
               floating: true,
               pinned: true,
+              scrolledUnderElevation: 0,
               automaticallyImplyLeading: false,
               backgroundColor: Colors.transparent,
               title: SizedBox(
@@ -118,6 +122,7 @@ class StickerPickerDialogState extends State<StickerPickerDialog> {
                 child: TextField(
                   autofocus: false,
                   decoration: InputDecoration(
+                    filled: true,
                     hintText: L10n.of(context).search,
                     prefixIcon: const Icon(Icons.search_outlined),
                     contentPadding: EdgeInsets.zero,

From 4bbaa9c5a0c8e44ed9e7c965235881db4e4c8f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Wed, 25 Jun 2025 10:31:41 +0200
Subject: [PATCH 3/3] build: Follow up enable google services patch

---
 scripts/enable-android-google-services.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch
index 14101ede0..fb806d14e 100644
--- a/scripts/enable-android-google-services.patch
+++ b/scripts/enable-android-google-services.patch
@@ -135,7 +135,7 @@ index fb3e3ca4..039b2ccc 100644
 +++ b/pubspec.yaml
 @@ -25,7 +25,7 @@ dependencies:
    dynamic_color: ^1.7.0
-   emoji_picker_flutter: ^3.1.0
+   emoji_picker_flutter: ^4.3.0
    emojis: ^0.9.9
 -  #fcm_shared_isolate: ^0.2.0
 +  fcm_shared_isolate: ^0.2.0