Commit 9718aae
committed
Merge remote-tracking branch 'origin/v10.0.0' into feat/reactions-v2
# Conflicts:
# packages/stream_chat_flutter/lib/src/message_action/message_action_type.dart
# packages/stream_chat_flutter/lib/src/message_modal/message_actions_modal.dart
# packages/stream_chat_flutter/lib/src/message_modal/message_modal.dart
# packages/stream_chat_flutter/lib/src/message_modal/message_reactions_modal.dart
# packages/stream_chat_flutter/lib/src/message_widget/message_widget.dart
# packages/stream_chat_flutter/lib/src/message_widget/message_widget_content_components.dart
# packages/stream_chat_flutter/lib/src/message_widget/reactions/reaction_picker.dart
# packages/stream_chat_flutter/lib/src/message_widget/reactions/reactions_align.dart
# packages/stream_chat_flutter/lib/src/reactions/reaction_picker_icon_list.dart
# packages/stream_chat_flutter/test/src/message_modal/goldens/ci/stream_message_reactions_modal_dark.png
# packages/stream_chat_flutter/test/src/message_modal/goldens/ci/stream_message_reactions_modal_light.png
# packages/stream_chat_flutter/test/src/message_modal/goldens/ci/stream_message_reactions_modal_reversed_dark.png
# packages/stream_chat_flutter/test/src/message_modal/goldens/ci/stream_message_reactions_modal_reversed_light.png
# packages/stream_chat_flutter/test/src/message_modal/message_reactions_modal_test.dart
# packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_2.png
# packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_dark.png
# packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_3_light.png
# packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_dark.png
# packages/stream_chat_flutter/test/src/misc/goldens/ci/reaction_bubble_like_light.pngFile tree
17 files changed
+591
-1
lines changed- packages
- stream_chat_flutter
- lib/src/message_modal
- test/src/message_widget/reactions
- goldens/ci
- stream_chat
- lib/src/client
17 files changed
+591
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
786 | 786 | | |
787 | 787 | | |
788 | 788 | | |
789 | | - | |
| 789 | + | |
| 790 | + | |
790 | 791 | | |
791 | 792 | | |
792 | 793 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
98 | 101 | | |
99 | 102 | | |
100 | 103 | | |
| |||
0 commit comments