chore: improve bubble shape and swap chat room from invite-shield to normal room on accept (#76)

Author: Feichtmeier

lib/chat_room/common/view/chat_room_page.dart

@@ -86,8 +86,14 @@ class _ChatRoomPageState extends State<ChatRoomPage> {
 
     final unAcceptedDirectChat = watchStream(
       (ChatModel m) => m
-          .getJoinedRoomUpdate(widget.room.id)
-          .map((room) => widget.room.isUnacceptedDirectChat),
+          .getUsersStreamOfJoinedRoom(
+            widget.room,
+            membershipFilter: [Membership.invite],
+          )
+          .map(
+            (invitedUsers) =>
+                widget.room.isDirectChat && invitedUsers.isNotEmpty,
+          ),
       initialValue: widget.room.isUnacceptedDirectChat,
       preserveState: false,
     ).data;

lib/chat_room/info_drawer/chat_room_info_drawer.dart

@@ -21,8 +21,11 @@ class ChatRoomInfoDrawer extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     final unAcceptedDirectChat = watchStream(
       (ChatModel m) => m
-          .getJoinedRoomUpdate(room.id)
-          .map((_) => room.isUnacceptedDirectChat),
+          .getUsersStreamOfJoinedRoom(
+            room,
+            membershipFilter: [Membership.invite],
+          )
+          .map((invitedUsers) => room.isDirectChat && invitedUsers.isNotEmpty),
       initialValue: room.isUnacceptedDirectChat,
       preserveState: false,
     ).data;

lib/chat_room/timeline/timeline_model.dart

@@ -13,7 +13,7 @@ class TimelineModel extends SafeChangeNotifier {
 
   final Map<String, bool> _updatingTimeline = {};
   bool getUpdatingTimeline(String? roomId) => _updatingTimeline[roomId] == true;
-  void setUpdatingTimeline({required String roomId, required bool value}) {
+  void _setUpdatingTimeline({required String roomId, required bool value}) {
     if (_updatingTimeline[roomId] == value) return;
     _updatingTimeline[roomId] = value;
     notifyListeners();
@@ -24,7 +24,7 @@ class TimelineModel extends SafeChangeNotifier {
     int historyCount = 50,
     StateFilter? filter,
   }) async {
-    setUpdatingTimeline(roomId: timeline.room.id, value: true);
+    _setUpdatingTimeline(roomId: timeline.room.id, value: true);
     _setTimeline(timeline: timeline);
 
     if (!timeline.room.isArchived) {
@@ -39,7 +39,7 @@ class TimelineModel extends SafeChangeNotifier {
       }
     }
 
-    setUpdatingTimeline(roomId: timeline.room.id, value: false);
+    _setUpdatingTimeline(roomId: timeline.room.id, value: false);
   }
 
   Future<void> trySetReadMarker(Timeline timeline) async {

lib/common/event_x.dart

@@ -144,4 +144,4 @@ extension EventX on Event {
   }
 }
 
-enum EventPosition { top, bottom, middle }
+enum EventPosition { top, bottom, middle, semanticSingle }

lib/common/room_x.dart

@@ -16,10 +16,10 @@ extension RoomX on Room {
       canChangeStateEvent(EventTypes.RoomPowerLevels);
 
   bool get isUnacceptedDirectChat {
-    final directChatMatrixID = this.directChatMatrixID;
-    if (directChatMatrixID != null) {
-      return unsafeGetUserFromMemoryOrFallback(directChatMatrixID).membership ==
-          Membership.invite;
+    if (isDirectChat) {
+      return getParticipants()
+          .where((p) => p.membership == Membership.invite)
+          .isNotEmpty;
     }
     return false;
   }

lib/common/view/ui_constants.dart

@@ -26,8 +26,10 @@ const Curve kAvatarAnimationCurve = Curves.easeInOut;
 const kTypingAvatarSize = 20.0;
 const kAvatarDefaultSize = 38.0;
 
-const kBubbleRadius = Radius.circular(4.0);
-const kBigBubbleRadius = Radius.circular(8.0);
+const kBubbleRadiusValue = 4.0;
+const kBigBubbleRadiusValue = 12.0;
+const kBubbleRadius = Radius.circular(kBubbleRadiusValue);
+const kBigBubbleRadius = Radius.circular(kBigBubbleRadiusValue);
 
 const windowOptions = WindowOptions(
   size: Size(1024, 800),

lib/events/view/chat_message_bubble_content.dart

@@ -91,9 +91,25 @@ class ChatMessageBubbleContent extends StatelessWidget {
                                 event.isUserEvent,
                                 context.theme,
                               ),
-                              borderRadius: const BorderRadius.all(
-                                kBigBubbleRadius,
-                              ),
+                              borderRadius: switch (eventPosition) {
+                                EventPosition.middle => BorderRadius.circular(
+                                  kBubbleRadiusValue,
+                                ),
+                                EventPosition.top => const BorderRadius.only(
+                                  topLeft: kBubbleRadius,
+                                  topRight: kBigBubbleRadius,
+                                  bottomLeft: kBubbleRadius,
+                                  bottomRight: kBubbleRadius,
+                                ),
+                                EventPosition.bottom => const BorderRadius.only(
+                                  topLeft: kBubbleRadius,
+                                  topRight: kBubbleRadius,
+                                  bottomLeft: kBigBubbleRadius,
+                                  bottomRight: kBigBubbleRadius,
+                                ),
+                                EventPosition.semanticSingle =>
+                                  const BorderRadius.all(kBigBubbleRadius),
+                              },
                             ),
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,