ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add padding to bottom of activity role tooltip, move activity start page rendering inside of room state stream builder

Browse source
This commit is contained in:
ggurdin 2025-11-12 10:26:15 -05:00
parent 4eebc4b820
commit fbd71ef988
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pages/chat/chat.dart
View file

@ -29,7 +29,6 @@ import 'package:fluffychat/pages/chat/recording_dialog.dart';
import 'package:fluffychat/pages/chat_details/chat_details.dart';
import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart';
import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
import 'package:fluffychat/pangea/activity_sessions/activity_session_start/activity_session_start_page.dart';
import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
import 'package:fluffychat/pangea/analytics_misc/gain_points_animation.dart';
@ -2368,14 +2367,6 @@ class ChatController extends State<ChatPageWithRoom>
child: CircularProgressIndicator.adaptive(),
);
}
if (room.isActivitySession && !room.isActivityStarted) {
return ActivitySessionStartPage(
activityId: room.activityId!,
roomId: room.id,
parentId: room.courseParent?.id,
);
}
// Pangea#
final theme = Theme.of(context);
return Row(

11
lib/pages/chat/chat_view.dart
View file

@ -17,6 +17,7 @@ import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.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_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';
import 'package:fluffychat/pangea/chat/widgets/chat_input_bar.dart';
@ -203,6 +204,16 @@ class ChatView extends StatelessWidget {
builder: (context, snapshot) => FutureBuilder(
future: controller.loadTimelineFuture,
builder: (BuildContext context, snapshot) {
// #Pangea
if (controller.room.isActivitySession &&
!controller.room.isActivityStarted) {
return ActivitySessionStartPage(
activityId: controller.room.activityId!,
roomId: controller.roomId,
parentId: controller.room.courseParent?.id,
);
}
// Pangea#
var appbarBottomHeight = 0.0;
if (controller.room.pinnedEventIds.isNotEmpty) {
appbarBottomHeight += ChatAppBarListTile.fixedHeight;

6
lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
View file

@ -30,11 +30,7 @@ class ActivityRoleTooltip extends StatelessWidget {
onClose: () async {
await room.dismissGoalTooltip();
},
padding: const EdgeInsets.only(
left: 16.0,
top: 16.0,
right: 16.0,
),
padding: const EdgeInsets.all(16.0),
);
},
);