Skip to content

Dark mode fixes to Pinned Message #5737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahibi merged 1 commit into from
Jan 22, 2026
Merged

Dark mode fixes to Pinned Message #5737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 9 additions & 185 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import android.provider.MediaStore
import android.provider.Settings
import android.text.SpannableStringBuilder
import android.text.TextUtils
import android.text.format.DateFormat
import android.util.Log
import android.view.Gravity
import android.view.Menu
Expand All @@ -60,39 +59,11 @@ import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.view.ContextThemeWrapper
import androidx.cardview.widget.CardView
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.Divider
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
Expand Down Expand Up @@ -196,7 +167,7 @@ import com.nextcloud.talk.signaling.SignalingMessageReceiver
import com.nextcloud.talk.signaling.SignalingMessageSender
import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity
import com.nextcloud.talk.translate.ui.TranslateActivity
import com.nextcloud.talk.ui.ComposeChatAdapter
import com.nextcloud.talk.ui.PinnedMessageView
import com.nextcloud.talk.ui.PlaybackSpeed
import com.nextcloud.talk.ui.PlaybackSpeedControl
import com.nextcloud.talk.ui.StatusDrawable
Expand Down Expand Up @@ -720,7 +691,14 @@ class ChatActivity :
message?.let {
binding.pinnedMessageContainer.visibility = View.VISIBLE
binding.pinnedMessageComposeView.setContent {
PinnedMessageView(message)
PinnedMessageView(
message,
viewThemeUtils,
currentConversation,
scrollToMessageWithIdWithOffset = ::scrollToMessageWithIdWithOffset,
hidePinnedMessage = ::hidePinnedMessage,
unPinMessage = ::unPinMessage
)
}
}
}
Expand Down Expand Up @@ -1381,160 +1359,6 @@ class ChatActivity :
}
}

@Composable
private fun PinnedMessageView(message: ChatMessage) {
message.incoming = true

val pinnedBy = stringResource(R.string.pinned_by)

message.actorDisplayName = remember(message.pinnedActorDisplayName) {
"${message.actorDisplayName}\n$pinnedBy ${message.pinnedActorDisplayName}"
}
val scrollState = rememberScrollState()

val outgoingBubbleColor = remember {
val colorInt = viewThemeUtils.talk
.getOutgoingMessageBubbleColor(context, message.isDeleted, false)

Color(colorInt)
}

val incomingBubbleColor = remember {
val colorInt = resources
.getColor(R.color.bg_message_list_incoming_bubble, null)

Color(colorInt)
}

val canPin = remember {
message.isOneToOneConversation ||
ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)
}

Column(
verticalArrangement = Arrangement.spacedBy((-16).dp),
modifier = Modifier
) {
Box(
modifier = Modifier
.shadow(4.dp, shape = RoundedCornerShape(16.dp))
.background(incomingBubbleColor, RoundedCornerShape(16.dp))
.padding(16.dp)
.heightIn(max = 100.dp)
.verticalScroll(scrollState)
.clickable {
scrollToMessageWithIdWithOffset(message.id)
}

) {
ComposeChatAdapter().GetComposableForMessage(message)
}

var expanded by remember { mutableStateOf(false) }

val pinnedText = remember(message.pinnedUntil) {
val pinnedUntilStr = context.getString(R.string.pinned_until)
val untilUnpin = context.getString(R.string.until_unpin)

message.pinnedUntil?.let {
val format = if (DateFormat.is24HourFormat(context)) {
"MMM dd yyyy, HH:mm"
} else {
"MMM dd yyyy, hh:mm a"
}

val localDateTime = Instant.ofEpochSecond(it)
.atZone(ZoneId.systemDefault())
.toLocalDateTime()

val timeString = localDateTime.format(DateTimeFormatter.ofPattern(format))

"$pinnedUntilStr $timeString"
} ?: untilUnpin
}

Box(
modifier = Modifier
.offset(16.dp, 0.dp)
.background(outgoingBubbleColor, RoundedCornerShape(16.dp))
) {
IconButton(onClick = { expanded = true }) {
Icon(
imageVector = Icons.Default.Menu, // Or use a Pin icon here
contentDescription = "Pinned Message Options"
)
}

DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
modifier = Modifier.background(outgoingBubbleColor)
) {
DropdownMenuItem(
text = {
Text(
text = pinnedText,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
},
onClick = { /* No-op or toggle expansion */ },
enabled = false // Visually distinct as information, not action
)

Divider()

DropdownMenuItem(
text = { Text("Go to message") },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.baseline_chat_bubble_outline_24),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
},
onClick = {
expanded = false
scrollToMessageWithIdWithOffset(message.id)
}
)

DropdownMenuItem(
text = { Text("Dismiss") },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.ic_eye_off),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
},
onClick = {
expanded = false
hidePinnedMessage(message)
}
)

if (canPin) {
DropdownMenuItem(
text = { Text("Unpin") },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.keep_off_24px),
contentDescription = null,
modifier = Modifier.size(24.dp)
)
},
onClick = {
expanded = false
unPinMessage(message)
}
)
}
}
}
}
}

private fun removeUnreadMessagesMarker() {
removeMessageById(UNREAD_MESSAGES_MARKER_ID.toString())
}
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/com/nextcloud/talk/ui/ComposeChatAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ class ComposeChatAdapter(
} else {
Color.Black.toArgb()
}
val highEmphasisColor = Color(highEmphasisColorInt)

fun addMessages(messages: MutableList<ChatMessage>, append: Boolean) {
if (messages.isEmpty()) return
Expand Down Expand Up @@ -307,7 +308,7 @@ class ComposeChatAdapter(
} else {
val timestamp = items[listState.firstVisibleItemIndex].timestamp
val dateString = formatTime(timestamp * LONG_1000)
val color = Color(highEmphasisColorInt)
val color = highEmphasisColor
val backgroundColor =
LocalResources.current.getColor(R.color.bg_message_list_incoming_bubble, null)
Row(
Expand Down Expand Up @@ -521,7 +522,11 @@ class ComposeChatAdapter(
}

if (incoming) {
Text(message.actorDisplayName.toString(), fontSize = AUTHOR_TEXT_SIZE)
Text(
message.actorDisplayName.toString(),
fontSize = AUTHOR_TEXT_SIZE,
color = highEmphasisColor
)
}

ThreadTitle(message)
Expand Down Expand Up @@ -574,7 +579,8 @@ class ComposeChatAdapter(
Text(
timeString,
fontSize = TIME_TEXT_SIZE,
textAlign = TextAlign.Center
textAlign = TextAlign.Center,
color = highEmphasisColor
)
}

Expand All @@ -587,7 +593,8 @@ class ComposeChatAdapter(
"",
modifier = Modifier
.padding(start = 4.dp)
.size(16.dp)
.size(16.dp),
tint = highEmphasisColor
)
}
}
Expand Down Expand Up @@ -786,7 +793,7 @@ class ComposeChatAdapter(
Text(
text,
fontSize = AUTHOR_TEXT_SIZE,
color = Color(highEmphasisColorInt)
color = highEmphasisColor
)
}
}
Expand Down
Loading
Loading