Skip to content

Commit 78b56a7

Browse files
PIG208PIG208
committed
do not merge; api: Make displayName nullable
Signed-off-by: Zixuan James Li <[email protected]>
1 parent 5ad98d9 commit 78b56a7

13 files changed

+15
-29
lines changed

‎lib/api/model/model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ extension type const TopicName(String _value) {
690690
/// so that UI code can identify when it needs to represent the topic
691691
/// specially in the way prescribed for "general chat".
692692
// TODO(#1250) carry out that plan
693-
String get displayName => _value;
693+
String? get displayName => _value.isEmpty ? null : _value;
694694

695695
/// The key to use for "same topic as" comparisons.
696696
String canonicalize() => apiName.toLowerCase();

‎lib/model/autocomplete.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,13 +942,11 @@ class TopicAutocompleteQuery extends AutocompleteQuery {
942942
bool testTopic(TopicName topic, PerAccountStore store) {
943943
// TODO(#881): Sort by match relevance, like web does.
944944

945-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
946945
if (topic.displayName == null) {
947946
return store.realmEmptyTopicDisplayName.toLowerCase()
948947
.contains(raw.toLowerCase());
949948
}
950949
return topic.displayName != raw
951-
// ignore: unnecessary_non_null_assertion // null topic names soon to be enabled
952950
&& topic.displayName!.toLowerCase().contains(raw.toLowerCase());
953951
}
954952

‎lib/widgets/action_sheet.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ void showTopicActionSheet(BuildContext context, {
253253
// TODO: check for other cases that may disallow this action (e.g.: time
254254
// limit for editing topics).
255255
final disallowResolveUnresolve =
256-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
257256
message != null && message.topic.displayName == null;
258257
if (someMessageIdInTopic != null && !disallowResolveUnresolve) {
259258
optionButtons.add(ResolveUnresolveButton(pageContext: pageContext,

‎lib/widgets/autocomplete.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,11 @@ class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicA
416416
@override
417417
Widget buildItem(BuildContext context, int index, TopicAutocompleteResult option) {
418418
final Widget child;
419-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
420419
if (option.topic.displayName == null) {
421420
final store = PerAccountStoreWidget.of(context);
422421
child = Text(store.realmEmptyTopicDisplayName,
423422
style: const TextStyle(fontStyle: FontStyle.italic));
424423
} else {
425-
// ignore: unnecessary_non_null_assertion // null topic names soon to be enabled
426424
child = Text(option.topic.displayName!);
427425
}
428426

‎lib/widgets/compose_box.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ class ComposeTopicController extends ComposeController<TopicValidationError> {
242242
}
243243

244244
void setTopic(TopicName newTopic) {
245-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
246245
value = TextEditingValue(text: newTopic.displayName ?? '');
247246
}
248247
}
@@ -728,7 +727,6 @@ class _FixedDestinationContentInput extends StatelessWidget {
728727
// Zulip expresses channels and topics, not any normal English punctuation,
729728
// so don't make sense to translate. See:
730729
// https://github.com/zulip/zulip-flutter/pull/1148#discussion_r1941990585
731-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
732730
'#$streamName > ${topic.displayName ?? store.realmEmptyTopicDisplayName}');
733731

734732
case DmNarrow(otherRecipientIds: []): // The self-1:1 thread.

‎lib/widgets/inbox.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,12 @@ class _TopicItem extends StatelessWidget {
532532
style: TextStyle(
533533
fontSize: 17,
534534
height: (20 / 17),
535-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
536535
fontStyle: topic.displayName == null ? FontStyle.italic : null,
537536
// TODO(design) check if this is the right variable
538537
color: designVariables.labelMenuButton,
539538
),
540539
maxLines: 2,
541540
overflow: TextOverflow.ellipsis,
542-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
543541
topic.displayName ?? store.realmEmptyTopicDisplayName))),
544542
const SizedBox(width: 12),
545543
if (hasMention) const _IconMarker(icon: ZulipIcons.at_sign),

‎lib/widgets/message_list.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,8 @@ class MessageListAppBarTitle extends StatelessWidget {
339339
return Row(
340340
mainAxisSize: MainAxisSize.min,
341341
children: [
342-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
343342
Flexible(child: Text(topic.displayName ?? store.realmEmptyTopicDisplayName, style: TextStyle(
344343
fontSize: 13,
345-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
346344
fontStyle: topic.displayName == null ? FontStyle.italic : null,
347345
).merge(weightVariableTextStyle(context)))),
348346
if (icon != null)
@@ -1095,13 +1093,11 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10951093
child: Row(
10961094
children: [
10971095
Flexible(
1098-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
10991096
child: Text(topic.displayName ?? store.realmEmptyTopicDisplayName,
11001097
// TODO: Give a way to see the whole topic (maybe a
11011098
// long-press interaction?)
11021099
overflow: TextOverflow.ellipsis,
11031100
style: recipientHeaderTextStyle(context,
1104-
// ignore: unnecessary_null_comparison // null topic names soon to be enabled
11051101
fontStyle: topic.displayName == null ? FontStyle.italic : null,
11061102
))),
11071103
const SizedBox(width: 4),

‎test/api/model/model_checks.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension MessageChecks on Subject<Message> {
4848

4949
extension TopicNameChecks on Subject<TopicName> {
5050
Subject<String> get apiName => has((x) => x.apiName, 'apiName');
51-
Subject<String> get displayName => has((x) => x.displayName, 'displayName');
51+
Subject<String?> get displayName => has((x) => x.displayName, 'displayName');
5252
}
5353

5454
extension StreamMessageChecks on Subject<StreamMessage> {

‎test/widgets/action_sheet_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ void main() {
185185

186186
final topicRow = find.descendant(
187187
of: find.byType(ZulipAppBar),
188-
// ignore: dead_null_aware_expression // null topic names soon to be enabled
189188
matching: find.text(topicName.displayName ?? eg.defaultRealmEmptyTopicDisplayName));
190189
await tester.longPress(topicRow);
191190
// sheet appears onscreen; default duration of bottom-sheet enter animation
@@ -206,7 +205,7 @@ void main() {
206205

207206
await tester.longPress(find.descendant(
208207
of: find.byType(RecipientHeader),
209-
matching: find.text(effectiveMessage.topic.displayName)));
208+
matching: find.text(effectiveMessage.topic.displayName!)));
210209
// sheet appears onscreen; default duration of bottom-sheet enter animation
211210
await tester.pump(const Duration(milliseconds: 250));
212211
}
@@ -270,7 +269,7 @@ void main() {
270269
messages: [message]);
271270
check(findButtonForLabel('Mark as resolved')).findsNothing();
272271
check(findButtonForLabel('Mark as unresolved')).findsNothing();
273-
}, skip: true); // null topic names soon to be enabled
272+
});
274273

275274
testWidgets('show from recipient header', (tester) async {
276275
await prepare();

‎test/widgets/autocomplete_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ void main() {
415415
await tester.tap(find.text('Topic three'));
416416
await tester.pumpAndSettle();
417417
check(tester.widget<TextField>(topicInputFinder).controller!.text)
418-
.equals(topic3.name.displayName);
418+
.equals(topic3.name.displayName!);
419419
check(find.text('Topic one' )).findsNothing();
420420
check(find.text('Topic two' )).findsNothing();
421421
check(find.text('Topic three')).findsOne(); // shown in `_TopicInput` once
@@ -473,7 +473,7 @@ void main() {
473473
await tester.pumpAndSettle();
474474

475475
check(find.text('some display name')).findsOne();
476-
}, skip: true); // null topic names soon to be enabled
476+
});
477477

478478
testWidgets('match realmEmptyTopicDisplayName in autocomplete', (tester) async {
479479
final topic = eg.getStreamTopicsEntry(name: '');
@@ -486,7 +486,7 @@ void main() {
486486
await tester.pumpAndSettle();
487487

488488
check(find.text('general chat')).findsOne();
489-
}, skip: true); // null topic names soon to be enabled
489+
});
490490

491491
testWidgets('autocomplete to realmEmptyTopicDisplayName sets topic to empty string', (tester) async {
492492
final topic = eg.getStreamTopicsEntry(name: '');
@@ -502,6 +502,6 @@ void main() {
502502
await tester.tap(find.text('general chat'));
503503
await tester.pump(Duration.zero);
504504
check(controller.value).text.equals('');
505-
}, skip: true); // null topic names soon to be enabled
505+
});
506506
});
507507
}

‎test/widgets/compose_box_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ void main() {
475475
mandatoryTopics: false);
476476
checkComposeBoxHintTexts(tester, contentHintText:
477477
'Message #${channel.name} > ${eg.defaultRealmEmptyTopicDisplayName}');
478-
}, skip: true); // null topic names soon to be enabled
478+
});
479479
});
480480

481481
testWidgets('to DmNarrow with self', (tester) async {
@@ -787,7 +787,7 @@ void main() {
787787
..method.equals('POST')
788788
..url.path.equals('/api/v1/messages')
789789
..bodyFields['topic'].equals('');
790-
}, skip: true); // null topic names soon to be enabled
790+
});
791791

792792
testWidgets('legacy: empty topic -> "(no topic)"', (tester) async {
793793
await setupAndTapSend(tester,
@@ -812,7 +812,7 @@ void main() {
812812
topicInputText: eg.defaultRealmEmptyTopicDisplayName,
813813
mandatoryTopics: true);
814814
checkMessageNotSent(tester);
815-
}, skip: true); // null topic names soon to be enabled
815+
});
816816

817817
testWidgets('if topics are mandatory, reject "(no topic)"', (tester) async {
818818
await setupAndTapSend(tester,

‎test/widgets/inbox_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void main() {
314314
subscriptions: [(eg.subscription(channel))],
315315
unreadMessages: [eg.streamMessage(stream: channel, topic: '')]);
316316
check(find.text(eg.defaultRealmEmptyTopicDisplayName)).findsOne();
317-
}, skip: true); // null topic names soon to be enabled
317+
});
318318

319319
group('topic visibility', () {
320320
final channel = eg.stream();

‎test/widgets/message_list_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void main() {
202202
messageCount: 1);
203203
checkAppBarChannelTopic(
204204
channel.name, eg.defaultRealmEmptyTopicDisplayName);
205-
}, skip: true); // null topic names soon to be enabled
205+
});
206206

207207
testWidgets('has channel-feed action for topic narrows', (tester) async {
208208
final pushedRoutes = <Route<void>>[];
@@ -953,7 +953,7 @@ void main() {
953953
await tester.pump();
954954
check(findInMessageList('stream name')).single;
955955
check(findInMessageList(eg.defaultRealmEmptyTopicDisplayName)).single;
956-
}, skip: true); // null topic names soon to be enabled
956+
});
957957

958958
testWidgets('show general chat for empty topics without channel name', (tester) async {
959959
await setupMessageListPage(tester,
@@ -962,7 +962,7 @@ void main() {
962962
await tester.pump();
963963
check(findInMessageList('stream name')).isEmpty();
964964
check(findInMessageList(eg.defaultRealmEmptyTopicDisplayName)).single;
965-
}, skip: true); // null topic names soon to be enabled
965+
});
966966

967967
testWidgets('show topic visibility icon when followed', (tester) async {
968968
await setupMessageListPage(tester,

0 commit comments

Comments
 (0)