ui [nfc]: Pull out iconDataForStream helper

sirpengi · sirpengi · commit 1412260e4e5b · 2023-11-20T18:27:54.000Z
diff --git a/:q b/:q
@@ -0,0 +1,39 @@
+[1mdiff --git lib/widgets/icons.dart lib/widgets/icons.dart[m
+[1mindex 5c3e2e501..6876325a8 100644[m
+[1m--- lib/widgets/icons.dart[m
+[1m+++ lib/widgets/icons.dart[m
+[36m@@ -66,7 +66,7 @@[m [mabstract final class ZulipIcons {[m
+   // END GENERATED ICON DATA[m
+ }[m
+ [m
+[31m-IconData iconDataF[7mrom[27mStream(ZulipStream stream) {[m
+[32m+[m[32mIconData iconDataF[7mor[27mStream(ZulipStream stream) {[m
+   // TODO: these icons aren't quite right yet; see:[m
+   //   https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/design.3A.20.23F117.20.22Inbox.22.20screen/near/1680637[m
+   return switch(stream) {[m
+[1mdiff --git lib/widgets/inbox.dart lib/widgets/inbox.dart[m
+[1mindex fded536d9..8ca6f8c64 100644[m
+[1m--- lib/widgets/inbox.dart[m
+[1m+++ lib/widgets/inbox.dart[m
+[36m@@ -385,7 +385,7 @@[m [mclass _StreamHeaderItem extends _HeaderItem {[m
+   });[m
+ [m
+   @override get title => subscription.name;[m
+[31m-  @override get icon => iconDataF[7mrom[27mStream(subscription);[m
+[32m+[m[32m  @override get icon => iconDataF[7mor[27mStream(subscription);[m
+   @override get collapsedIconColor => subscription.colorSwatch().iconOnPlainBackground;[m
+   @override get uncollapsedIconColor => subscription.colorSwatch().iconOnBarBackground;[m
+   @override get uncollapsedBackgroundColor =>[m
+[1mdiff --git lib/widgets/message_list.dart lib/widgets/message_list.dart[m
+[1mindex c10f4e186..b29ff8052 100644[m
+[1m--- lib/widgets/message_list.dart[m
+[1m+++ lib/widgets/message_list.dart[m
+[36m@@ -83,7 +83,7 @@[m [mclass MessageListAppBarTitle extends StatelessWidget {[m
+ [m
+   Widget _buildStreamRow(ZulipStream? stream, String text) {[m
+     // A null [Icon.icon] makes a blank space.[m
+[31m-    final icon = (stream != null) ? iconDataF[7mrom[27mStream(stream) : null;[m
+[32m+[m[32m    final icon = (stream != null) ? iconDataF[7mor[27mStream(stream) : null;[m
+     return Row([m
+       mainAxisSize: MainAxisSize.min,[m
+       // TODO(design): The vertical alignment of the stream privacy icon is a bit ad hoc.[m
diff --git a/lib/widgets/icons.dart b/lib/widgets/icons.dart
@@ -1,6 +1,8 @@
 
 import 'package:flutter/widgets.dart';
 
+import '../api/model/model.dart';
+
 // ignore_for_file: constant_identifier_names
 
 /// Identifiers for Zulip's custom icons.
@@ -63,3 +65,13 @@ abstract final class ZulipIcons {
 
   // END GENERATED ICON DATA
 }
+
+IconData iconDataForStream(ZulipStream stream) {
+  // TODO: these icons aren't quite right yet; see:
+  //   https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/design.3A.20.23F117.20.22Inbox.22.20screen/near/1680637
+  return switch(stream) {
+    ZulipStream(isWebPublic: true) => ZulipIcons.globe,
+    ZulipStream(inviteOnly: true) => ZulipIcons.lock,
+    ZulipStream() => ZulipIcons.hash_sign,
+  };
+}
diff --git a/lib/widgets/inbox.dart b/lib/widgets/inbox.dart
@@ -385,13 +385,7 @@ class _StreamHeaderItem extends _HeaderItem {
   });
 
   @override get title => subscription.name;
-  @override get icon => switch (subscription) {
-    // TODO these icons aren't quite right yet; see this message and the following:
-    //   https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/design.3A.20.23F117.20.22Inbox.22.20screen/near/1680637
-    Subscription(isWebPublic: true) => ZulipIcons.globe,
-    Subscription(inviteOnly: true) => ZulipIcons.lock,
-    Subscription() => ZulipIcons.hash_sign,
-  };
+  @override get icon => iconDataForStream(subscription);
   @override get collapsedIconColor => subscription.colorSwatch().iconOnPlainBackground;
   @override get uncollapsedIconColor => subscription.colorSwatch().iconOnBarBackground;
   @override get uncollapsedBackgroundColor =>
diff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart
@@ -82,12 +82,8 @@ class MessageListAppBarTitle extends StatelessWidget {
   final Narrow narrow;
 
   Widget _buildStreamRow(ZulipStream? stream, String text) {
-    final icon = switch (stream) {
-      ZulipStream(isWebPublic: true) => ZulipIcons.globe,
-      ZulipStream(inviteOnly: true) => ZulipIcons.lock,
-      ZulipStream() => ZulipIcons.hash_sign,
-      null => null, // A null [Icon.icon] makes a blank space.
-    };
+    // A null [Icon.icon] makes a blank space.
+    final icon = (stream != null) ? iconDataForStream(stream) : null;
     return Row(
       mainAxisSize: MainAxisSize.min,
       // TODO(design): The vertical alignment of the stream privacy icon is a bit ad hoc.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,39 @@ @@
 +[1mdiff --git lib/widgets/icons.dart lib/widgets/icons.dart[m
 +[1mindex 5c3e2e501..6876325a8 100644[m
 +[1m--- lib/widgets/icons.dart[m
 +[1m+++ lib/widgets/icons.dart[m
 +[36m@@ -66,7 +66,7 @@[m [mabstract final class ZulipIcons {[m
 +   // END GENERATED ICON DATA[m
 + }[m
 + [m
 +[31m-IconData iconDataF[7mrom[27mStream(ZulipStream stream) {[m
 +[32m+[m[32mIconData iconDataF[7mor[27mStream(ZulipStream stream) {[m
 +   // TODO: these icons aren't quite right yet; see:[m
 +   //   https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/design.3A.20.23F117.20.22Inbox.22.20screen/near/1680637[m
 +   return switch(stream) {[m
 +[1mdiff --git lib/widgets/inbox.dart lib/widgets/inbox.dart[m
 +[1mindex fded536d9..8ca6f8c64 100644[m
 +[1m--- lib/widgets/inbox.dart[m
 +[1m+++ lib/widgets/inbox.dart[m
 +[36m@@ -385,7 +385,7 @@[m [mclass _StreamHeaderItem extends _HeaderItem {[m
 +   });[m
 + [m
 +   @override get title => subscription.name;[m
 +[31m-  @override get icon => iconDataF[7mrom[27mStream(subscription);[m
 +[32m+[m[32m  @override get icon => iconDataF[7mor[27mStream(subscription);[m
 +   @override get collapsedIconColor => subscription.colorSwatch().iconOnPlainBackground;[m
 +   @override get uncollapsedIconColor => subscription.colorSwatch().iconOnBarBackground;[m
 +   @override get uncollapsedBackgroundColor =>[m
 +[1mdiff --git lib/widgets/message_list.dart lib/widgets/message_list.dart[m
 +[1mindex c10f4e186..b29ff8052 100644[m
 +[1m--- lib/widgets/message_list.dart[m
 +[1m+++ lib/widgets/message_list.dart[m
 +[36m@@ -83,7 +83,7 @@[m [mclass MessageListAppBarTitle extends StatelessWidget {[m
 + [m
 +   Widget _buildStreamRow(ZulipStream? stream, String text) {[m
 +     // A null [Icon.icon] makes a blank space.[m
 +[31m-    final icon = (stream != null) ? iconDataF[7mrom[27mStream(stream) : null;[m
 +[32m+[m[32m    final icon = (stream != null) ? iconDataF[7mor[27mStream(stream) : null;[m
 +     return Row([m
 +       mainAxisSize: MainAxisSize.min,[m
 +       // TODO(design): The vertical alignment of the stream privacy icon is a bit ad hoc.[m