Browse Source

Handle message invitation links in Android channel and PM screens

master
evgeny 1 week ago
parent
commit
3c3f3896f7
  1. 1
      tools/chatgui-android/app/src/main/java/com/utun/chat/MainActivity.kt
  2. 2
      tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/ChatScreen.kt
  3. 2
      tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/DmChatScreen.kt

1
tools/chatgui-android/app/src/main/java/com/utun/chat/MainActivity.kt

@ -39,6 +39,7 @@ import androidx.compose.material3.TextButton
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarHostState
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable

2
tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/ChatScreen.kt

@ -164,7 +164,7 @@ fun ChatScreen(
onSeekVoice = { path, position, duration -> viewModel.seekVoice(path, position, duration) }, onSeekVoice = { path, position, duration -> viewModel.seekVoice(path, position, duration) },
onDownloadFile = { viewModel.downloadAttachment(it) }, onDownloadFile = { viewModel.downloadAttachment(it) },
onOpenFile = { if (it.filePath.isNotEmpty()) { pendingSaveFilePath = it.filePath; saveFileLauncher.launch(it.text) } }, onOpenFile = { if (it.filePath.isNotEmpty()) { pendingSaveFilePath = it.filePath; saveFileLauncher.launch(it.text) } },
onOpenImage = onViewPhoto, onPlayVideo = onPlayVideo onOpenImage = onViewPhoto, onPlayVideo = onPlayVideo, onInviteLink = viewModel::openInviteLink
) )
if (radioActive && !overlayShown) { if (radioActive && !overlayShown) {
RadioPttButton( RadioPttButton(

2
tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/DmChatScreen.kt

@ -82,7 +82,7 @@ fun DmChatScreen(conv: DmConversation, messages: List<Message>, viewModel: ChatV
onPlayVoice = { path, duration -> viewModel.playVoiceMessage(path, duration) }, onPlayVoice = { path, duration -> viewModel.playVoiceMessage(path, duration) },
onSeekVoice = { path, position, duration -> viewModel.seekVoice(path, position, duration) }, onSeekVoice = { path, position, duration -> viewModel.seekVoice(path, position, duration) },
onOpenFile = { if (it.filePath.isNotEmpty()) { pathToSave = it.filePath; save.launch(it.text) } }, onOpenFile = { if (it.filePath.isNotEmpty()) { pathToSave = it.filePath; save.launch(it.text) } },
onPlayVideo = onPlayVideo) onPlayVideo = onPlayVideo, onInviteLink = viewModel::openInviteLink)
if (error.isNotEmpty()) Text(error, color = MaterialTheme.colorScheme.error, modifier = Modifier.padding(8.dp)) if (error.isNotEmpty()) Text(error, color = MaterialTheme.colorScheme.error, modifier = Modifier.padding(8.dp))
ConversationComposer(target, viewModel, onSendMessage, onRecordVideo) ConversationComposer(target, viewModel, onSendMessage, onRecordVideo)
} }

Loading…
Cancel
Save