nik/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-09-19 04:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add spoiler to image messages

Browse Source
This commit is contained in:
yet300 2026-01-07 12:38:16 +04:00
parent 767d960668
commit 5e5c42d50e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/bitchat/android/ui/media/ImageMessageItem.kt
View File

@ -31,6 +31,8 @@ import com.bitchat.android.mesh.BluetoothMeshService
import com.bitchat.android.model.BitchatMessage import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.model.BitchatMessageType import com.bitchat.android.model.BitchatMessageType
import androidx.compose.material3.ColorScheme import androidx.compose.material3.ColorScheme
import androidx.compose.runtime.saveable.rememberSaveable
import com.bitchat.android.core.ui.utils.spoiler
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -93,6 +95,8 @@ fun ImageMessageItem(
is com.bitchat.android.model.DeliveryStatus.PartiallyDelivered -> if (st.total > 0) st.reached.toFloat() / st.total.toFloat() else 0f is com.bitchat.android.model.DeliveryStatus.PartiallyDelivered -> if (st.total > 0) st.reached.toFloat() / st.total.toFloat() else 0f
else -> null else -> null
} }
var isSpoilerVisible by rememberSaveable(key = message.id) { mutableStateOf(true) }
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Start) { Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Start) {
Box { Box {
if (progressFraction != null && progressFraction < 1f && message.sender == currentUserNickname) { if (progressFraction != null && progressFraction < 1f && message.sender == currentUserNickname) {
@ -110,6 +114,7 @@ fun ImageMessageItem(
val currentIndex = imagePaths.indexOf(path) val currentIndex = imagePaths.indexOf(path)
onImageClick?.invoke(path, imagePaths, currentIndex) onImageClick?.invoke(path, imagePaths, currentIndex)
} }
.spoiler(isOn = isSpoilerVisible) { isSpoilerVisible = false }
) )
} else { } else {
// Fully revealed image // Fully revealed image
@ -120,10 +125,11 @@ fun ImageMessageItem(
.widthIn(max = 300.dp) .widthIn(max = 300.dp)
.aspectRatio(aspect) .aspectRatio(aspect)
.clip(androidx.compose.foundation.shape.RoundedCornerShape(10.dp)) .clip(androidx.compose.foundation.shape.RoundedCornerShape(10.dp))
.clickable { .clickable(enabled = !isSpoilerVisible) {
val currentIndex = imagePaths.indexOf(path) val currentIndex = imagePaths.indexOf(path)
onImageClick?.invoke(path, imagePaths, currentIndex) onImageClick?.invoke(path, imagePaths, currentIndex)
}, }
.spoiler(isOn = isSpoilerVisible) { isSpoilerVisible = false },
contentScale = ContentScale.Fit contentScale = ContentScale.Fit
) )
} }