Prep for bottom tabs and main menu

lib/widgets/action_sheet.dart

@@ -169,9 +169,10 @@ class MessageActionSheetCancelButton extends StatelessWidget {
         foregroundColor: designVariables.contextMenuCancelText,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(7)),
         splashFactory: NoSplash.splashFactory,
-      ).copyWith(backgroundColor: WidgetStateColor.resolveWith((states) =>
-          designVariables.contextMenuCancelBg.withFadedAlpha(
-            states.contains(WidgetState.pressed) ? 0.20 : 0.15))),
+      ).copyWith(backgroundColor: WidgetStateColor.fromMap({
+        WidgetState.pressed: designVariables.contextMenuCancelPressedBg,
+        ~WidgetState.pressed: designVariables.contextMenuCancelBg,
+      })),
       onPressed: () {
         Navigator.pop(context);
       },

lib/widgets/app.dart

@@ -7,21 +7,16 @@ import 'package:flutter/scheduler.dart';
 import '../generated/l10n/zulip_localizations.dart';
 import '../log.dart';
 import '../model/localizations.dart';
-import '../model/narrow.dart';
 import '../model/store.dart';
 import '../notifications/display.dart';
 import 'about_zulip.dart';
 import 'actions.dart';
-import 'app_bar.dart';
 import 'dialog.dart';
+import 'home.dart';
 import 'inbox.dart';
 import 'login.dart';
-import 'message_list.dart';
 import 'page.dart';
-import 'recent_dm_conversations.dart';
 import 'store.dart';
-import 'subscription_list.dart';
-import 'text.dart';
 import 'theme.dart';
 
 class ZulipApp extends StatefulWidget {
@@ -339,88 +334,3 @@ class ChooseAccountPageOverflowButton extends StatelessWidget {
       });
   }
 }
-
-class HomePage extends StatelessWidget {
-  const HomePage({super.key});
-
-  static Route<void> buildRoute({required int accountId}) {
-    return MaterialAccountWidgetRoute(accountId: accountId,
-      page: const HomePage());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final store = PerAccountStoreWidget.of(context);
-    final zulipLocalizations = ZulipLocalizations.of(context);
-
-    final colorScheme = ColorScheme.of(context);
-
-    InlineSpan bold(String text) => TextSpan(
-      style: const TextStyle().merge(weightVariableTextStyle(context, wght: 700)),
-      text: text);
-
-    int? testStreamId;
-    if (store.connection.realmUrl.origin == 'https://chat.zulip.org') {
-      testStreamId = 7; // i.e. `#test here`; TODO cut this scaffolding hack
-    }
-
-    return Scaffold(
-      appBar: ZulipAppBar(title: const Text("Home")),
-      body: ElevatedButtonTheme(
-        data: ElevatedButtonThemeData(style: ButtonStyle(
-          backgroundColor: WidgetStatePropertyAll(colorScheme.secondaryContainer),
-          foregroundColor: WidgetStatePropertyAll(colorScheme.onSecondaryContainer))),
-        child: Center(
-          child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [
-            DefaultTextStyle.merge(
-              textAlign: TextAlign.center,
-              style: const TextStyle(fontSize: 18),
-              child: Column(children: [
-                Text.rich(TextSpan(
-                  text: 'Connected to: ',
-                  children: [bold(store.realmUrl.toString())])),
-              ])),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                MessageListPage.buildRoute(context: context,
-                  narrow: const CombinedFeedNarrow())),
-              child: Text(zulipLocalizations.combinedFeedPageTitle)),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                MessageListPage.buildRoute(context: context,
-                  narrow: const MentionsNarrow())),
-              child: Text(zulipLocalizations.mentionsPageTitle)),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                MessageListPage.buildRoute(context: context,
-                  narrow: const StarredMessagesNarrow())),
-              child: Text(zulipLocalizations.starredMessagesPageTitle)),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                InboxPage.buildRoute(context: context)),
-              child: const Text("Inbox")), // TODO(i18n)
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                SubscriptionListPage.buildRoute(context: context)),
-              child: const Text("Subscribed channels")),
-            const SizedBox(height: 16),
-            ElevatedButton(
-              onPressed: () => Navigator.push(context,
-                RecentDmConversationsPage.buildRoute(context: context)),
-              child: Text(zulipLocalizations.recentDmConversationsPageTitle)),
-            if (testStreamId != null) ...[
-              const SizedBox(height: 16),
-              ElevatedButton(
-                onPressed: () => Navigator.push(context,
-                  MessageListPage.buildRoute(context: context,
-                    narrow: ChannelNarrow(testStreamId!))),
-                child: const Text("#test here")), // scaffolding hack, see above
-            ],
-          ]))));
-  }
-}

lib/widgets/home.dart

@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+
+import '../generated/l10n/zulip_localizations.dart';
+import '../model/narrow.dart';
+import 'app_bar.dart';
+import 'inbox.dart';
+import 'message_list.dart';
+import 'page.dart';
+import 'recent_dm_conversations.dart';
+import 'store.dart';
+import 'subscription_list.dart';
+import 'text.dart';
+
+class HomePage extends StatelessWidget {
+  const HomePage({super.key});
+
+  static Route<void> buildRoute({required int accountId}) {
+    return MaterialAccountWidgetRoute(accountId: accountId,
+        page: const HomePage());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final store = PerAccountStoreWidget.of(context);
+    final zulipLocalizations = ZulipLocalizations.of(context);
+
+    final colorScheme = ColorScheme.of(context);
+
+    InlineSpan bold(String text) => TextSpan(
+      style: const TextStyle().merge(weightVariableTextStyle(context, wght: 700)),
+      text: text);
+
+    int? testStreamId;
+    if (store.connection.realmUrl.origin == 'https://chat.zulip.org') {
+      testStreamId = 7; // i.e. `#test here`; TODO cut this scaffolding hack
+    }
+
+    return Scaffold(
+      appBar: ZulipAppBar(title: const Text("Home")),
+      body: ElevatedButtonTheme(
+        data: ElevatedButtonThemeData(style: ButtonStyle(
+          backgroundColor: WidgetStatePropertyAll(colorScheme.secondaryContainer),
+          foregroundColor: WidgetStatePropertyAll(colorScheme.onSecondaryContainer))),
+        child: Center(
+          child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [
+            DefaultTextStyle.merge(
+              textAlign: TextAlign.center,
+              style: const TextStyle(fontSize: 18),
+              child: Column(children: [
+                Text.rich(TextSpan(
+                  text: 'Connected to: ',
+                  children: [bold(store.realmUrl.toString())])),
+              ])),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                MessageListPage.buildRoute(context: context,
+                  narrow: const CombinedFeedNarrow())),
+              child: Text(zulipLocalizations.combinedFeedPageTitle)),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                MessageListPage.buildRoute(context: context,
+                  narrow: const MentionsNarrow())),
+              child: Text(zulipLocalizations.mentionsPageTitle)),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                MessageListPage.buildRoute(context: context,
+                  narrow: const StarredMessagesNarrow())),
+              child: Text(zulipLocalizations.starredMessagesPageTitle)),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                InboxPage.buildRoute(context: context)),
+              child: const Text("Inbox")), // TODO(i18n)
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                SubscriptionListPage.buildRoute(context: context)),
+              child: const Text("Subscribed channels")),
+            const SizedBox(height: 16),
+            ElevatedButton(
+              onPressed: () => Navigator.push(context,
+                RecentDmConversationsPage.buildRoute(context: context)),
+              child: Text(zulipLocalizations.recentDmConversationsPageTitle)),
+            if (testStreamId != null) ...[
+              const SizedBox(height: 16),
+              ElevatedButton(
+                onPressed: () => Navigator.push(context,
+                  MessageListPage.buildRoute(context: context,
+                    narrow: ChannelNarrow(testStreamId!))),
+                child: const Text("#test here")), // scaffolding hack, see above
+            ],
+          ]))));
+  }
+}

lib/widgets/icons.dart

@@ -48,65 +48,77 @@ abstract final class ZulipIcons {
   /// The Zulip custom icon "clock".
   static const IconData clock = IconData(0xf108, fontFamily: "Zulip Icons");
 
+  /// The Zulip custom icon "contacts".
+  static const IconData contacts = IconData(0xf109, fontFamily: "Zulip Icons");
+
   /// The Zulip custom icon "copy".
-  static const IconData copy = IconData(0xf109, fontFamily: "Zulip Icons");
+  static const IconData copy = IconData(0xf10a, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "format_quote".
-  static const IconData format_quote = IconData(0xf10a, fontFamily: "Zulip Icons");
+  static const IconData format_quote = IconData(0xf10b, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "globe".
-  static const IconData globe = IconData(0xf10b, fontFamily: "Zulip Icons");
+  static const IconData globe = IconData(0xf10c, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "group_dm".
-  static const IconData group_dm = IconData(0xf10c, fontFamily: "Zulip Icons");
+  static const IconData group_dm = IconData(0xf10d, fontFamily: "Zulip Icons");
+
+  /// The Zulip custom icon "hash_italic".
+  static const IconData hash_italic = IconData(0xf10e, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "hash_sign".
-  static const IconData hash_sign = IconData(0xf10d, fontFamily: "Zulip Icons");
+  static const IconData hash_sign = IconData(0xf10f, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "image".
-  static const IconData image = IconData(0xf10e, fontFamily: "Zulip Icons");
+  static const IconData image = IconData(0xf110, fontFamily: "Zulip Icons");
+
+  /// The Zulip custom icon "inbox".
+  static const IconData inbox = IconData(0xf111, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "language".
-  static const IconData language = IconData(0xf10f, fontFamily: "Zulip Icons");
+  static const IconData language = IconData(0xf112, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "lock".
-  static const IconData lock = IconData(0xf110, fontFamily: "Zulip Icons");
+  static const IconData lock = IconData(0xf113, fontFamily: "Zulip Icons");
+
+  /// The Zulip custom icon "menu".
+  static const IconData menu = IconData(0xf114, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "message_feed".
-  static const IconData message_feed = IconData(0xf111, fontFamily: "Zulip Icons");
+  static const IconData message_feed = IconData(0xf115, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "mute".
-  static const IconData mute = IconData(0xf112, fontFamily: "Zulip Icons");
+  static const IconData mute = IconData(0xf116, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "read_receipts".
-  static const IconData read_receipts = IconData(0xf113, fontFamily: "Zulip Icons");
+  static const IconData read_receipts = IconData(0xf117, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "send".
-  static const IconData send = IconData(0xf114, fontFamily: "Zulip Icons");
+  static const IconData send = IconData(0xf118, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "share".
-  static const IconData share = IconData(0xf115, fontFamily: "Zulip Icons");
+  static const IconData share = IconData(0xf119, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "share_ios".
-  static const IconData share_ios = IconData(0xf116, fontFamily: "Zulip Icons");
+  static const IconData share_ios = IconData(0xf11a, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "smile".
-  static const IconData smile = IconData(0xf117, fontFamily: "Zulip Icons");
+  static const IconData smile = IconData(0xf11b, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "star".
-  static const IconData star = IconData(0xf118, fontFamily: "Zulip Icons");
+  static const IconData star = IconData(0xf11c, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "star_filled".
-  static const IconData star_filled = IconData(0xf119, fontFamily: "Zulip Icons");
+  static const IconData star_filled = IconData(0xf11d, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "topic".
-  static const IconData topic = IconData(0xf11a, fontFamily: "Zulip Icons");
+  static const IconData topic = IconData(0xf11e, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "unmute".
-  static const IconData unmute = IconData(0xf11b, fontFamily: "Zulip Icons");
+  static const IconData unmute = IconData(0xf11f, fontFamily: "Zulip Icons");
 
   /// The Zulip custom icon "user".
-  static const IconData user = IconData(0xf11c, fontFamily: "Zulip Icons");
+  static const IconData user = IconData(0xf120, fontFamily: "Zulip Icons");
 
   // END GENERATED ICON DATA
 }