Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msglist: Add double-tap to toggle thumbs up reaction. #1307

Closed
wants to merge 1 commit into from
Closed

msglist: Add double-tap to toggle thumbs up reaction. #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions lib/widgets/message_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:intl/intl.dart';

import '../api/model/model.dart';
import '../generated/l10n/zulip_localizations.dart';
import '../model/emoji.dart';
import '../model/message_list.dart';
import '../model/narrow.dart';
import '../model/store.dart';
Expand Down Expand Up @@ -1365,6 +1366,29 @@ class MessageWithPossibleSender extends StatelessWidget {

return GestureDetector(
behavior: HitTestBehavior.translucent,
onDoubleTap: () {
final store = PerAccountStoreWidget.of(context);
// First emoji in popular Candidates is thumbs up
final thumbsUpEmoji = EmojiStore.popularEmojiCandidates.toList()[0];

// Check if the user has already reacted with thumbs up
final isSelfVoted = message.reactions?.aggregated.any((reactionWithVotes) =>
reactionWithVotes.reactionType == ReactionType.unicodeEmoji
&& reactionWithVotes.emojiCode == thumbsUpEmoji.emojiCode
&& reactionWithVotes.userIds.contains(store.selfUserId)) ?? false;

final zulipLocalizations = ZulipLocalizations.of(context);

// Add or remove reaction based on whether the user has already reacted with thumbs up
doAddOrRemoveReaction(
context: context,
doRemoveReaction: isSelfVoted,
messageId: message.id,
emoji: thumbsUpEmoji,
errorDialogTitle: isSelfVoted
? zulipLocalizations.errorReactionRemovingFailedTitle
: zulipLocalizations.errorReactionAddingFailedTitle);
},
onLongPress: () => showMessageActionSheet(context: context, message: message),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
Expand Down
138 changes: 138 additions & 0 deletions test/widgets/message_list_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,4 +1344,142 @@ void main() {
..status.equals(AnimationStatus.dismissed);
});
});

group('double-tap gesture', () {
Future<void> setupMessageWithReactions(WidgetTester tester, {
required StreamMessage message,
required Narrow narrow,
List<Reaction>? reactions,
}) async {
addTearDown(testBinding.reset); // reset the test binding
assert(narrow.containsMessage(message)); // check that the narrow contains the message

await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot()); // add the self account
store = await testBinding.globalStore.perAccount(eg.selfAccount.id); // get the per account store
await store.addUsers([
eg.selfUser,
eg.user(userId: message.senderId),
]); // add the self user and the message sender
final stream = eg.stream(streamId: message.streamId); // create the stream
await store.addStream(stream); // add the stream
await store.addSubscription(eg.subscription(stream)); // add the subscription

connection = store.connection as FakeApiConnection; // get the fake api connection
connection.prepare(json: eg.newestGetMessagesResult(
foundOldest: true, messages: [message]).toJson()); // prepare the response for the message
await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,
child: MessageListPage(initNarrow: narrow)),
); // pump the widget

await tester.pumpAndSettle();
}

testWidgets('add thumbs up reaction on double-tap', (tester) async {
final message = eg.streamMessage(); // create a message without any reactions
await setupMessageWithReactions(tester,
message: message,
narrow: TopicNarrow.ofMessage(message)); // setup the message and narrow

connection.prepare(json: {}); // prepare the response for the reaction
await tester.pump(); // pump the widget to make the reaction visible

final messageContent = find.byType(MessageContent); // find the message content
await tester.tap(messageContent); // first tap
await tester.pump(const Duration(milliseconds: 50)); // wait for some time so that the double-tap is detected
await tester.tap(messageContent); // second tap
await tester.pumpAndSettle(); // wait for the reaction to be added

check(connection.lastRequest).isA<http.Request>()
..method.equals('POST')
..url.path.equals('/api/v1/messages/${message.id}/reactions')
..bodyFields.deepEquals({
'reaction_type': 'unicode_emoji',
'emoji_code': '1f44d', // thumbs up emoji code
'emoji_name': '+1',
}); // check the last request
});

testWidgets('remove thumbs up reaction on double-tap when already reacted', (tester) async {
final message = eg.streamMessage(reactions: [
Reaction(
emojiName: '+1',
emojiCode: '1f44d',
reactionType: ReactionType.unicodeEmoji,
userId: eg.selfAccount.userId)
]); // create a message with a thumbs up reaction
await setupMessageWithReactions(tester,
message: message,
narrow: TopicNarrow.ofMessage(message)); // setup the message and narrow

connection.prepare(json: {}); // prepare the response for the reaction
await tester.pump(); // pump the widget to make the reaction visible

final messageContent = find.byType(MessageContent); // find the message content
await tester.tap(messageContent); // first tap
await tester.pump(const Duration(milliseconds: 50)); // wait for some time so that the double-tap is detected
await tester.tap(messageContent); // second tap
await tester.pumpAndSettle(); // wait for the reaction to be removed

check(connection.lastRequest).isA<http.Request>()
..method.equals('DELETE')
..url.path.equals('/api/v1/messages/${message.id}/reactions')
..bodyFields.deepEquals({
'reaction_type': 'unicode_emoji',
'emoji_code': '1f44d',
'emoji_name': '+1',
}); // check the last request
});

testWidgets('shows error dialog when adding reaction fails', (tester) async {
final message = eg.streamMessage();
await setupMessageWithReactions(tester,
message: message,
narrow: TopicNarrow.ofMessage(message)); // setup the message and narrow

connection.prepare(httpStatus: 400, json: {
'code': 'BAD_REQUEST',
'msg': 'Invalid message(s)',
'result': 'error',
});

final messageContent = find.byType(MessageContent);
await tester.tap(messageContent); // first tap
await tester.pump(const Duration(milliseconds: 50)); // wait for some time so that the double-tap is detected
await tester.tap(messageContent); // second tap
await tester.pumpAndSettle(); // wait for the error dialog to show

checkErrorDialog(tester,
expectedTitle: 'Adding reaction failed',
expectedMessage: 'Invalid message(s)'); // check the error dialog
});

testWidgets('shows error dialog when removing reaction fails', (tester) async {
final message = eg.streamMessage(reactions: [
Reaction(
emojiName: '+1',
emojiCode: '1f44d',
reactionType: ReactionType.unicodeEmoji,
userId: eg.selfAccount.userId)
]); // create a message with a thumbs up reaction
await setupMessageWithReactions(tester,
message: message,
narrow: TopicNarrow.ofMessage(message)); // setup the message and narrow

connection.prepare(httpStatus: 400, json: {
'code': 'BAD_REQUEST',
'msg': 'Invalid message(s)',
'result': 'error',
}); // prepare the response for the reaction

final messageContent = find.byType(MessageContent); // find the message content
await tester.tap(messageContent); // first tap
await tester.pump(const Duration(milliseconds: 50)); // wait for some time so that the double-tap is detected
await tester.tap(messageContent); // second tap
await tester.pumpAndSettle(); // wait for the error dialog to show

checkErrorDialog(tester,
expectedTitle: 'Removing reaction failed',
expectedMessage: 'Invalid message(s)'); // check the error dialog
});
});
}