chore: improve video thumbnails and message bubble shapes (#90)

Author: Feichtmeier

README.md

@@ -37,6 +37,11 @@ or
 
 Run scripts/prepare-web.sh
 
+### macos
+
+cp /Users/frederik/Downloads/libcrypto.1.1.dylib ~/Projects/nebuchadnezzar/build/macos/Build/Products/Debug/nebuchadnezzar.app/Contents/Frameworks             
+
+
 
 ## Credits: Fluffy-Chat
 
@@ -46,3 +51,4 @@ Thank you for your awesome dart sdk!
 ## Why this name?
 
 The name is inspired by the traveling vehicle from the movie Matrix, which uses the name of https://en.wikipedia.org/wiki/Nebuchadnezzar_II the second king of Babylon!
+

lib/chat_room/timeline/chat_room_pinned_events_dialog.dart

@@ -81,7 +81,7 @@ class _ChatRoomPinnedEventTileState extends State<ChatRoomPinnedEventTile> {
               event: s.data!,
               timeline: widget.timeline,
               onReplyOriginClick: (p0) async {},
-              eventPosition: EventPosition.top,
+              eventPosition: EventPosition.semanticSingle,
             )
           : const Text(''),
     );

lib/common/event_x.dart

@@ -98,31 +98,37 @@ extension EventX on Event {
     required bool showAvatarChanges,
     required bool showDisplayNameChanges,
   }) {
-    if (prev == null && next == null) {
-      return EventPosition.top;
-    }
-    if (prev == null ||
-        prev.hideInTimeline(
+    final prevHidden =
+        prev?.hideInTimeline(
           showAvatarChanges: showAvatarChanges,
           showDisplayNameChanges: showDisplayNameChanges,
-        ) ||
-        prev.showAsBadge) {
-      return EventPosition.top;
-    }
+        ) ??
+        true;
+    final nextHidden =
+        next?.hideInTimeline(
+          showAvatarChanges: showAvatarChanges,
+          showDisplayNameChanges: showDisplayNameChanges,
+        ) ??
+        true;
 
-    if (prev.senderId != senderId) {
-      return EventPosition.top;
+    final prevVisible = !prevHidden && !(prev?.showAsBadge ?? true);
+    final nextVisible = !nextHidden && !(next?.showAsBadge ?? true);
+
+    // Single event
+    if ((!prevVisible && !nextVisible) ||
+        (next?.senderId != senderId && prev?.senderId != senderId)) {
+      return EventPosition.semanticSingle;
     }
-    if (prev.originServerTs.toLocal().day != originServerTs.toLocal().day) {
+
+    // Top of group
+    if (!prevVisible ||
+        prev!.senderId != senderId ||
+        prev.originServerTs.toLocal().day != originServerTs.toLocal().day) {
       return EventPosition.top;
     }
 
-    if (next == null ||
-        next.hideInTimeline(
-          showAvatarChanges: showAvatarChanges,
-          showDisplayNameChanges: showDisplayNameChanges,
-        ) ||
-        next.showAsBadge) {
+    // Bottom of group
+    if (!nextVisible || next!.senderId != senderId) {
       return EventPosition.bottom;
     }
 

lib/common/local_image_model.dart

@@ -21,8 +21,8 @@ class LocalImageModel extends SafeChangeNotifier {
 
   Future<Uint8List?> downloadImage({
     required Event event,
-    bool getThumbnail = true,
-  }) async => _service.downloadImage(event: event, getThumbnail: getThumbnail);
+    required bool cache,
+  }) async => _service.downloadImage(event: event, cache: cache);
 
   @override
   Future<void> dispose() async {

lib/common/local_image_service.dart

@@ -16,13 +16,15 @@ class LocalImageService {
 
   Future<Uint8List?> downloadImage({
     required Event event,
-    required bool getThumbnail,
+    required bool cache,
   }) async {
     final bytes = (await event.downloadAndDecryptAttachment(
-      getThumbnail: getThumbnail,
+      getThumbnail: event.hasThumbnail,
     )).bytes;
 
-    final cover = put(id: event.eventId, data: bytes);
+    final cover = (event.hasThumbnail && cache)
+        ? put(id: event.eventId, data: bytes)
+        : bytes;
     if (cover != null) {
       _propertiesChangedController.add(true);
     }

lib/events/view/chat_html_message.dart

@@ -162,7 +162,6 @@ class ImageExtension extends HtmlExtension {
           event: event,
           width: actualWidth,
           height: actualHeight,
-          onlyThumbnail: (actualWidth * actualHeight) > (256 * 256),
         ),
       ),
     );

lib/events/view/chat_image.dart

@@ -19,7 +19,6 @@ class ChatImage extends StatelessWidget with WatchItMixin {
     this.height,
     this.fit,
     this.width = imageWidth,
-    this.onlyThumbnail = true,
     this.onTap,
     this.showDescription = true,
   });
@@ -29,7 +28,6 @@ class ChatImage extends StatelessWidget with WatchItMixin {
   final double? height;
   final double width;
   final BoxFit? fit;
-  final bool onlyThumbnail;
   final VoidCallback? onTap;
   final bool showDescription;
 
@@ -83,9 +81,7 @@ class ChatImage extends StatelessWidget with WatchItMixin {
                         width: theWidth,
                         height: theHeight,
                         fit: theFit,
-                        getThumbnail: event.hasThumbnail
-                            ? onlyThumbnail
-                            : false,
+                        getThumbnail: event.hasThumbnail,
                       ),
               ),
               if (showDescription &&
@@ -132,7 +128,7 @@ class _ChatImageFutureState extends State<ChatImageFuture> {
         ? Future.value(image)
         : localImageModel.downloadImage(
             event: widget.event,
-            getThumbnail: widget.getThumbnail,
+            cache: widget.event.hasThumbnail && widget.getThumbnail,
           );
   }
 

lib/events/view/chat_message_bubble_content.dart

@@ -53,9 +53,10 @@ class ChatMessageBubbleContent extends StatelessWidget {
       children: [
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: kSmallPadding),
-          child: eventPosition != EventPosition.top
-              ? const SizedBox.square(dimension: kAvatarDefaultSize)
-              : ChatAvatar(
+          child:
+              eventPosition == EventPosition.top ||
+                  eventPosition == EventPosition.semanticSingle
+              ? ChatAvatar(
                   avatarUri: event.senderFromMemoryOrFallback.avatarUrl,
                   onTap: () => showDialog(
                     context: context,
@@ -65,7 +66,8 @@ class ChatMessageBubbleContent extends StatelessWidget {
                   fallBackColor: avatarFallbackColor(
                     context.colorScheme,
                   ).scale(saturation: -1),
-                ),
+                )
+              : const SizedBox.square(dimension: kAvatarDefaultSize),
         ),
         Flexible(
           child: Stack(
@@ -108,7 +110,9 @@ class ChatMessageBubbleContent extends StatelessWidget {
                                   bottomRight: kBigBubbleRadius,
                                 ),
                                 EventPosition.semanticSingle =>
-                                  const BorderRadius.all(kBigBubbleRadius),
+                                  const BorderRadius.all(
+                                    kBigBubbleRadius,
+                                  ).copyWith(topLeft: kBubbleRadius),
                               },
                             ),
                             child: Column(
@@ -172,7 +176,6 @@ class ChatMessageBubbleContent extends StatelessWidget {
                                             builder: (context) =>
                                                 ChatMessageImageFullScreenDialog(
                                                   event: event,
-                                                  getThumbnail: true,
                                                 ),
                                           ),
                                         ),

lib/events/view/chat_message_image_full_screen_dialog.dart

@@ -19,14 +19,9 @@ import '../../l10n/l10n.dart';
 import '../chat_download_model.dart';
 
 class ChatMessageImageFullScreenDialog extends StatefulWidget {
-  const ChatMessageImageFullScreenDialog({
-    super.key,
-    required this.event,
-    this.getThumbnail = false,
-  });
+  const ChatMessageImageFullScreenDialog({super.key, required this.event});
 
   final Event event;
-  final bool getThumbnail;
 
   @override
   State<ChatMessageImageFullScreenDialog> createState() =>
@@ -45,7 +40,7 @@ class _ChatMessageImageFullScreenDialogState
     _controller = PhotoViewController();
     _future = di<LocalImageModel>().downloadImage(
       event: widget.event,
-      getThumbnail: widget.getThumbnail,
+      cache: false,
     );
   }
 

lib/events/view/chat_message_menu.dart

@@ -107,6 +107,12 @@ class _ChatMessageMenuState extends State<ChatMessageMenu> {
                     ),
                     child: Text(context.l10n.deleteMessage, style: style),
                   ),
+                if (widget.event.status == EventStatus.error)
+                  MenuItemButton(
+                    trailingIcon: const Icon(YaruIcons.send),
+                    onPressed: () => widget.event.sendAgain(),
+                    child: Text(context.l10n.send, style: style),
+                  ),
                 if (kDebugMode)
                   MenuItemButton(
                     trailingIcon: const Icon(YaruIcons.code),