Skip to content

Commit 6e8de91

Browse files
committed
nav: Add bottom tabs and main menu
This is an initial implementation because some features were considered out-of-scope as of now for #1035. Compared to the Figma, we swapped the order of _ChannelsButton and _DirectMessagesButton in the menu so they match their order on the navigation bar. See: https://chat.zulip.org/#narrow/channel/48-mobile/topic/Buttons.20on.20the.20bottom.20tabs.20and.20main.20menu We also added _CombinedFeedButton, using the same icon we have for "Combined feed" on the web app's topleft sidebar, added a "Switch account" button, and renamed "Streams" to "Channels". Signed-off-by: Zixuan James Li <[email protected]>
1 parent 6d9037b commit 6e8de91

File tree

8 files changed

+711
-71
lines changed

8 files changed

+711
-71
lines changed

assets/l10n/app_en.arb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,10 @@
529529
"@userRoleUnknown": {
530530
"description": "Label for UserRole.unknown"
531531
},
532+
"inboxButton": "Inbox",
533+
"@inboxButton": {
534+
"description": "Label for the menu button switching to inbox."
535+
},
532536
"recentDmConversationsPageTitle": "Direct messages",
533537
"@recentDmConversationsPageTitle": {
534538
"description": "Title for the page of recent DM conversations"
@@ -545,6 +549,14 @@
545549
"@starredMessagesPageTitle": {
546550
"description": "Title for the page of starred messages."
547551
},
552+
"channelsButton": "Channels",
553+
"@channelsButton": {
554+
"description": "Label for the menu button switching to channels."
555+
},
556+
"profilePageTitle": "My profile",
557+
"@profilePageTitle": {
558+
"description": "Title for the page of the logged in user's profile."
559+
},
548560
"channelFeedButtonTooltip": "Channel feed",
549561
"@channelFeedButtonTooltip": {
550562
"description": "Tooltip for button to navigate to a given channel's feed"

lib/generated/l10n/zulip_localizations.dart

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,12 @@ abstract class ZulipLocalizations {
799799
/// **'Unknown'**
800800
String get userRoleUnknown;
801801

802+
/// Label for the menu button switching to inbox.
803+
///
804+
/// In en, this message translates to:
805+
/// **'Inbox'**
806+
String get inboxButton;
807+
802808
/// Title for the page of recent DM conversations
803809
///
804810
/// In en, this message translates to:
@@ -823,6 +829,18 @@ abstract class ZulipLocalizations {
823829
/// **'Starred messages'**
824830
String get starredMessagesPageTitle;
825831

832+
/// Label for the menu button switching to channels.
833+
///
834+
/// In en, this message translates to:
835+
/// **'Channels'**
836+
String get channelsButton;
837+
838+
/// Title for the page of the logged in user's profile.
839+
///
840+
/// In en, this message translates to:
841+
/// **'My profile'**
842+
String get profilePageTitle;
843+
826844
/// Tooltip for button to navigate to a given channel's feed
827845
///
828846
/// In en, this message translates to:

lib/generated/l10n/zulip_localizations_ar.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
419419
@override
420420
String get userRoleUnknown => 'Unknown';
421421

422+
@override
423+
String get inboxButton => 'Inbox';
424+
422425
@override
423426
String get recentDmConversationsPageTitle => 'Direct messages';
424427

@@ -431,6 +434,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
431434
@override
432435
String get starredMessagesPageTitle => 'Starred messages';
433436

437+
@override
438+
String get channelsButton => 'Channels';
439+
440+
@override
441+
String get profilePageTitle => 'My profile';
442+
434443
@override
435444
String get channelFeedButtonTooltip => 'Channel feed';
436445

lib/generated/l10n/zulip_localizations_en.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
419419
@override
420420
String get userRoleUnknown => 'Unknown';
421421

422+
@override
423+
String get inboxButton => 'Inbox';
424+
422425
@override
423426
String get recentDmConversationsPageTitle => 'Direct messages';
424427

@@ -431,6 +434,12 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
431434
@override
432435
String get starredMessagesPageTitle => 'Starred messages';
433436

437+
@override
438+
String get channelsButton => 'Channels';
439+
440+
@override
441+
String get profilePageTitle => 'My profile';
442+
434443
@override
435444
String get channelFeedButtonTooltip => 'Channel feed';
436445

lib/generated/l10n/zulip_localizations_ja.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
419419
@override
420420
String get userRoleUnknown => '不明';
421421

422+
@override
423+
String get inboxButton => 'Inbox';
424+
422425
@override
423426
String get recentDmConversationsPageTitle => 'Direct messages';
424427

@@ -431,6 +434,12 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
431434
@override
432435
String get starredMessagesPageTitle => 'Starred messages';
433436

437+
@override
438+
String get channelsButton => 'Channels';
439+
440+
@override
441+
String get profilePageTitle => 'My profile';
442+
434443
@override
435444
String get channelFeedButtonTooltip => 'Channel feed';
436445

0 commit comments

Comments
 (0)