action_sheet: Add 'Channel feed' button to channel action sheet

chrisbobbe · chrisbobbe · commit 8e32b3ce872c · 2025-08-20T10:46:13.000-07:00
Fixes #1705.
diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb
@@ -116,6 +116,10 @@
   "@actionSheetOptionListOfTopics": {
     "description": "Label for navigating to a channel's topic-list page."
   },
+  "actionSheetOptionChannelFeed": "Channel feed",
+  "@actionSheetOptionChannelFeed": {
+    "description": "Label for navigating to a channel's channel-feed page."
+  },
   "actionSheetOptionUnsubscribe": "Unsubscribe",
   "@actionSheetOptionUnsubscribe": {
     "description": "Label in the channel action sheet for unsubscribing from the channel."
diff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart
@@ -305,6 +305,12 @@ abstract class ZulipLocalizations {
   /// **'List of topics'**
   String get actionSheetOptionListOfTopics;
 
+  /// Label for navigating to a channel's channel-feed page.
+  ///
+  /// In en, this message translates to:
+  /// **'Channel feed'**
+  String get actionSheetOptionChannelFeed;
+
   /// Label in the channel action sheet for unsubscribing from the channel.
   ///
   /// In en, this message translates to:
diff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'List of topics';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart
@@ -104,6 +104,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Themenliste';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Deabonnieren';
 
diff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'List of topics';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart
@@ -104,6 +104,9 @@ class ZulipLocalizationsFr extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Liste des sujets';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart
@@ -103,6 +103,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Elenco degli argomenti';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart
@@ -101,6 +101,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'トピック一覧';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'List of topics';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart
@@ -104,6 +104,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Lista wątków';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart
@@ -104,6 +104,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Список тем';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Отписаться';
 
diff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'List of topics';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Seznam tem';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart
@@ -105,6 +105,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'Список тем';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Скасувати підписку';
 
diff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart
@@ -102,6 +102,9 @@ class ZulipLocalizationsZh extends ZulipLocalizations {
   @override
   String get actionSheetOptionListOfTopics => 'List of topics';
 
+  @override
+  String get actionSheetOptionChannelFeed => 'Channel feed';
+
   @override
   String get actionSheetOptionUnsubscribe => 'Unsubscribe';
 
diff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart
@@ -334,12 +334,19 @@ enum BottomSheetDismissButtonStyle {
 /// Show a sheet of actions you can take on a channel.
 ///
 /// Needs a [PageRoot] ancestor.
+/// May or may not have a [MessageListPage] ancestor;
+/// some callers are on that page and some aren't.
 void showChannelActionSheet(BuildContext context, {
   required int channelId,
   bool showTopicListButton = true,
 }) {
   final pageContext = PageRoot.contextOf(context);
   final store = PerAccountStoreWidget.of(pageContext);
+  final messageListPageState = MessageListPage.maybeAncestorOf(pageContext);
+
+  final messageListPageNarrow = messageListPageState?.narrow;
+  final isOnChannelFeed = messageListPageNarrow is ChannelNarrow
+    && messageListPageNarrow.streamId == channelId;
 
   final unreadCount = store.unreads.countInChannelNarrow(channelId);
   final isSubscribed = store.subscriptions[channelId] != null;
@@ -352,6 +359,8 @@ void showChannelActionSheet(BuildContext context, {
         MarkChannelAsReadButton(pageContext: pageContext, channelId: channelId),
       if (showTopicListButton)
         TopicListButton(pageContext: pageContext, channelId: channelId),
+      if (!isOnChannelFeed)
+        ChannelFeedButton(pageContext: pageContext, channelId: channelId),
       CopyChannelLinkButton(channelId: channelId, pageContext: pageContext)
     ],
     if (isSubscribed)
@@ -452,6 +461,30 @@ class TopicListButton extends ActionSheetMenuItemButton {
   }
 }
 
+class ChannelFeedButton extends ActionSheetMenuItemButton {
+  const ChannelFeedButton({
+    super.key,
+    required this.channelId,
+    required super.pageContext,
+  });
+
+  final int channelId;
+
+  @override
+  IconData get icon => ZulipIcons.message_feed;
+
+  @override
+  String label(ZulipLocalizations zulipLocalizations) {
+    return zulipLocalizations.actionSheetOptionChannelFeed;
+  }
+
+  @override
+  void onPressed() {
+    Navigator.push(pageContext,
+      MessageListPage.buildRoute(context: pageContext, narrow: ChannelNarrow(channelId)));
+  }
+}
+
 class CopyChannelLinkButton extends ActionSheetMenuItemButton {
   const CopyChannelLinkButton({
     super.key,
diff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart
@@ -181,7 +181,9 @@ void main() {
     }
 
     Future<void> showFromInbox(WidgetTester tester) async {
+      transitionDurationObserver = TransitionDurationObserver();
       await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,
+        navigatorObservers: [transitionDurationObserver],
         child: const HomePage()));
       await tester.pump();
       check(find.byType(InboxPageBody)).findsOne();
@@ -425,6 +427,61 @@ void main() {
       check(find.text('some topic foo')).findsOne();
     });
 
+    group('ChannelFeedButton', () {
+      Future<void> tapButtonAndPump(WidgetTester tester) async {
+        await tester.tap(findButtonForLabel('Channel feed'));
+        await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e
+      }
+
+      testWidgets('from inbox: visible', (tester) async {
+        await prepare();
+        await showFromInbox(tester);
+        checkButton('Channel feed');
+      });
+
+      testWidgets('from subscription list: visible', (tester) async {
+        await prepare();
+        await showFromSubscriptionList(tester);
+        checkButton('Channel feed');
+      });
+
+      testWidgets('from recipient header in combined feed: visible', (tester) async {
+        await prepare();
+        await showFromRecipientHeader(tester);
+        checkButton('Channel feed');
+      });
+
+      testWidgets('from app bar on topic list: visible', (tester) async {
+        await prepare();
+        await showFromTopicListAppBar(tester);
+        checkButton('Channel feed');
+      });
+
+      testWidgets('from msglist app bar on channel feed: not visible', (tester) async {
+        await prepare();
+        await showFromMsglistAppBar(tester, narrow: ChannelNarrow(someChannel.streamId));
+        checkNoButton('Channel feed');
+      });
+
+      // (The channel action sheet isn't reached from a recipient header
+      // in the channel feed.)
+
+      testWidgets('navigates to channel feed', (tester) async {
+        await prepare();
+        await showFromInbox(tester);
+
+        connection.prepare(json: eg.newestGetMessagesResult(
+          foundOldest: true, messages: []).toJson());
+        // for topic autocomplete
+        connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());
+        await tapButtonAndPump(tester);
+        await transitionDurationObserver.pumpPastTransition(tester);
+
+        final appBar = tester.widget(find.byType(MessageListAppBarTitle)) as MessageListAppBarTitle;
+        check(appBar.narrow).equals(ChannelNarrow(someChannel.streamId));
+      });
+    });
+
     group('CopyChannelLinkButton', () {
       setUp(() async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
