pastemyst | Use channelTopicLabelSpan for consistent channel/topic display

lib/widgets/inbox.dart - _TopicItem changes

Dartcopy raw

lib/widgets/all_channels.dart - AllChannelsListEntry changes

Dartcopy raw

lib/widgets/subscription_list.dart - SubscriptionItem changes

Dartcopy raw

lib/widgets/message_list.dart - StreamMessageRecipientHeader changes

Dartcopy raw

streamWidget = GestureDetector(
        onTap: () => Navigator.push(context,
          MessageListPage.buildRoute(context: context,
            narrow: ChannelNarrow(streamId))),
        onLongPress: () => showChannelActionSheet(context, channelId: streamId),
        child: Padding(
          padding: const EdgeInsets.symmetric(vertical: 11),
          child: Text.rich(
            style: recipientHeaderTextStyle(context),
            overflow: TextOverflow.ellipsis,
            channelTopicLabelSpan(
              context: context,
              channelId: streamId,
              topic: topic,
              fontSize: recipientHeaderTextStyle(context).fontSize!,
              color: recipientHeaderTextStyle(context).color!,
            )));
    }

return GestureDetector(
      // When already in a topic narrow, disable tap interaction that would just
      // push a MessageListPage for the same topic narrow.
      // TODO(#1039) simplify by removing topic-narrow condition if we remove
      //   recipient headers in topic narrows
      onTap: narrow is TopicNarrow ? null
        : () => Navigator.push(context,
            MessageListPage.buildRoute(context: context,
              narrow: TopicNarrow.ofMessage(message))),
      onLongPress: () => showTopicActionSheet(context,
        channelId: streamId,
        topic: topic,
        someMessageIdInTopic: message.id),
      child: ColoredBox(
        color: backgroundColor,
        child: Row(
          crossAxisAlignment: CrossAxisAlignment.center,
          children: [
            // TODO(#282): Long stream name will break layout; find a fix.
            Expanded(child: streamWidget),
            // TODO topic links?
            // Then web also has edit/resolve/mute buttons. Skip those for mobile.
            RecipientHeaderDate(message: message),
          ])));

lib/widgets/message_list.dart - MessageListAppBarTitle _buildStreamRow changes

Dartcopy raw

lib/widgets/message_list.dart - MessageListAppBarTitle TopicNarrow case changes

Dartcopy raw

case TopicNarrow(:var streamId, :var topic):
        final store = PerAccountStoreWidget.of(context);
        final stream = store.streams[streamId];
        final alignment = willCenterTitle
          ? Alignment.center
          : AlignmentDirectional.centerStart;
        return SizedBox(
          width: double.infinity,
          child: GestureDetector(
            behavior: HitTestBehavior.translucent,
            onLongPress: () {
              final someMessage = MessageListPage.ancestorOf(context)
                .model?.messages.lastOrNull;
              // If someMessage is null, the topic action sheet won't have a
              // resolve/unresolve button. That seems OK; in that case we're
              // either still fetching messages (and the user can reopen the
              // sheet after that finishes) or there aren't any messages to
              // act on anyway.
              assert(someMessage == null || narrow.containsMessage(someMessage)!);
              showTopicActionSheet(context,
                channelId: streamId,
                topic: topic,
                someMessageIdInTopic: someMessage?.id);
            },
            child: Align(alignment: alignment,
              child: stream == null
                ? Text(zulipLocalizations.unknownChannelName)
                : Text.rich(
                    channelTopicLabelSpan(
                      context: context,
                      channelId: streamId,
                      topic: topic,
                      fontSize: 16,
                      color: colorSwatchFor(context, store.subscriptions[streamId])
                        .iconOnBarBackground,
                    )))));

Summary of Changes

Plain Textcopy raw