From d166f408491a9caa2ccf02c1609f9c635fbf2663 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:46:11 -0400 Subject: [PATCH] 3988 activitycourse tweaks (#3989) * chore: set course and activity descriptions * chore: remove redundant results button --- lib/pages/chat_list/chat_list_item.dart | 23 +++++-------------- .../course_chats/course_chats_view.dart | 20 ---------------- .../course_creation/selected_course_page.dart | 1 + .../course_plan_room_extension.dart | 1 + .../spaces/utils/client_spaces_extension.dart | 2 ++ 5 files changed, 10 insertions(+), 37 deletions(-) diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 875938356..bbcaa7e54 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -27,7 +27,6 @@ class ChatListItem extends StatelessWidget { final String? filter; // #Pangea final BorderRadius? borderRadius; - final Widget? trailing; // Pangea# const ChatListItem( @@ -41,7 +40,6 @@ class ChatListItem extends StatelessWidget { super.key, // #Pangea this.borderRadius, - this.trailing, // Pangea# }); @@ -444,21 +442,12 @@ class ChatListItem extends StatelessWidget { ], ), onTap: onTap, - // #Pangea - // trailing: onForget == null - // ? null - // : IconButton( - // icon: const Icon(Icons.delete_outlined), - // onPressed: onForget, - // ), - trailing: trailing ?? - (onForget == null - ? null - : IconButton( - icon: const Icon(Icons.delete_outlined), - onPressed: onForget, - )), - // Pangea# + trailing: onForget == null + ? null + : IconButton( + icon: const Icon(Icons.delete_outlined), + onPressed: onForget, + ), ), ), ), diff --git a/lib/pangea/course_chats/course_chats_view.dart b/lib/pangea/course_chats/course_chats_view.dart index 52283daa2..daeacc0ea 100644 --- a/lib/pangea/course_chats/course_chats_view.dart +++ b/lib/pangea/course_chats/course_chats_view.dart @@ -8,7 +8,6 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; -import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart'; import 'package:fluffychat/pangea/course_chats/activity_template_chat_list_item.dart'; import 'package:fluffychat/pangea/course_chats/course_chats_page.dart'; import 'package:fluffychat/pangea/course_chats/unjoined_chat_list_item.dart'; @@ -178,25 +177,6 @@ class CourseChatsView extends StatelessWidget { borderRadius: BorderRadius.circular( AppConfig.borderRadius / 2, ), - trailing: joinedRoom.activityIsFinished - ? SizedBox( - height: 24.0, - width: 54.0, - child: ElevatedButton( - onPressed: () => - controller.onChatTap(joinedRoom), - style: ElevatedButton.styleFrom( - padding: const EdgeInsets.all(0), - ), - child: Text( - L10n.of(context).results, - style: const TextStyle( - fontSize: 12, - ), - ), - ), - ) - : null, ); } i -= joinedSessions.length; diff --git a/lib/pangea/course_creation/selected_course_page.dart b/lib/pangea/course_creation/selected_course_page.dart index a8cb8ab92..21ccbc65b 100644 --- a/lib/pangea/course_creation/selected_course_page.dart +++ b/lib/pangea/course_creation/selected_course_page.dart @@ -46,6 +46,7 @@ class SelectedCourseController extends State { final roomId = await client.createPangeaSpace( name: course.title, + topic: course.description, introChatName: L10n.of(context).introductions, announcementsChatName: L10n.of(context).announcements, visibility: sdk.Visibility.private, diff --git a/lib/pangea/course_plans/course_plan_room_extension.dart b/lib/pangea/course_plans/course_plan_room_extension.dart index c11f7fc75..9689c5bb1 100644 --- a/lib/pangea/course_plans/course_plan_room_extension.dart +++ b/lib/pangea/course_plans/course_plan_room_extension.dart @@ -233,6 +233,7 @@ extension CoursePlanRoomExtension on Room { }, visibility: sdk.Visibility.private, name: activity.title, + topic: activity.description, initialState: [ StateEvent( type: PangeaEventTypes.activityPlan, diff --git a/lib/pangea/spaces/utils/client_spaces_extension.dart b/lib/pangea/spaces/utils/client_spaces_extension.dart index 746183d8f..fb51e291f 100644 --- a/lib/pangea/spaces/utils/client_spaces_extension.dart +++ b/lib/pangea/spaces/utils/client_spaces_extension.dart @@ -15,6 +15,7 @@ extension SpacesClientExtension on Client { required String name, required String introChatName, required String announcementsChatName, + String? topic, Visibility visibility = Visibility.private, JoinRules joinRules = JoinRules.public, Uint8List? avatar, @@ -26,6 +27,7 @@ extension SpacesClientExtension on Client { creationContent: {'type': RoomCreationTypes.mSpace}, visibility: visibility, name: name.trim(), + topic: topic?.trim(), powerLevelContentOverride: {'events_default': 100}, initialState: [ RoomDefaults.defaultSpacePowerLevels(