fix: show activity summaries (#4701)
This commit is contained in:
parent
09a949ca5f
commit
5f296f16d0
1 changed files with 22 additions and 1 deletions
|
|
@ -14,9 +14,11 @@ import 'package:fluffychat/pages/chat/chat_app_bar_title.dart';
|
|||
import 'package:fluffychat/pages/chat/chat_event_list.dart';
|
||||
import 'package:fluffychat/pages/chat/pinned_events.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_finished_status_message.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/load_activity_summary_widget.dart';
|
||||
import 'package:fluffychat/pangea/activity_sessions/activity_session_start/activity_session_start_page.dart';
|
||||
import 'package:fluffychat/pangea/analytics_misc/level_up/star_rain_widget.dart';
|
||||
import 'package:fluffychat/pangea/chat/widgets/chat_floating_action_button.dart';
|
||||
|
|
@ -417,8 +419,15 @@ class ChatView extends StatelessWidget {
|
|||
onPressed: controller.goToNewRoomAction,
|
||||
),
|
||||
)
|
||||
// #Pangea
|
||||
// else if (controller.room.canSendDefaultMessages &&
|
||||
// controller.room.membership == Membership.join)
|
||||
else if (controller.room.canSendDefaultMessages &&
|
||||
controller.room.membership == Membership.join)
|
||||
controller.room.membership == Membership.join &&
|
||||
(controller.room.activityPlan == null ||
|
||||
!controller.room.showActivityChatUI ||
|
||||
controller.room.isActiveInActivity))
|
||||
// Pangea#
|
||||
Container(
|
||||
margin: EdgeInsets.all(bottomSheetPadding),
|
||||
constraints: const BoxConstraints(
|
||||
|
|
@ -489,7 +498,19 @@ class ChatView extends StatelessWidget {
|
|||
|
||||
// Pangea#
|
||||
),
|
||||
)
|
||||
// #Pangea
|
||||
else if (controller.room.activityPlan != null &&
|
||||
controller.room.showActivityChatUI &&
|
||||
!controller.room.isActiveInActivity)
|
||||
ActivityFinishedStatusMessage(
|
||||
controller: controller,
|
||||
),
|
||||
if (controller.room.isActivityFinished)
|
||||
LoadActivitySummaryWidget(
|
||||
room: controller.room,
|
||||
),
|
||||
// Pangea#
|
||||
],
|
||||
),
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue