Merge remote-tracking branch 'pr/1076'

Author: gnprice

assets/l10n/app_en.arb

@@ -19,6 +19,19 @@
   "@chooseAccountPageTitle": {
     "description": "Title for the page to choose between Zulip accounts."
   },
+  "switchAccountButton": "Switch account",
+  "@switchAccountButton": {
+    "description": "Label for main-menu button leading to the choose-account page."
+  },
+  "tryAnotherAccountMessage": "Your account at {url} is taking a while to load.",
+  "@tryAnotherAccountMessage": {
+    "description": "Message that appears on the loading screen after waiting for some time.",
+    "url": {"type": "String", "example": "http://chat.example.com/"}
+  },
+  "tryAnotherAccountButton": "Try another account",
+  "@tryAnotherAccountButton": {
+    "description": "Label for loading screen button prompting user to try another account."
+  },
   "chooseAccountPageLogOutButton": "Log out",
   "@chooseAccountPageLogOutButton": {
     "description": "Label for the 'Log out' button for an account on the choose-account page"
@@ -529,6 +542,10 @@
   "@userRoleUnknown": {
     "description": "Label for UserRole.unknown"
   },
+  "inboxPageTitle": "Inbox",
+  "@inboxPageTitle": {
+    "description": "Title for the page with unreads."
+  },
   "recentDmConversationsPageTitle": "Direct messages",
   "@recentDmConversationsPageTitle": {
     "description": "Title for the page with a list of DM conversations."
@@ -545,6 +562,14 @@
   "@starredMessagesPageTitle": {
     "description": "Page title for the 'Starred messages' message view."
   },
+  "channelsPageTitle": "Channels",
+  "@channelsPageTitle": {
+    "description": "Title for the page with a list of subscribed channels."
+  },
+  "mainMenuMyProfile": "My profile",
+  "@mainMenuMyProfile": {
+    "description": "Label for main-menu button leading to the user's own profile."
+  },
   "channelFeedButtonTooltip": "Channel feed",
   "@channelFeedButtonTooltip": {
     "description": "Tooltip for button to navigate to a given channel's feed"

lib/generated/l10n/zulip_localizations.dart

@@ -127,6 +127,24 @@ abstract class ZulipLocalizations {
   /// **'Choose account'**
   String get chooseAccountPageTitle;
 
+  /// Label for main-menu button leading to the choose-account page.
+  ///
+  /// In en, this message translates to:
+  /// **'Switch account'**
+  String get switchAccountButton;
+
+  /// Message that appears on the loading screen after waiting for some time.
+  ///
+  /// In en, this message translates to:
+  /// **'Your account at {url} is taking a while to load.'**
+  String tryAnotherAccountMessage(Object url);
+
+  /// Label for loading screen button prompting user to try another account.
+  ///
+  /// In en, this message translates to:
+  /// **'Try another account'**
+  String get tryAnotherAccountButton;
+
   /// Label for the 'Log out' button for an account on the choose-account page
   ///
   /// In en, this message translates to:
@@ -799,6 +817,12 @@ abstract class ZulipLocalizations {
   /// **'Unknown'**
   String get userRoleUnknown;
 
+  /// Title for the page with unreads.
+  ///
+  /// In en, this message translates to:
+  /// **'Inbox'**
+  String get inboxPageTitle;
+
   /// Title for the page with a list of DM conversations.
   ///
   /// In en, this message translates to:
@@ -823,6 +847,18 @@ abstract class ZulipLocalizations {
   /// **'Starred messages'**
   String get starredMessagesPageTitle;
 
+  /// Title for the page with a list of subscribed channels.
+  ///
+  /// In en, this message translates to:
+  /// **'Channels'**
+  String get channelsPageTitle;
+
+  /// Label for main-menu button leading to the user's own profile.
+  ///
+  /// In en, this message translates to:
+  /// **'My profile'**
+  String get mainMenuMyProfile;
+
   /// Tooltip for button to navigate to a given channel's feed
   ///
   /// In en, this message translates to:

lib/generated/l10n/zulip_localizations_ar.dart

@@ -23,6 +23,17 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   @override
   String get chooseAccountPageTitle => 'Choose account';
 
+  @override
+  String get switchAccountButton => 'Switch account';
+
+  @override
+  String tryAnotherAccountMessage(Object url) {
+    return 'Your account at $url is taking a while to load.';
+  }
+
+  @override
+  String get tryAnotherAccountButton => 'Try another account';
+
   @override
   String get chooseAccountPageLogOutButton => 'Log out';
 
@@ -419,6 +430,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   @override
   String get userRoleUnknown => 'Unknown';
 
+  @override
+  String get inboxPageTitle => 'Inbox';
+
   @override
   String get recentDmConversationsPageTitle => 'Direct messages';
 
@@ -431,6 +445,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   @override
   String get starredMessagesPageTitle => 'Starred messages';
 
+  @override
+  String get channelsPageTitle => 'Channels';
+
+  @override
+  String get mainMenuMyProfile => 'My profile';
+
   @override
   String get channelFeedButtonTooltip => 'Channel feed';
 

lib/generated/l10n/zulip_localizations_en.dart

@@ -23,6 +23,17 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   @override
   String get chooseAccountPageTitle => 'Choose account';
 
+  @override
+  String get switchAccountButton => 'Switch account';
+
+  @override
+  String tryAnotherAccountMessage(Object url) {
+    return 'Your account at $url is taking a while to load.';
+  }
+
+  @override
+  String get tryAnotherAccountButton => 'Try another account';
+
   @override
   String get chooseAccountPageLogOutButton => 'Log out';
 
@@ -419,6 +430,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   @override
   String get userRoleUnknown => 'Unknown';
 
+  @override
+  String get inboxPageTitle => 'Inbox';
+
   @override
   String get recentDmConversationsPageTitle => 'Direct messages';
 
@@ -431,6 +445,12 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   @override
   String get starredMessagesPageTitle => 'Starred messages';
 
+  @override
+  String get channelsPageTitle => 'Channels';
+
+  @override
+  String get mainMenuMyProfile => 'My profile';
+
   @override
   String get channelFeedButtonTooltip => 'Channel feed';
 

lib/generated/l10n/zulip_localizations_ja.dart

@@ -23,6 +23,17 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   @override
   String get chooseAccountPageTitle => 'アカウントを選択';
 
+  @override
+  String get switchAccountButton => 'Switch account';
+
+  @override
+  String tryAnotherAccountMessage(Object url) {
+    return 'Your account at $url is taking a while to load.';
+  }
+
+  @override
+  String get tryAnotherAccountButton => 'Try another account';
+
   @override
   String get chooseAccountPageLogOutButton => 'Log out';
 
@@ -419,6 +430,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   @override
   String get userRoleUnknown => '不明';
 
+  @override
+  String get inboxPageTitle => 'Inbox';
+
   @override
   String get recentDmConversationsPageTitle => 'Direct messages';
 
@@ -431,6 +445,12 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   @override
   String get starredMessagesPageTitle => 'Starred messages';
 
+  @override
+  String get channelsPageTitle => 'Channels';
+
+  @override
+  String get mainMenuMyProfile => 'My profile';
+
   @override
   String get channelFeedButtonTooltip => 'Channel feed';
 

lib/widgets/action_sheet.dart

@@ -88,17 +88,13 @@ void showMessageActionSheet({required BuildContext context, required Message mes
                     borderRadius: BorderRadius.circular(7),
                     child: Column(spacing: 1,
                       children: optionButtons))))),
-              const MessageActionSheetCancelButton(),
+              const ActionSheetCancelButton(),
             ])));
     });
 }
 
-abstract class MessageActionSheetMenuItemButton extends StatelessWidget {
-  MessageActionSheetMenuItemButton({
-    super.key,
-    required this.message,
-    required this.pageContext,
-  }) : assert(pageContext.findAncestorWidgetOfExactType<MessageListPage>() != null);
+abstract class ActionSheetMenuItemButton extends StatelessWidget {
+  const ActionSheetMenuItemButton({super.key, required this.pageContext});
 
   IconData get icon;
   String label(ZulipLocalizations zulipLocalizations);
@@ -111,8 +107,6 @@ abstract class MessageActionSheetMenuItemButton extends StatelessWidget {
   /// For operations that need a [BuildContext], see [pageContext].
   void onPressed();
 
-  final Message message;
-
   /// A context within the [MessageListPage] this action sheet was
   /// triggered from.
   final BuildContext pageContext;
@@ -157,14 +151,25 @@ abstract class MessageActionSheetMenuItemButton extends StatelessWidget {
   }
 }
 
-class MessageActionSheetCancelButton extends StatelessWidget {
-  const MessageActionSheetCancelButton({super.key});
+abstract class MessageActionSheetMenuItemButton extends ActionSheetMenuItemButton {
+  MessageActionSheetMenuItemButton({
+    super.key,
+    required this.message,
+    required super.pageContext,
+  }) : assert(pageContext.findAncestorWidgetOfExactType<MessageListPage>() != null);
+
+  final Message message;
+}
+
+class ActionSheetCancelButton extends StatelessWidget {
+  const ActionSheetCancelButton({super.key});
 
   @override
   Widget build(BuildContext context) {
     final designVariables = DesignVariables.of(context);
     return TextButton(
       style: TextButton.styleFrom(
+        minimumSize: const Size.fromHeight(44),
         padding: const EdgeInsets.all(10),
         foregroundColor: designVariables.contextMenuCancelText,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(7)),
@@ -178,8 +183,7 @@ class MessageActionSheetCancelButton extends StatelessWidget {
       },
       child: Text(ZulipLocalizations.of(context).dialogCancel,
         style: const TextStyle(fontSize: 20, height: 24 / 20)
-          .merge(weightVariableTextStyle(context, wght: 600))),
-    );
+          .merge(weightVariableTextStyle(context, wght: 600))));
   }
 }