diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 5e263738c..8da8c82f9 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -339,7 +339,11 @@ class ChatView extends StatelessWidget { child: ChatEventList(controller: controller), ), ), - if (controller.showScrollDownButton) + // #Pangea + // if (controller.showScrollDownButton) + if (controller.showScrollDownButton && + !controller.room.showActivityFinished) + // Pangea# Divider( height: 1, color: theme.dividerColor, @@ -354,8 +358,13 @@ 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.showActivityFinished) + // Pangea# Container( margin: EdgeInsets.all(bottomSheetPadding), constraints: const BoxConstraints( diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index 0e8f5da68..b01f18c3c 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -50,7 +50,12 @@ class ChatPermissionsSettingsView extends StatelessWidget { controller.defaultPowerLevels, ); - final excludedEvents = [PangeaEventTypes.activityRole]; + final excludedEvents = [ + PangeaEventTypes.activityRole, + PangeaEventTypes.activitySummary, + PangeaEventTypes.coursePlan, + PangeaEventTypes.courseUser, + ]; Map missingPowerLevels = Map.from( defaults, diff --git a/lib/pangea/activity_sessions/activity_room_extension.dart b/lib/pangea/activity_sessions/activity_room_extension.dart index 61a08ed35..ed95db329 100644 --- a/lib/pangea/activity_sessions/activity_room_extension.dart +++ b/lib/pangea/activity_sessions/activity_room_extension.dart @@ -329,6 +329,9 @@ extension ActivityRoomExtension on Room { bool get isActivitySession => isActivityRoomType || activityPlan != null; + bool get showActivityFinished => + showActivityChatUI && ownRole != null && hasCompletedActivity; + Future getActivityAnalytics() async { // wait for local storage box to init in getAnalytics initialization if (!MatrixState.pangeaController.getAnalytics.initCompleter.isCompleted) { diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_finished_status_message.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_finished_status_message.dart index 9cf0529f3..5fb6223da 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_finished_status_message.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_finished_status_message.dart @@ -76,9 +76,7 @@ class ActivityFinishedStatusMessage extends StatelessWidget { @override Widget build(BuildContext context) { - if (!controller.room.showActivityChatUI || - controller.room.ownRole == null || - !controller.room.hasCompletedActivity) { + if (!controller.room.showActivityFinished) { return const SizedBox.shrink(); } @@ -86,7 +84,6 @@ class ActivityFinishedStatusMessage extends StatelessWidget { return AnimatedSize( duration: FluffyThemes.animationDuration, child: Container( - margin: const EdgeInsets.only(top: 20.0), padding: const EdgeInsets.all(12.0), decoration: BoxDecoration( color: theme.colorScheme.surface, @@ -96,7 +93,9 @@ class ActivityFinishedStatusMessage extends StatelessWidget { ), child: Center( child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 400), + constraints: const BoxConstraints( + maxWidth: 400, + ), child: Column( spacing: 12.0, mainAxisSize: MainAxisSize.min, diff --git a/lib/pangea/chat/constants/default_power_level.dart b/lib/pangea/chat/constants/default_power_level.dart index c79a40276..96a2b4922 100644 --- a/lib/pangea/chat/constants/default_power_level.dart +++ b/lib/pangea/chat/constants/default_power_level.dart @@ -70,6 +70,7 @@ class RoomDefaults { "invite": 50, "redact": 50, "events": { + PangeaEventTypes.courseUser: 100, "m.room.power_levels": 100, "m.room.join_rules": 100, "m.space.child": spaceChild,