Skip to content

Commit 98cdbcb

Browse files
committed
narrow: Add starred messages narrow.
"Starred messages narrow" is the user facing name of the narrow, thus we name the Narrow class after it. This narrow is pretty similar to MentionsNarrow. Signed-off-by: Zixuan James Li <[email protected]>
1 parent e2d55be commit 98cdbcb

16 files changed

+136
-8
lines changed

assets/l10n/app_en.arb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@
480480
"@mentionsPageTitle": {
481481
"description": "Title for the page of @-mentions."
482482
},
483+
"starredMessagesPageTitle": "Starred messages",
484+
"@starredMessagesPageTitle": {
485+
"description": "Title for the page of starred messages."
486+
},
483487
"notifGroupDmConversationLabel": "{senderFullName} to you and {numOthers, plural, =1{1 other} other{{numOthers} others}}",
484488
"@notifGroupDmConversationLabel": {
485489
"description": "Label for a group DM conversation notification.",

lib/model/autocomplete.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ class MentionAutocompleteView extends ChangeNotifier {
223223
break;
224224
case CombinedFeedNarrow():
225225
case MentionsNarrow():
226+
case StarredMessagesNarrow():
226227
assert(false, 'No compose box, thus no autocomplete is available in ${narrow.runtimeType}.');
227228
}
228229
return (userA, userB) => _compareByRelevance(userA, userB,

lib/model/message_list.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
371371
case TopicNarrow():
372372
case DmNarrow():
373373
case MentionsNarrow():
374+
case StarredMessagesNarrow():
374375
return true;
375376
}
376377
}
@@ -387,6 +388,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
387388
case TopicNarrow():
388389
case DmNarrow():
389390
case MentionsNarrow():
391+
case StarredMessagesNarrow():
390392
return true;
391393
}
392394
}

lib/model/narrow.dart

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,25 @@ class MentionsNarrow extends Narrow {
322322
@override
323323
int get hashCode => 'MentionsNarrow'.hashCode;
324324
}
325+
326+
class StarredMessagesNarrow extends Narrow {
327+
const StarredMessagesNarrow();
328+
329+
@override
330+
ApiNarrow apiEncode() => [ApiNarrowIs(IsOperand.starred)];
331+
332+
@override
333+
bool containsMessage(Message message) {
334+
return message.flags.contains(MessageFlag.starred);
335+
}
336+
337+
@override
338+
bool operator ==(Object other) {
339+
if (other is! StarredMessagesNarrow) return false;
340+
// Conceptually there's only one value of this type.
341+
return true;
342+
}
343+
344+
@override
345+
int get hashCode => 'StarredMessagesNarrow'.hashCode;
346+
}

lib/model/unreads.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ class Unreads extends ChangeNotifier {
195195

196196
int countInMentionsNarrow() => mentions.length;
197197

198+
// TODO: Implement unreads handling.
199+
int countInStarredMessagesNarrow() => 0;
200+
198201
int countInNarrow(Narrow narrow) {
199202
switch (narrow) {
200203
case CombinedFeedNarrow():
@@ -207,6 +210,8 @@ class Unreads extends ChangeNotifier {
207210
return countInDmNarrow(narrow);
208211
case MentionsNarrow():
209212
return countInMentionsNarrow();
213+
case StarredMessagesNarrow():
214+
return countInStarredMessagesNarrow();
210215
}
211216
}
212217

lib/widgets/actions.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,8 @@ Future<void> _legacyMarkNarrowAsRead(BuildContext context, Narrow narrow) async
142142
messages: unreadMentions,
143143
op: UpdateMessageFlagsOp.add,
144144
flag: MessageFlag.read);
145+
case StarredMessagesNarrow():
146+
// TODO: Implement unreads handling.
147+
return;
145148
}
146149
}

lib/widgets/compose_box.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,7 @@ class ComposeBox extends StatelessWidget {
10721072

10731073
case CombinedFeedNarrow():
10741074
case MentionsNarrow():
1075+
case StarredMessagesNarrow():
10751076
return false;
10761077
}
10771078
}
@@ -1088,6 +1089,7 @@ class ComposeBox extends StatelessWidget {
10881089
return _FixedDestinationComposeBox(key: controllerKey, narrow: narrow);
10891090
case CombinedFeedNarrow():
10901091
case MentionsNarrow():
1092+
case StarredMessagesNarrow():
10911093
return const SizedBox.shrink();
10921094
}
10931095
}

lib/widgets/message_list.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ class _MessageListPageState extends State<MessageListPage> implements MessageLis
236236
switch(widget.narrow) {
237237
case CombinedFeedNarrow():
238238
case MentionsNarrow():
239+
case StarredMessagesNarrow():
239240
appBarBackgroundColor = null; // i.e., inherit
240241

241242
case ChannelNarrow(:final streamId):
@@ -324,6 +325,9 @@ class MessageListAppBarTitle extends StatelessWidget {
324325
case MentionsNarrow():
325326
return Text(zulipLocalizations.mentionsPageTitle);
326327

328+
case StarredMessagesNarrow():
329+
return Text(zulipLocalizations.starredMessagesPageTitle);
330+
327331
case ChannelNarrow(:var streamId):
328332
final store = PerAccountStoreWidget.of(context);
329333
final stream = store.streams[streamId];
@@ -815,6 +819,7 @@ class RecipientHeader extends StatelessWidget {
815819
switch (narrow) {
816820
case CombinedFeedNarrow():
817821
case MentionsNarrow():
822+
case StarredMessagesNarrow():
818823
return true;
819824

820825
case ChannelNarrow():

test/api/route/messages_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ void main() {
191191
checkNarrow(const MentionsNarrow().apiEncode(), jsonEncode([
192192
{'operator': 'is', 'operand': 'mentioned'},
193193
]));
194+
checkNarrow(const StarredMessagesNarrow().apiEncode(), jsonEncode([
195+
{'operator': 'is', 'operand': 'starred'},
196+
]));
194197

195198
checkNarrow([ApiNarrowDm([123, 234])], jsonEncode([
196199
{'operator': 'dm', 'operand': [123, 234]},

test/model/autocomplete_test.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,13 @@ void main() {
578578
check(() => MentionAutocompleteView.init(store: store, narrow: narrow))
579579
.throws<AssertionError>();
580580
});
581+
582+
test('StarredMessagesNarrow gives error', () async {
583+
await prepare(users: [eg.user(), eg.user()], messages: []);
584+
const narrow = StarredMessagesNarrow();
585+
check(() => MentionAutocompleteView.init(store: store, narrow: narrow))
586+
.throws<AssertionError>();
587+
});
581588
});
582589

583590
test('final results end-to-end', () async {

0 commit comments

Comments
 (0)