share: Support choosing an account, if there are multiple

rajveermalviya · chrisbobbe · commit 2667b7f7db97 · 2025-08-21T14:16:39.000-07:00
Fixes: #1779
diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb
@@ -1082,6 +1082,10 @@
   "@sharePageTitle": {
     "description": "Title for the page about sharing content received from other apps."
   },
+  "shareChooseAccountLabel": "Choose account",
+  "@shareChooseAccountLabel": {
+    "description": "Label for the page about selecting an account to share content received from other apps."
+  },
   "mainMenuMyProfile": "My profile",
   "@mainMenuMyProfile": {
     "description": "Label for main-menu button leading to the user's own profile."
diff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart
@@ -1597,6 +1597,12 @@ abstract class ZulipLocalizations {
   /// **'Share'**
   String get sharePageTitle;
 
+  /// Label for the page about selecting an account to share content received from other apps.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose account'**
+  String get shareChooseAccountLabel;
+
   /// Label for main-menu button leading to the user's own profile.
   ///
   /// In en, this message translates to:
diff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart
@@ -903,6 +903,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'My profile';
 
diff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart
@@ -926,6 +926,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Teilen';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Mein Profil';
 
diff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart
@@ -903,6 +903,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'My profile';
 
diff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart
@@ -917,6 +917,9 @@ class ZulipLocalizationsFr extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'My profile';
 
diff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart
@@ -918,6 +918,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Il mio profilo';
 
diff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart
@@ -882,6 +882,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   @override
   String get sharePageTitle => '共有';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => '自分のプロフィール';
 
diff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart
@@ -903,6 +903,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'My profile';
 
diff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart
@@ -917,6 +917,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Udostępnij';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Mój profil';
 
diff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart
@@ -928,6 +928,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Поделиться';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Мой профиль';
 
diff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart
@@ -905,6 +905,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Môj profil';
 
diff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart
@@ -928,6 +928,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Moj profil';
 
diff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart
@@ -918,6 +918,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Поділитися';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'Мій профіль';
 
diff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart
@@ -903,6 +903,9 @@ class ZulipLocalizationsZh extends ZulipLocalizations {
   @override
   String get sharePageTitle => 'Share';
 
+  @override
+  String get shareChooseAccountLabel => 'Choose account';
+
   @override
   String get mainMenuMyProfile => 'My profile';
 
diff --git a/lib/widgets/app.dart b/lib/widgets/app.dart
@@ -340,10 +340,12 @@ class ChooseAccountPage extends StatelessWidget {
                   padding: const EdgeInsets.only(top: 8),
                   child: Column(mainAxisSize: MainAxisSize.min, children: [
                     for (final (:accountId, :account) in globalStore.accountEntries)
-                      _ChooseAccountListItem(
+                      ChooseAccountListItem(
                         accountId: accountId,
                         title: Text(account.realmUrl.toString()),
-                        subtitle: Text(account.email)),
+                        subtitle: Text(account.email),
+                        showLogoutMenu: true,
+                        onTap: () => HomePage.navigate(context, accountId: accountId)),
                   ]))),
                 const SizedBox(height: 12),
                 ElevatedButton(
@@ -354,16 +356,21 @@ class ChooseAccountPage extends StatelessWidget {
   }
 }
 
-class _ChooseAccountListItem extends StatelessWidget {
-  const _ChooseAccountListItem({
+class ChooseAccountListItem extends StatelessWidget {
+  const ChooseAccountListItem({
+    super.key,
     required this.accountId,
     required this.title,
     required this.subtitle,
+    required this.showLogoutMenu,
+    required this.onTap,
   });
 
   final int accountId;
   final Widget title;
   final Widget? subtitle;
+  final bool showLogoutMenu;
+  final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -378,7 +385,7 @@ class _ChooseAccountListItem extends StatelessWidget {
         subtitle: subtitle,
         tileColor: colorScheme.secondaryContainer,
         textColor: colorScheme.onSecondaryContainer,
-        trailing: MenuAnchor(
+        trailing: !showLogoutMenu ? null : MenuAnchor(
           menuChildren: [
             MenuItemButton(
               onPressed: () async {
@@ -410,7 +417,7 @@ class _ChooseAccountListItem extends StatelessWidget {
         // The default trailing padding with M3 is 24px. Decrease by 12 because
         // IconButton (the "…" button) comes with 12px padding on all sides.
         contentPadding: const EdgeInsetsDirectional.only(start: 16, end: 12),
-        onTap: () => HomePage.navigate(context, accountId: accountId)));
+        onTap: onTap));
   }
 }
 
diff --git a/lib/widgets/share.dart b/lib/widgets/share.dart
@@ -60,11 +60,7 @@ class ShareService {
 
     final globalStore = GlobalStoreWidget.of(context);
 
-    // TODO(#524) use last account used, not the first in the list
-    // TODO(#1779) allow selecting account, if there are multiple
-    final accountId = globalStore.accounts.firstOrNull?.id;
-
-    if (accountId == null) {
+    if (globalStore.accounts.isEmpty) {
       final zulipLocalizations = ZulipLocalizations.of(context);
       showErrorDialog(
         context: context,
@@ -99,11 +95,18 @@ class ShareService {
         mimeType: mimeType);
     });
 
-    unawaited(navigator.push(
-      SharePage.buildRoute(
-        accountId: accountId,
-        sharedFiles: sharedFiles,
-        sharedText: intentSendEvent.extraText)));
+    if (globalStore.accounts.length == 1) {
+      unawaited(navigator.push(
+        SharePage.buildRoute(
+          accountId: globalStore.accounts.first.id,
+          sharedFiles: sharedFiles,
+          sharedText: intentSendEvent.extraText)));
+    } else {
+      unawaited(navigator.push(MaterialWidgetRoute(
+        page: ShareChooseAccountPage(
+          sharedFiles: sharedFiles,
+          sharedText: intentSendEvent.extraText))));
+    }
   }
 }
 
@@ -206,3 +209,53 @@ class SharePage extends StatelessWidget {
         ])));
   }
 }
+
+class ShareChooseAccountPage extends StatelessWidget {
+  const ShareChooseAccountPage({
+    super.key,
+    required this.sharedFiles,
+    required this.sharedText,
+  });
+
+  final Iterable<FileToUpload>? sharedFiles;
+  final String? sharedText;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = ColorScheme.of(context);
+    final zulipLocalizations = ZulipLocalizations.of(context);
+    assert(!PerAccountStoreWidget.debugExistsOf(context));
+    final globalStore = GlobalStoreWidget.of(context);
+
+    return MenuButtonTheme(
+      data: MenuButtonThemeData(style: MenuItemButton.styleFrom(
+        backgroundColor: colorScheme.secondaryContainer,
+        foregroundColor: colorScheme.onSecondaryContainer)),
+      child: Scaffold(
+        appBar: AppBar(title: Text(zulipLocalizations.sharePageTitle)),
+        body: SafeArea(
+          minimum: const EdgeInsets.fromLTRB(8, 0, 8, 8),
+          child: Center(
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 400),
+              child: Column(mainAxisSize: MainAxisSize.min, children: [
+                Text(zulipLocalizations.shareChooseAccountLabel,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(fontSize: 18, height: 22 / 18)),
+                Flexible(child: SingleChildScrollView(
+                  padding: const EdgeInsets.only(top: 8),
+                  child: Column(mainAxisSize: MainAxisSize.min, children: [
+                    for (final (:accountId, :account) in globalStore.accountEntries)
+                      ChooseAccountListItem(
+                        accountId: accountId,
+                        title: Text(account.realmUrl.toString()),
+                        subtitle: Text(account.email),
+                        showLogoutMenu: false,
+                        onTap: () => Navigator.of(context).push(SharePage.buildRoute(
+                          accountId: accountId,
+                          sharedFiles: sharedFiles,
+                          sharedText: sharedText))),
+                  ]))),
+              ]))))));
+  }
+}
