ArturKarasevich
/
Chepuhagram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://git.chepuhagram.ru/ArturKarasevich/Chepuhagram

This commit is contained in:
Artur 2026-05-24 00:06:07 +05:00
parent 3b5be5f4d9 4b306f3cee
commit 966b1a6b84
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle.kts
View File

@ -51,4 +51,4 @@ dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
implementation(platform("com.google.firebase:firebase-bom:34.12.0")) implementation(platform("com.google.firebase:firebase-bom:34.12.0"))
implementation("com.google.firebase:firebase-messaging") implementation("com.google.firebase:firebase-messaging")
} }

5
lib/presentation/screens/chat_screen.dart
View File

@ -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 => "[Файл]",