Merge branch 'main' into fix-jagged-avatar-edges

.github/workflows/matrix_notification.yaml

@@ -1,26 +0,0 @@
-name: Matrix Notification
-
-on:
-  issues:
-    types: [ opened ]
-  issue_comment:
-    types: [ created ]
-
-jobs:
-  notify:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Send Matrix Notification
-        env:
-          MATRIX_URL: https://matrix.janian.de/_matrix/client/v3/rooms/${{ secrets.MATRIX_MANAGEMENT_ROOM }}/send/m.room.message
-        run: |
-          if [ "${{ github.event.action }}" == "opened" ]; then
-            PAYLOAD="{\"msgtype\": \"m.notice\", \"body\": \"New Issue from ${{ github.event.issue.user.login }}\\n${{ github.event.issue.title }}\\n\\n${{ github.event.issue.body }}\\n\\nURL: ${{ github.event.issue.html_url }}\"}"
-          elif [ "${{ github.event.action }}" == "created" ]; then
-            PAYLOAD="{\"msgtype\": \"m.notice\", \"body\": \"New Comment from ${{ github.event.comment.user.login }}\\n\\n${{ github.event.comment.body }}\\n\\nURL: ${{ github.event.comment.html_url }}\"}"
-          fi
-          curl -X POST -H "Authorization: Bearer ${{ secrets.MATRIX_BOT_TOKEN }}" \
-               -H "Content-Type: application/json" \
-               -d "$PAYLOAD" \
-               $MATRIX_URL

CHANGELOG.md

@@ -30,7 +30,7 @@
 - chore: Use Cupertino Activity Indicator in ChatEventList (krille-chan)
 - chore: Use other join endpoint for room upgrades (Krille)
 - fix(macos): update dependencies to make the build work (Rafał Hirsch)
-- fix: Add missing <s> html tag to render (Krille)
+- fix: Add missing \<s> html tag to render (Krille)
 - fix: Consistent element padding between server picker and login view (xegim)
 - fix: Index of numbered lists are off (Krille)
 - fix: never use a transition on the shell route (Rafał Hirsch)

lib/pages/chat/events/message.dart

@@ -422,11 +422,14 @@ class Message extends StatelessWidget {
                                                 Padding(
                                                   padding:
                                                       const EdgeInsets.only(
-                                                    top: 4.0,
+                                                    bottom: 8.0,
+                                                    left: 16.0,
+                                                    right: 16.0,
                                                   ),
                                                   child: Row(
                                                     mainAxisSize:
                                                         MainAxisSize.min,
+                                                    spacing: 4.0,
                                                     children: [
                                                       Icon(
                                                         Icons.edit_outlined,
@@ -435,11 +438,15 @@ class Message extends StatelessWidget {
                                                         size: 14,
                                                       ),
                                                       Text(
-                                                        ' - ${displayEvent.originServerTs.localizedTimeShort(context)}',
+                                                        displayEvent
+                                                            .originServerTs
+                                                            .localizedTimeShort(
+                                                          context,
+                                                        ),
                                                         style: TextStyle(
                                                           color: textColor
                                                               .withAlpha(164),
-                                                          fontSize: 12,
+                                                          fontSize: 11,
                                                         ),
                                                       ),
                                                     ],

scripts/release-ios-testflight.sh

@@ -1,5 +1,6 @@
 #!/bin/sh -ve
 git apply ./scripts/enable-android-google-services.patch
+yq eval '.dependencies.fcm_shared_isolate = "0.1.0"' -i pubspec.yaml # Workaround: 0.2.0 does not work on iOS
 flutter clean
 flutter pub get
 cd ios