diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 8db57a659..54c4d10dc 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -22,11 +22,13 @@ import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dar import 'package:fluffychat/pangea/models/choreo_record.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; +import 'package:fluffychat/pangea/pages/games/story_game/round_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; import 'package:fluffychat/pangea/utils/report_message.dart'; import 'package:fluffychat/pangea/widgets/chat/message_toolbar.dart'; +import 'package:fluffychat/pangea/widgets/chat/round_timer.dart'; import 'package:fluffychat/pangea/widgets/igc/pangea_text_controller.dart'; import 'package:fluffychat/utils/error_reporter.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; @@ -114,8 +116,18 @@ class ChatController extends State with WidgetsBindingObserver { // #Pangea final PangeaController pangeaController = MatrixState.pangeaController; - late Choreographer choreographer = Choreographer(pangeaController, this); + final GlobalKey roundTimerStateKey = + GlobalKey(); + RoundTimer? timer; + + final List gameRounds = []; + + List get completedRoundEventIds => gameRounds + .where((round) => round.isCompleted) + .map((round) => round.userMessageIDs) + .expand((x) => x) + .toList(); // Pangea# Room get room => sendingClient.getRoomById(roomId) ?? widget.room; @@ -297,6 +309,17 @@ class ChatController extends State } } + // #Pangea + void addRound() { + debugPrint("ADDING A ROUND. Rounds so far: ${gameRounds.length}"); + final newRound = GameRoundModel(controller: this, timer: timer!); + gameRounds.add(newRound); + newRound.roundCompleter.future.then((_) { + if (mounted) addRound(); + }); + } + // Pangea# + @override void initState() { scrollController.addListener(_updateScrollController); @@ -312,6 +335,8 @@ class ChatController extends State sendingClient = Matrix.of(context).client; WidgetsBinding.instance.addObserver(this); // #Pangea + timer = RoundTimer(key: roundTimerStateKey); + addRound(); if (!mounted) return; Future.delayed(const Duration(seconds: 1), () async { if (!mounted) return; @@ -398,7 +423,8 @@ class ChatController extends State List get visibleEvents => timeline?.events .where( - (x) => x.isVisibleInGui, + (x) => + x.isVisibleInGui && !completedRoundEventIds.contains(x.eventId), ) .toList() ?? []; diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart index d64f5fbef..c420fdbee 100644 --- a/lib/pages/chat/chat_event_list.dart +++ b/lib/pages/chat/chat_event_list.dart @@ -27,7 +27,15 @@ class ChatEventList extends StatelessWidget { final horizontalPadding = FluffyThemes.isColumnMode(context) ? 8.0 : 0.0; final events = controller.timeline!.events - .where((event) => event.isVisibleInGui) + .where( + (event) => + event.isVisibleInGui + // #Pangea + && + !controller.completedRoundEventIds.contains(event.eventId) + // Pangea# + , + ) .toList(); final animateInEventIndex = controller.animateInEventIndex; diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 648b5b780..ffc0e14b4 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -118,6 +118,10 @@ class ChatView extends StatelessWidget { // #Pangea } else { return [ + controller.timer ?? const SizedBox(), + const SizedBox( + width: 10, + ), ChatSettingsPopupMenu( controller.room, (!controller.room.isDirectChat && !controller.room.isArchived), diff --git a/lib/pages/chat/event_info_dialog.dart b/lib/pages/chat/event_info_dialog.dart index 38acdc84c..8b8f1e703 100644 --- a/lib/pages/chat/event_info_dialog.dart +++ b/lib/pages/chat/event_info_dialog.dart @@ -1,14 +1,12 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; extension EventInfoDialogExtension on Event { void showInfoDialog(BuildContext context) => showAdaptiveBottomSheet( @@ -49,15 +47,16 @@ class EventInfoDialog extends StatelessWidget { children: [ ListTile( leading: Avatar( - mxContent: event.senderFromMemoryOrFallback.avatarUrl, - name: event.senderFromMemoryOrFallback.calcDisplayname(), + // mxContent: event.senderFromMemoryOrFallback.avatarUrl, + // name: event.senderFromMemoryOrFallback.calcDisplayname(), + name: "?", client: event.room.client, - presenceUserId: event.senderId, + // presenceUserId: event.senderId, ), title: Text(L10n.of(context)!.sender), - subtitle: Text( - '${event.senderFromMemoryOrFallback.calcDisplayname()} [${event.senderId}]', - ), + // subtitle: Text( + // '${event.senderFromMemoryOrFallback.calcDisplayname()} [${event.senderId}]', + // ), ), ListTile( title: Text(L10n.of(context)!.time), diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 345d74ac1..280ea3082 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -269,9 +269,10 @@ class Message extends StatelessWidget { final user = snapshot.data ?? event.senderFromMemoryOrFallback; return Avatar( - mxContent: user.avatarUrl, - name: user.calcDisplayname(), - presenceUserId: user.stateKey, + // mxContent: user.avatarUrl, + // name: user.calcDisplayname(), + // presenceUserId: user.stateKey, + name: "?", presenceBackgroundColor: avatarPresenceBackgroundColor, onTap: () => onAvatarTab(event), @@ -294,10 +295,11 @@ class Message extends StatelessWidget { : FutureBuilder( future: event.fetchSenderUser(), builder: (context, snapshot) { - final displayname = snapshot.data - ?.calcDisplayname() ?? - event.senderFromMemoryOrFallback - .calcDisplayname(); + // final displayname = snapshot.data + // ?.calcDisplayname() ?? + // event.senderFromMemoryOrFallback + // .calcDisplayname(); + const displayname = "?"; return Text( displayname, style: TextStyle( diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 3fd28cd6c..6431f8efb 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -96,12 +96,16 @@ class MessageContent extends StatelessWidget { ListTile( contentPadding: EdgeInsets.zero, leading: Avatar( - mxContent: sender.avatarUrl, - name: sender.calcDisplayname(), - presenceUserId: sender.stateKey, + // mxContent: sender.avatarUrl, + // name: sender.calcDisplayname(), + // presenceUserId: sender.stateKey, + name: "?", client: event.room.client, ), - title: Text(sender.calcDisplayname()), + title: const Text( + // sender.calcDisplayname(), + "?", + ), subtitle: Text(event.originServerTs.localizedTime(context)), trailing: const Icon(Icons.lock_outlined), ), @@ -265,9 +269,10 @@ class MessageContent extends StatelessWidget { builder: (context, snapshot) { final reason = event.redactedBecause?.content.tryGet('reason'); - final redactedBy = snapshot.data?.calcDisplayname() ?? - event.redactedBecause?.senderId.localpart ?? - L10n.of(context)!.user; + // final redactedBy = snapshot.data?.calcDisplayname() ?? + // event.redactedBecause?.senderId.localpart ?? + // L10n.of(context)!.user; + const redactedBy = "?"; return _ButtonContent( label: reason == null ? L10n.of(context)!.redactedBy(redactedBy) @@ -382,8 +387,9 @@ class MessageContent extends StatelessWidget { builder: (context, snapshot) { return _ButtonContent( label: L10n.of(context)!.userSentUnknownEvent( - snapshot.data?.calcDisplayname() ?? - event.senderFromMemoryOrFallback.calcDisplayname(), + // snapshot.data?.calcDisplayname() ?? + // event.senderFromMemoryOrFallback.calcDisplayname(), + "?", event.type, ), icon: 'ℹ️', diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index b48f16cd9..a31765d38 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -59,7 +59,8 @@ class ReplyContent extends StatelessWidget { future: displayEvent.fetchSenderUser(), builder: (context, snapshot) { return Text( - '${snapshot.data?.calcDisplayname() ?? displayEvent.senderFromMemoryOrFallback.calcDisplayname()}:', + // '${snapshot.data?.calcDisplayname() ?? displayEvent.senderFromMemoryOrFallback.calcDisplayname()}:', + '?:', maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart index af8b82069..21fd6794e 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -37,9 +37,10 @@ class SeenByRow extends StatelessWidget { ? seenByUsers.sublist(0, maxAvatars) : seenByUsers) .map( - (user) => Avatar( - mxContent: user.avatarUrl, - name: user.calcDisplayname(), + (user) => const Avatar( + // mxContent: user.avatarUrl, + // name: user.calcDisplayname(), + name: "?", size: 16, ), ), diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart index 35fbf5d25..e02d59d1e 100644 --- a/lib/pages/chat/typing_indicators.dart +++ b/lib/pages/chat/typing_indicators.dart @@ -1,12 +1,11 @@ import 'dart:async'; -import 'package:flutter/material.dart'; - import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/material.dart'; class TypingIndicators extends StatelessWidget { final ChatController controller; @@ -56,10 +55,11 @@ class TypingIndicators extends StatelessWidget { child: Stack( children: [ if (typingUsers.isNotEmpty) - Avatar( + const Avatar( size: avatarSize, - mxContent: typingUsers.first.avatarUrl, - name: typingUsers.first.calcDisplayname(), + // mxContent: typingUsers.first.avatarUrl, + // name: typingUsers.first.calcDisplayname(), + name: "?", ), if (typingUsers.length == 2) Padding( @@ -69,9 +69,10 @@ class TypingIndicators extends StatelessWidget { mxContent: typingUsers.length == 2 ? typingUsers.last.avatarUrl : null, - name: typingUsers.length == 2 - ? typingUsers.last.calcDisplayname() - : '+${typingUsers.length - 1}', + // name: typingUsers.length == 2 + // ? typingUsers.last.calcDisplayname() + // : '+${typingUsers.length - 1}', + name: "?", ), ), ], diff --git a/lib/pages/chat_details/participant_list_item.dart b/lib/pages/chat_details/participant_list_item.dart index 9b5580692..4f63a6238 100644 --- a/lib/pages/chat_details/participant_list_item.dart +++ b/lib/pages/chat_details/participant_list_item.dart @@ -39,9 +39,10 @@ class ParticipantListItem extends StatelessWidget { ), title: Row( children: [ - Expanded( + const Expanded( child: Text( - user.calcDisplayname(), + // user.calcDisplayname(), + "?", overflow: TextOverflow.ellipsis, ), ), @@ -88,8 +89,9 @@ class ParticipantListItem extends StatelessWidget { subtitle: Text(user.id), leading: Avatar( mxContent: user.avatarUrl, - name: user.calcDisplayname(), - presenceUserId: user.stateKey, + // name: user.calcDisplayname(), + // presenceUserId: user.stateKey, + name: "?", ), ), ); diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 76c75e83b..54995d31d 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -1,11 +1,9 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/utils/get_chat_list_item_subtitle.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:fluffychat/widgets/hover_builder.dart'; -import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; @@ -240,51 +238,52 @@ class ChatListItem extends StatelessWidget { softWrap: false, ) // #Pangea - : FutureBuilder( - future: room.lastEvent != null - ? GetChatListItemSubtitle().getSubtitle( - L10n.of(context)!, - room.lastEvent, - MatrixState.pangeaController, - ) - : Future.value(L10n.of(context)!.emptyChat), - builder: (context, snapshot) { - // Pangea# - return Text( - room.membership == Membership.invite - ? isDirectChat - ? L10n.of(context)!.invitePrivateChat - : L10n.of(context)!.inviteGroupChat - // #Pangea - : snapshot.data ?? - // Pangea# - room.lastEvent - ?.calcLocalizedBodyFallback( - MatrixLocals(L10n.of(context)!), - hideReply: true, - hideEdit: true, - plaintextBody: true, - removeMarkdown: true, - withSenderNamePrefix: !isDirectChat || - directChatMatrixId != - room.lastEvent?.senderId, - ) ?? - L10n.of(context)!.emptyChat, - softWrap: false, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: unread || room.hasNewMessages - ? FontWeight.bold - : null, - color: theme.colorScheme.onSurfaceVariant, - decoration: room.lastEvent?.redacted == true - ? TextDecoration.lineThrough - : null, - ), - ); - }, - ), + : const SizedBox(), + // FutureBuilder( + // future: room.lastEvent != null + // ? GetChatListItemSubtitle().getSubtitle( + // L10n.of(context)!, + // room.lastEvent, + // MatrixState.pangeaController, + // ) + // : Future.value(L10n.of(context)!.emptyChat), + // builder: (context, snapshot) { + // // Pangea# + // return Text( + // room.membership == Membership.invite + // ? isDirectChat + // ? L10n.of(context)!.invitePrivateChat + // : L10n.of(context)!.inviteGroupChat + // // #Pangea + // : snapshot.data ?? + // // Pangea# + // room.lastEvent + // ?.calcLocalizedBodyFallback( + // MatrixLocals(L10n.of(context)!), + // hideReply: true, + // hideEdit: true, + // plaintextBody: true, + // removeMarkdown: true, + // withSenderNamePrefix: !isDirectChat || + // directChatMatrixId != + // room.lastEvent?.senderId, + // ) ?? + // L10n.of(context)!.emptyChat, + // softWrap: false, + // maxLines: 1, + // overflow: TextOverflow.ellipsis, + // style: TextStyle( + // fontWeight: unread || room.hasNewMessages + // ? FontWeight.bold + // : null, + // color: theme.colorScheme.onSurfaceVariant, + // decoration: room.lastEvent?.redacted == true + // ? TextDecoration.lineThrough + // : null, + // ), + // ); + // }, + // ), ), const SizedBox(width: 8), // #Pangea diff --git a/lib/pages/chat_search/chat_search_message_tab.dart b/lib/pages/chat_search/chat_search_message_tab.dart index 7542d6ae9..68e627282 100644 --- a/lib/pages/chat_search/chat_search_message_tab.dart +++ b/lib/pages/chat_search/chat_search_message_tab.dart @@ -1,14 +1,12 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/avatar.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; class ChatSearchMessageTab extends StatelessWidget { final String searchQuery; @@ -98,9 +96,10 @@ class ChatSearchMessageTab extends StatelessWidget { } final event = events[i]; final sender = event.senderFromMemoryOrFallback; - final displayname = sender.calcDisplayname( - i18n: MatrixLocals(L10n.of(context)!), - ); + // final displayname = sender.calcDisplayname( + // i18n: MatrixLocals(L10n.of(context)!), + // ); + const displayname = "?"; return _MessageSearchResultListTile( sender: sender, displayname: displayname, diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index ef79c0e31..7bd189288 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -22,9 +22,10 @@ class UserBottomSheetView extends StatelessWidget { Widget build(BuildContext context) { final user = controller.widget.user; final userId = (user?.id ?? controller.widget.profile?.userId)!; - final displayname = (user?.calcDisplayname() ?? - controller.widget.profile?.displayName ?? - controller.widget.profile?.userId.localpart)!; + // final displayname = (user?.calcDisplayname() ?? + // controller.widget.profile?.displayName ?? + // controller.widget.profile?.userId.localpart)!; + const displayname = "?"; final avatarUrl = user?.avatarUrl ?? controller.widget.profile?.avatarUrl; final client = Matrix.of(controller.widget.outerContext).client; @@ -39,7 +40,7 @@ class UserBottomSheetView extends StatelessWidget { title: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(displayname), + const Text(displayname), PresenceBuilder( userId: userId, client: client, @@ -213,7 +214,7 @@ class UserBottomSheetView extends StatelessWidget { foregroundColor: Theme.of(context).colorScheme.onSurface, ), - label: Text( + label: const Text( displayname, maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/lib/pangea/extensions/sync_update_extension.dart b/lib/pangea/extensions/sync_update_extension.dart index 6adb55c69..68c1f684a 100644 --- a/lib/pangea/extensions/sync_update_extension.dart +++ b/lib/pangea/extensions/sync_update_extension.dart @@ -1,85 +1,20 @@ import 'package:matrix/matrix.dart'; extension MembershipUpdate on SyncUpdate { - bool isMembershipUpdate(String userId) { - return isMembershipUpdateByType(Membership.join, userId) || - isMembershipUpdateByType(Membership.leave, userId) || - isMembershipUpdateByType(Membership.invite, userId); - } - - bool isMembershipUpdateByType(Membership type, String userId) { - final List? updates = getRoomUpdates(type); - if (updates?.isEmpty ?? true) { - return false; + List messages(Room chat) { + if (rooms?.join == null || + !rooms!.join!.containsKey(chat.id) || + rooms!.join![chat.id]!.timeline?.events == null) { + return []; } - for (final SyncRoomUpdate update in updates!) { - final List? events = getRoomUpdateEvents(type, update); - if (hasMembershipUpdate( - events, - type.name, - userId, - )) { - return true; - } - } - return false; - } - - List? getRoomUpdates(Membership type) { - switch (type) { - case Membership.join: - return rooms?.join?.values.toList(); - case Membership.leave: - return rooms?.leave?.values.toList(); - case Membership.invite: - return rooms?.invite?.values.toList(); - default: - return null; - } - } - - bool isSpaceChildUpdate(String activeSpaceId) { - if (rooms?.join?.isEmpty ?? true) { - return false; - } - for (final update in rooms!.join!.entries) { - final String spaceId = update.key; - final List? timelineEvents = update.value.timeline?.events; - final bool isUpdate = timelineEvents != null && - spaceId == activeSpaceId && - timelineEvents.any((event) => event.type == EventTypes.SpaceChild); - if (isUpdate) return true; - } - return false; + return rooms!.join![chat.id]!.timeline!.events! + .where( + (event) => + event.type == EventTypes.Message && + !event.eventId.startsWith("Pangea Chat"), + ) + .map((event) => Event.fromMatrixEvent(event, chat)) + .toList(); } } - -List? getRoomUpdateEvents(Membership type, SyncRoomUpdate update) { - switch (type) { - case Membership.join: - return (update as JoinedRoomUpdate).timeline?.events; - case Membership.leave: - return (update as LeftRoomUpdate).timeline?.events; - case Membership.invite: - return (update as InvitedRoomUpdate).inviteState; - default: - return null; - } -} - -bool hasMembershipUpdate( - List? events, - String membershipType, - String userId, -) { - if (events == null) { - return false; - } - return events.any( - (event) => - event.type == EventTypes.RoomMember && - event.stateKey == userId && - event.content['membership'] == membershipType, - ); -} diff --git a/lib/pangea/pages/games/story_game/round_model.dart b/lib/pangea/pages/games/story_game/round_model.dart new file mode 100644 index 000000000..c192c36a6 --- /dev/null +++ b/lib/pangea/pages/games/story_game/round_model.dart @@ -0,0 +1,102 @@ +import 'dart:async'; + +import 'package:fluffychat/pages/chat/chat.dart'; +import 'package:fluffychat/pangea/extensions/sync_update_extension.dart'; +import 'package:fluffychat/pangea/utils/bot_name.dart'; +import 'package:fluffychat/pangea/widgets/chat/round_timer.dart'; +import 'package:flutter/material.dart'; +import 'package:matrix/matrix.dart'; + +enum RoundState { notStarted, inProgress, completed } + +class GameRoundModel { + static const int timerMaxSeconds = 180; + final String adminName = BotName.byEnvironment; + + final ChatController controller; + final Completer roundCompleter = Completer(); + late DateTime createdAt; + RoundTimer timer; + DateTime? startTime; + DateTime? endTime; + RoundState state = RoundState.notStarted; + StreamSubscription? syncSubscription; + final List userMessageIDs = []; + final List botMessageIDs = []; + + GameRoundModel({ + required this.controller, + required this.timer, + }) { + createdAt = DateTime.now(); + syncSubscription ??= client.onSync.stream.listen(_handleSync); + } + + void _handleSync(SyncUpdate update) { + final newMessages = update + .messages(controller.room) + .where((msg) => msg.originServerTs.isAfter(createdAt)) + .toList(); + + final botMessages = + newMessages.where((msg) => msg.senderId == adminName).toList(); + final userMessages = + newMessages.where((msg) => msg.senderId != adminName).toList(); + + final hasNewBotMessage = botMessages.any( + (msg) => !botMessageIDs.contains(msg.eventId), + ); + + if (hasNewBotMessage) { + if (state == RoundState.notStarted) { + startRound(); + } else if (state == RoundState.inProgress) { + endRound(); + return; + } + } + + if (state == RoundState.inProgress) { + for (final message in botMessages) { + if (!botMessageIDs.contains(message.eventId)) { + botMessageIDs.add(message.eventId); + } + } + + for (final message in userMessages) { + if (!userMessageIDs.contains(message.eventId)) { + userMessageIDs.add(message.eventId); + } + } + } + } + + Client get client => controller.pangeaController.matrixState.client; + + bool get isCompleted => roundCompleter.isCompleted; + + void startRound() { + debugPrint("starting round"); + state = RoundState.inProgress; + startTime = DateTime.now(); + controller.roundTimerStateKey.currentState?.resetTimer( + roundLength: timerMaxSeconds, + ); + controller.roundTimerStateKey.currentState?.startTimer(); + } + + void endRound() { + debugPrint( + "ending round, user message IDs: $userMessageIDs, bot message IDs: $botMessageIDs", + ); + endTime = DateTime.now(); + state = RoundState.completed; + controller.roundTimerStateKey.currentState?.resetTimer(); + syncSubscription?.cancel(); + roundCompleter.complete(); + } + + void dispose() { + syncSubscription?.cancel(); + } +} diff --git a/lib/pangea/widgets/chat/round_timer.dart b/lib/pangea/widgets/chat/round_timer.dart new file mode 100644 index 000000000..83641983d --- /dev/null +++ b/lib/pangea/widgets/chat/round_timer.dart @@ -0,0 +1,113 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; + +/// Create a timer that counts down to the given time +/// Default duration is 180 seconds +class RoundTimer extends StatefulWidget { + final int timerMaxSeconds; + final Duration roundDuration; + + const RoundTimer({ + super.key, + this.timerMaxSeconds = 180, + this.roundDuration = const Duration(seconds: 1), + }); + + @override + RoundTimerState createState() => RoundTimerState(); +} + +class RoundTimerState extends State { + int currentSeconds = 0; + Timer? _timer; + bool isTiming = false; + Duration? duration; + int timerMaxSeconds = 180; + + void resetTimer({Duration? roundDuration, int? roundLength}) { + if (_timer != null) { + _timer!.cancel(); + isTiming = false; + } + if (roundDuration != null) { + duration = roundDuration; + } + if (roundLength != null) { + timerMaxSeconds = roundLength; + } + setState(() { + currentSeconds = 0; + }); + } + + int get remainingTime => timerMaxSeconds - currentSeconds; + + String get timerText => + '${(remainingTime ~/ 60).toString().padLeft(2, '0')}: ${(remainingTime % 60).toString().padLeft(2, '0')}'; + + startTimer() { + _timer = Timer.periodic(duration ?? widget.roundDuration, (timer) { + setState(() { + currentSeconds++; + if (currentSeconds >= timerMaxSeconds) timer.cancel(); + }); + }); + setState(() { + isTiming = true; + }); + } + + stopTimer() { + if (_timer != null) { + _timer!.cancel(); + } + setState(() { + isTiming = false; + }); + } + + @override + void initState() { + duration = widget.roundDuration; + timerMaxSeconds = widget.timerMaxSeconds; + super.initState(); + } + + @override + void dispose() { + if (_timer != null) { + _timer!.cancel(); + } + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Material( + color: const Color.fromARGB(255, 126, 22, 14), + child: Padding( + padding: const EdgeInsets.all( + 5, + ), + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(timerText), + // Row( + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // IconButton( + // onPressed: isTiming ? stopTimeout : startTimeout, + // icon: Icon(isTiming ? Icons.pause_circle : Icons.play_circle), + // ), + // ], + // ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/utils/matrix_sdk_extensions/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart index b4536b6db..f959898ed 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_locals.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_locals.dart @@ -184,9 +184,9 @@ class MatrixLocals extends MatrixLocalizations { @override String redactedAnEvent(Event redactedEvent) { return l10n.redactedAnEvent( - redactedEvent.redactedBecause?.senderFromMemoryOrFallback - .calcDisplayname() ?? - l10n.user, + // redactedEvent.redactedBecause?.senderFromMemoryOrFallback + // .calcDisplayname() ?? + l10n.user, ); } @@ -198,7 +198,8 @@ class MatrixLocals extends MatrixLocalizations { @override String removedBy(Event redactedEvent) { return l10n.redactedBy( - redactedEvent.senderFromMemoryOrFallback.calcDisplayname(), + // redactedEvent.senderFromMemoryOrFallback.calcDisplayname(), + "?", ); } diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart index 02c70b088..277894473 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,5 +1,4 @@ import 'package:flutter/widgets.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; @@ -20,17 +19,21 @@ extension RoomStatusExtension on Room { } else if (typingUsers.length == 1) { typingText = L10n.of(context)!.isTyping; if (typingUsers.first.id != directChatMatrixID) { - typingText = - L10n.of(context)!.userIsTyping(typingUsers.first.calcDisplayname()); + typingText = L10n.of(context)!.userIsTyping( + // typingUsers.first.calcDisplayname(), + "?", + ); } } else if (typingUsers.length == 2) { typingText = L10n.of(context)!.userAndUserAreTyping( - typingUsers.first.calcDisplayname(), - typingUsers[1].calcDisplayname(), + // typingUsers.first.calcDisplayname(), + // typingUsers[1].calcDisplayname(), + "?", "?", ); } else if (typingUsers.length > 2) { typingText = L10n.of(context)!.userAndOthersAreTyping( - typingUsers.first.calcDisplayname(), + // typingUsers.first.calcDisplayname(), + "?", (typingUsers.length - 1).toString(), ); }