Merge branch 'main' into weblate-fluffychat-translations

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(
+              return Tooltip(
-                radius: AppConfig.borderRadius,
+                message: image.body ?? imageKeys[imageIndex],
-                key: ValueKey(image.url.toString()),
+                child: InkWell(
-                onTap: () {
+                  radius: AppConfig.borderRadius,
-                  // copy the image
+                  key: ValueKey(image.url.toString()),
-                  final imageCopy =
+                  onTap: () {
-                      ImagePackImageContent.fromJson(image.toJson().copy());
+                    // copy the image
-                  // set the body, if it doesn't exist, to the key
+                    final imageCopy =
-                  imageCopy.body ??= imageKeys[imageIndex];
+                        ImagePackImageContent.fromJson(image.toJson().copy());
-                  widget.onSelected(imageCopy);
+                    // set the body, if it doesn't exist, to the key
-                },
+                    imageCopy.body ??= imageKeys[imageIndex];
-                child: AbsorbPointer(
+                    widget.onSelected(imageCopy);
-                  absorbing: true,
+                  },
-                  child: MxcImage(
+                  child: AbsorbPointer(
-                    uri: image.url,
+                    absorbing: true,
-                    fit: BoxFit.contain,
+                    child: MxcImage(
-                    width: 128,
+                      uri: image.url,
-                    height: 128,
+                      fit: BoxFit.contain,
-                    animated: true,
+                      width: 128,
-                    isThumbnail: false,
+                      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,

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) {

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