Merge branch 'main' of https://git.chepuhagram.ru/ArturKarasevich/Chepuhagram
This commit is contained in:
commit
966b1a6b84
|
|
@ -2149,8 +2149,13 @@ class _ChatScreenState extends State<ChatScreen> with RouteAware {
|
||||||
previewText = rawText;
|
previewText = rawText;
|
||||||
} else if (hasMedia) {
|
} else if (hasMedia) {
|
||||||
previewText = switch (messageType) {
|
previewText = switch (messageType) {
|
||||||
|
<<<<<<< HEAD
|
||||||
MessageType.videoNote => "[Кружок]",
|
MessageType.videoNote => "[Кружок]",
|
||||||
MessageType.voiceNote => "[Голосовое]",
|
MessageType.voiceNote => "[Голосовое]",
|
||||||
|
=======
|
||||||
|
MessageType.voiceNote => "[Кружок}",
|
||||||
|
MessageType.videoNote => "[Голосовое]",
|
||||||
|
>>>>>>> 4b306f3ceef54b88bb73fa4130a0e501641e6ca8
|
||||||
MessageType.image => "[Фото]",
|
MessageType.image => "[Фото]",
|
||||||
MessageType.video => "[Видео]",
|
MessageType.video => "[Видео]",
|
||||||
MessageType.file => "[Файл]",
|
MessageType.file => "[Файл]",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue