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

chore: hide activity chat UI elements for older activity chats (#3627)

Browse source
This commit is contained in:
ggurdin 2025-08-05 10:59:30 -04:00 • committed by GitHub
parent 600494b3c8
commit aabb97bc15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 58 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/pages/chat/chat_event_list.dart
View file

@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:scroll_to_index/scroll_to_index.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pages/chat/events/message.dart';
@ -94,53 +93,30 @@ class ChatEventList extends StatelessWidget {
// Request history button or progress indicator:
if (i == events.length + 1) {
if (timeline.isRequestingHistory) {
// #Pangea
// return const Center(
// child: CircularProgressIndicator.adaptive(strokeWidth: 2),
// );
return const Column(
children: [
SizedBox(height: AppConfig.toolbarMaxHeight),
Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
),
],
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
// Pangea#
}
if (timeline.canRequestHistory) {
return Builder(
builder: (context) {
// #Pangea
WidgetsBinding.instance
.addPostFrameCallback((_) => controller.requestHistory);
return Column(
children: [
const SizedBox(height: AppConfig.toolbarMaxHeight),
Center(
child: IconButton(
onPressed: controller.requestHistory,
icon: const Icon(Icons.refresh_outlined),
),
),
],
);
// WidgetsBinding.instance
// .addPostFrameCallback(controller.requestHistory);
// return Center(
// child: IconButton(
// onPressed: controller.requestHistory,
// icon: const Icon(Icons.refresh_outlined),
// ),
// );
WidgetsBinding.instance.addPostFrameCallback(
(_) => controller.requestHistory(),
);
// Pangea#
return Center(
child: IconButton(
onPressed: controller.requestHistory,
icon: const Icon(Icons.refresh_outlined),
),
);
},
);
}
// #Pangea
// return const SizedBox.shrink();
return const SizedBox(height: AppConfig.toolbarMaxHeight);
// Pangea#
return const SizedBox.shrink();
}
i--;

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

@ -424,8 +424,9 @@ class ChatView extends StatelessWidget {
if (!controller.room.isAbandonedDMRoom &&
controller.room.canSendDefaultMessages &&
controller.room.membership == Membership.join &&
controller.room.hasJoinedActivity &&
!controller.room.hasFinishedActivity)
(controller.room.activityPlan == null ||
!controller.room.showActivityChatUI ||
controller.room.isActiveInActivity))
AnimatedSize(
duration: const Duration(milliseconds: 200),
child: SizedBox(
@ -441,8 +442,9 @@ class ChatView extends StatelessWidget {
if (!controller.room.isAbandonedDMRoom &&
controller.room.canSendDefaultMessages &&
controller.room.membership == Membership.join &&
controller.room.hasJoinedActivity &&
!controller.room.hasFinishedActivity)
(controller.room.activityPlan == null ||
!controller.room.showActivityChatUI ||
controller.room.isActiveInActivity))
Positioned(
left: 0,
right: 0,

44
lib/pangea/activity_planner/activity_pinned_message.dart
View file

@ -64,7 +64,9 @@ class ActivityPinnedMessageState extends State<ActivityPinnedMessage> {
@override
Widget build(BuildContext context) {
if (!room.hasJoinedActivity || room.activityPlan == null) {
// if the room has no activity, or if it doesn't have the permission
// levels for sending the required events, don't show the pinned message
if (!room.showActivityChatUI) {
return const SizedBox.shrink();
}
@ -91,27 +93,25 @@ class ActivityPinnedMessageState extends State<ActivityPinnedMessage> {
leading: const SizedBox(width: 18.0),
trailing: Padding(
padding: const EdgeInsets.only(right: 12.0),
child: room.hasFinishedActivity
? null
: ElevatedButton(
onPressed:
_showDropdown ? null : () => _setShowDropdown(true),
style: ElevatedButton.styleFrom(
minimumSize: Size.zero,
padding: const EdgeInsets.symmetric(
horizontal: 12.0,
vertical: 4.0,
),
backgroundColor: theme.colorScheme.onSurface,
foregroundColor: theme.colorScheme.surface,
),
child: Text(
L10n.of(context).done,
style: const TextStyle(
fontSize: 12.0,
),
),
),
child: ElevatedButton(
onPressed:
_showDropdown ? null : () => _setShowDropdown(true),
style: ElevatedButton.styleFrom(
minimumSize: Size.zero,
padding: const EdgeInsets.symmetric(
horizontal: 12.0,
vertical: 4.0,
),
backgroundColor: theme.colorScheme.onSurface,
foregroundColor: theme.colorScheme.surface,
),
child: Text(
L10n.of(context).done,
style: const TextStyle(
fontSize: 12.0,
),
),
),
),
onTap: _scrollToActivity,
),

17
lib/pangea/activity_planner/activity_room_extension.dart
View file

@ -196,13 +196,22 @@ extension ActivityRoomExtension on Room {
.toList();
}
bool get hasJoinedActivity {
return activityPlan == null || activityRole(client.userID!) != null;
bool get showActivityChatUI {
return activityPlan != null &&
powerForChangingStateEvent(PangeaEventTypes.activityRole) == 0 &&
powerForChangingStateEvent(PangeaEventTypes.activitySummary) == 0;
}
bool get hasFinishedActivity {
bool get isActiveInActivity {
if (!showActivityChatUI) return false;
final role = activityRole(client.userID!);
return role != null && role.isFinished;
return role != null && !role.isFinished;
}
bool get isInactiveInActivity {
if (!showActivityChatUI) return false;
final role = activityRole(client.userID!);
return role == null || role.isFinished;
}
bool get activityIsFinished {

6
lib/pangea/activity_planner/activity_status_message.dart
View file

@ -33,10 +33,14 @@ class ActivityStatusMessageState extends State<ActivityStatusMessage> {
@override
Widget build(BuildContext context) {
if (!widget.room.showActivityChatUI) {
return const SizedBox.shrink();
}
return Material(
child: AnimatedSize(
duration: FluffyThemes.animationDuration,
child: !widget.room.hasJoinedActivity || widget.room.activityIsFinished
child: widget.room.isInactiveInActivity
? Padding(
padding: EdgeInsets.only(
bottom: FluffyThemes.isColumnMode(context) ? 32.0 : 16.0,