Skip to content

fix(mobile): align Android conversation headers and reactions #8082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klopez4212 merged 3 commits into from
Oct 4, 2026
Merged

fix(mobile): align Android conversation headers and reactions #8082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f31a8c
fix(mobile): align Android conversation headers and reactions
klopez4212 Oct 4, 2026
a99e7c3
fix(mobile): open held reaction tab on Android
klopez4212 Oct 4, 2026
5c90b44
Merge remote-tracking branch 'origin/main' into kennylopez-android-co…
klopez4212 Oct 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 27 additions & 85 deletions mobile/lib/features/channels/channel_detail_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lucide_icons_flutter/lucide_icons.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

import '../../shared/animated_avatar.dart';
import '../../shared/emoji/emoji_burst.dart';
import '../../shared/huddle/huddle.dart';
import '../../shared/identity_names/identity_names.dart';
Expand All @@ -28,10 +27,7 @@ import '../../shared/widgets/frosted_scaffold.dart';
import '../../shared/widgets/flapping_bee.dart';
import '../../shared/widgets/keyboard_dismiss_on_drag.dart';
import '../../shared/widgets/load_error_view.dart';
import '../../shared/widgets/ios_glass_navigation_button.dart';
import '../../shared/widgets/masked_avatar_badge.dart';
import '../../shared/widgets/message_author_meta.dart';
import '../../shared/widgets/modal_presentation.dart';
import '../../shared/widgets/skeleton.dart';
import '../profile/presence_cache_provider.dart';
import '../profile/profile_provider.dart';
Expand All @@ -44,7 +40,6 @@ import 'channel_actions_sheet.dart';
import 'channel_identity_names_provider.dart';
import 'channel_member_profile_actions.dart';
import 'channel_link_navigation.dart';
import 'agent_activity/working_bots_provider.dart';
import 'channel_management_provider.dart';
import 'channel_sections/channel_sections_provider.dart';
import 'channel_messages_provider.dart';
Expand All @@ -65,7 +60,6 @@ import 'jump_to_latest_switcher.dart';
import 'local_message_send_animation_provider.dart';
import 'local_message_send_transition.dart';
import 'mobile_huddle_controller.dart';
import 'members_sheet.dart';
import 'message_actions.dart';
import 'message_action_backdrop_state.dart';
import 'message_long_press_region.dart';
Expand Down Expand Up @@ -520,13 +514,8 @@ class ChannelDetailPage extends HookConsumerWidget {
!resolvedChannel.isForum &&
isConnectionInProgress &&
!messagesNotifier.hasLoadedMessages;
final appBarTitleContentHeight = _twoLineAppBarTitleContentHeight(
context,
isDm: resolvedChannel.isDm,
);
final usesNativeIosGlassBackButton =
Navigator.canPop(context) &&
Theme.of(context).platform == TargetPlatform.iOS;
final appBarTitleContentHeight = _twoLineAppBarTitleContentHeight(context);

final readTimestamp = _channelReadTimestamp(
channel: resolvedChannel,
messagesState: messagesState,
Expand Down Expand Up @@ -574,15 +563,14 @@ class ChannelDetailPage extends HookConsumerWidget {
});
}, [channel.id, readState.isReady, readTimestamp]);

final nativeDm =
resolvedChannel.isDm && defaultTargetPlatform == TargetPlatform.iOS
final dmHeader = resolvedChannel.isDm
? _watchDmHeader(ref, resolvedChannel, currentPubkey)
: null;
final nativeMembers = ref.watch(channelMembersProvider(resolvedChannel.id));
final nativeMemberCount =
nativeMembers.value?.length ?? resolvedChannel.memberCount;
final nativeMemberLabel =
'$nativeMemberCount ${nativeMemberCount == 1 ? 'member' : 'members'}';
final headerMembers = ref.watch(channelMembersProvider(resolvedChannel.id));
final headerMemberCount =
headerMembers.value?.length ?? resolvedChannel.memberCount;
final headerMemberLabel =
'$headerMemberCount ${headerMemberCount == 1 ? 'member' : 'members'}';
Future<void> openChannelDetails() async {
final shouldClose = await showChannelDetailsPage(
context: context,
Expand Down Expand Up @@ -611,21 +599,22 @@ class ChannelDetailPage extends HookConsumerWidget {
resizeToAvoidBottomInset:
!usesFixedAndroidImeViewport || resolvedChannel.isForum,
appBar: FrostedAppBar(
alwaysFrosted: true,
nativeViewSuppressed: messageActionBackdropActive,
nativeEphemeralLabel: ephemeralChannelDisplay(
resolvedChannel,
)?.tooltipLabel,
nativeTitle:
nativeDm?.label ??
dmHeader?.label ??
resolveDmChannelDisplayLabel(
resolvedChannel,
currentPubkey: currentPubkey,
),
nativeSubtitle: isOneToOneDm
? nativeDm?.presenceLabel
: nativeMemberLabel,
? dmHeader?.presenceLabel
: headerMemberLabel,
nativeTitlePresenceColor: switch (isOneToOneDm
? nativeDm?.presence
? dmHeader?.presence
: null) {
'online' => context.appColors.success,
'away' => context.appColors.warning,
Expand All @@ -643,68 +632,21 @@ class ChannelDetailPage extends HookConsumerWidget {
iconColor: context.colors.primary,
titleContentHeight: appBarTitleContentHeight,
titleStyle: channelTitleTextStyle,
title: Padding(
padding: EdgeInsets.only(
left: usesNativeIosGlassBackButton
? iosGlassChannelHeaderTitleSpacing
: 0,
),
child: resolvedChannel.isDm
? _DmAppBarTitle(
channel: resolvedChannel,
currentPubkey: currentPubkey,
)
: _ChannelAppBarTitle(
channel: resolvedChannel,
onTap: openChannelDetails,
),
centerTitle: true,
title: _ConversationAppBarTitle(
channel: resolvedChannel,
label: dmHeader?.label ?? resolvedChannel.name,
subtitle: isOneToOneDm ? dmHeader!.presenceLabel : headerMemberLabel,
presence: isOneToOneDm ? dmHeader?.presence : null,
onTap: openChannelDetails,
),
actions: resolvedChannel.isDm
? [
if (showsHuddleAction)
_HuddleButton(
channel: resolvedChannel,
events: [
...messagesState.value ?? const [],
...huddleLifecycle,
],
),
if (_showsMembersAction(resolvedChannel))
_MembersButton(
channelId: resolvedChannel.id,
channel: resolvedChannel,
currentPubkey: currentPubkey,
),
IconButton(
color: context.colors.primary,
onPressed: () async {
final shouldClose = await showChannelActionsSheet(
context: context,
channel: resolvedChannel,
isUnread: false,
sectionId: ref
.read(channelSectionsProvider)
.store
.assignments[resolvedChannel.id],
);
if (shouldClose == true && context.mounted) {
Navigator.of(context).pop();
}
},
tooltip: 'Channel actions',
icon: const Icon(LucideIcons.ellipsisVertical, size: 22),
),
]
: [
if (showsComposer)
_HuddleButton(
channel: resolvedChannel,
events: [
...messagesState.value ?? const [],
...huddleLifecycle,
],
),
],
actions: [
if (resolvedChannel.isDm ? showsHuddleAction : showsComposer)
_HuddleButton(
channel: resolvedChannel,
events: [...messagesState.value ?? const [], ...huddleLifecycle],
),
],
),
body: Stack(
fit: StackFit.expand,
Expand Down
Loading
Loading