do not merge; api: Make displayName nullable

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

lib/api/model/model.dart

@@ -690,7 +690,7 @@ extension type const TopicName(String _value) {
   /// so that UI code can identify when it needs to represent the topic
   /// specially in the way prescribed for "general chat".
   // TODO(#1250) carry out that plan
-  String get displayName => _value;
+  String? get displayName => _value.isEmpty ? null : _value;
 
   /// The key to use for "same topic as" comparisons.
   String canonicalize() => apiName.toLowerCase();

lib/model/autocomplete.dart

@@ -942,13 +942,11 @@ class TopicAutocompleteQuery extends AutocompleteQuery {
   bool testTopic(TopicName topic, PerAccountStore store) {
     // TODO(#881): Sort by match relevance, like web does.
 
-    // ignore: unnecessary_null_comparison // null topic names soon to be enabled
     if (topic.displayName == null) {
       return store.realmEmptyTopicDisplayName.toLowerCase()
         .contains(raw.toLowerCase());
     }
     return topic.displayName != raw
-      // ignore: unnecessary_non_null_assertion // null topic names soon to be enabled
       && topic.displayName!.toLowerCase().contains(raw.toLowerCase());
   }
 

lib/widgets/action_sheet.dart

@@ -253,7 +253,6 @@ void showTopicActionSheet(BuildContext context, {
   // TODO: check for other cases that may disallow this action (e.g.: time
   //   limit for editing topics).
   final disallowResolveUnresolve =
-    // ignore: unnecessary_null_comparison // null topic names soon to be enabled
     message != null && message.topic.displayName == null;
   if (someMessageIdInTopic != null && !disallowResolveUnresolve) {
     optionButtons.add(ResolveUnresolveButton(pageContext: pageContext,

lib/widgets/autocomplete.dart

@@ -416,13 +416,11 @@ class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicA
   @override
   Widget buildItem(BuildContext context, int index, TopicAutocompleteResult option) {
     final Widget child;
-    // ignore: unnecessary_null_comparison // null topic names soon to be enabled
     if (option.topic.displayName == null) {
       final store = PerAccountStoreWidget.of(context);
       child = Text(store.realmEmptyTopicDisplayName,
         style: const TextStyle(fontStyle: FontStyle.italic));
     } else {
-      // ignore: unnecessary_non_null_assertion // null topic names soon to be enabled
       child = Text(option.topic.displayName!);
     }
 

lib/widgets/compose_box.dart

@@ -242,7 +242,6 @@ class ComposeTopicController extends ComposeController<TopicValidationError> {
   }
 
   void setTopic(TopicName newTopic) {
-    // ignore: dead_null_aware_expression // null topic names soon to be enabled
     value = TextEditingValue(text: newTopic.displayName ?? '');
   }
 }
@@ -728,7 +727,6 @@ class _FixedDestinationContentInput extends StatelessWidget {
           // Zulip expresses channels and topics, not any normal English punctuation,
           // so don't make sense to translate. See:
           //   https://github.com/zulip/zulip-flutter/pull/1148#discussion_r1941990585
-          // ignore: dead_null_aware_expression // null topic names soon to be enabled
           '#$streamName > ${topic.displayName ?? store.realmEmptyTopicDisplayName}');
 
       case DmNarrow(otherRecipientIds: []): // The self-1:1 thread.

lib/widgets/inbox.dart

@@ -532,14 +532,12 @@ class _TopicItem extends StatelessWidget {
                 style: TextStyle(
                   fontSize: 17,
                   height: (20 / 17),
-                  // ignore: unnecessary_null_comparison // null topic names soon to be enabled
                   fontStyle: topic.displayName == null ? FontStyle.italic : null,
                   // TODO(design) check if this is the right variable
                   color: designVariables.labelMenuButton,
                 ),
                 maxLines: 2,
                 overflow: TextOverflow.ellipsis,
-                // ignore: dead_null_aware_expression // null topic names soon to be enabled
                 topic.displayName ?? store.realmEmptyTopicDisplayName))),
             const SizedBox(width: 12),
             if (hasMention) const _IconMarker(icon: ZulipIcons.at_sign),

lib/widgets/message_list.dart

@@ -339,10 +339,8 @@ class MessageListAppBarTitle extends StatelessWidget {
     return Row(
       mainAxisSize: MainAxisSize.min,
       children: [
-        // ignore: dead_null_aware_expression // null topic names soon to be enabled
         Flexible(child: Text(topic.displayName ?? store.realmEmptyTopicDisplayName, style: TextStyle(
           fontSize: 13,
-          // ignore: unnecessary_null_comparison // null topic names soon to be enabled
           fontStyle: topic.displayName == null ? FontStyle.italic : null,
         ).merge(weightVariableTextStyle(context)))),
         if (icon != null)
@@ -1095,13 +1093,11 @@ class StreamMessageRecipientHeader extends StatelessWidget {
       child: Row(
         children: [
           Flexible(
-            // ignore: dead_null_aware_expression // null topic names soon to be enabled
             child: Text(topic.displayName ?? store.realmEmptyTopicDisplayName,
               // TODO: Give a way to see the whole topic (maybe a
               //   long-press interaction?)
               overflow: TextOverflow.ellipsis,
               style: recipientHeaderTextStyle(context,
-                // ignore: unnecessary_null_comparison // null topic names soon to be enabled
                 fontStyle: topic.displayName == null ? FontStyle.italic : null,
               ))),
           const SizedBox(width: 4),

test/api/model/model_checks.dart

@@ -48,7 +48,7 @@ extension MessageChecks on Subject<Message> {
 
 extension TopicNameChecks on Subject<TopicName> {
   Subject<String> get apiName => has((x) => x.apiName, 'apiName');
-  Subject<String> get displayName => has((x) => x.displayName, 'displayName');
+  Subject<String?> get displayName => has((x) => x.displayName, 'displayName');
 }
 
 extension StreamMessageChecks on Subject<StreamMessage> {

test/widgets/action_sheet_test.dart

@@ -185,7 +185,6 @@ void main() {
 
       final topicRow = find.descendant(
         of: find.byType(ZulipAppBar),
-        // ignore: dead_null_aware_expression // null topic names soon to be enabled
         matching: find.text(topicName.displayName ?? eg.defaultRealmEmptyTopicDisplayName));
       await tester.longPress(topicRow);
       // sheet appears onscreen; default duration of bottom-sheet enter animation
@@ -206,7 +205,7 @@ void main() {
 
       await tester.longPress(find.descendant(
         of: find.byType(RecipientHeader),
-        matching: find.text(effectiveMessage.topic.displayName)));
+        matching: find.text(effectiveMessage.topic.displayName!)));
       // sheet appears onscreen; default duration of bottom-sheet enter animation
       await tester.pump(const Duration(milliseconds: 250));
     }
@@ -270,7 +269,7 @@ void main() {
           messages: [message]);
         check(findButtonForLabel('Mark as resolved')).findsNothing();
         check(findButtonForLabel('Mark as unresolved')).findsNothing();
-      }, skip: true); // null topic names soon to be enabled
+      });
 
       testWidgets('show from recipient header', (tester) async {
         await prepare();

test/widgets/autocomplete_test.dart

@@ -415,7 +415,7 @@ void main() {
       await tester.tap(find.text('Topic three'));
       await tester.pumpAndSettle();
       check(tester.widget<TextField>(topicInputFinder).controller!.text)
-        .equals(topic3.name.displayName);
+        .equals(topic3.name.displayName!);
       check(find.text('Topic one'  )).findsNothing();
       check(find.text('Topic two'  )).findsNothing();
       check(find.text('Topic three')).findsOne(); // shown in `_TopicInput` once
@@ -473,7 +473,7 @@ void main() {
       await tester.pumpAndSettle();
 
       check(find.text('some display name')).findsOne();
-    }, skip: true); // null topic names soon to be enabled
+    });
 
     testWidgets('match realmEmptyTopicDisplayName in autocomplete', (tester) async {
       final topic = eg.getStreamTopicsEntry(name: '');
@@ -486,7 +486,7 @@ void main() {
       await tester.pumpAndSettle();
 
       check(find.text('general chat')).findsOne();
-    }, skip: true); // null topic names soon to be enabled
+    });
 
     testWidgets('autocomplete to realmEmptyTopicDisplayName sets topic to empty string', (tester) async {
       final topic = eg.getStreamTopicsEntry(name: '');
@@ -502,6 +502,6 @@ void main() {
       await tester.tap(find.text('general chat'));
       await tester.pump(Duration.zero);
       check(controller.value).text.equals('');
-    }, skip: true); // null topic names soon to be enabled
+    });
   });
 }