diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt index 8c0ac42a40..3038404623 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt @@ -133,7 +133,7 @@ class ConversationBannerView @JvmOverloads constructor( hide(voiceNotePlayerStub) } - fun showPinnedMessageStub(messages: List, canUnpin: Boolean) { + fun showPinnedMessageStub(messages: List, canUnpin: Boolean, hasWallpaper: Boolean) { show( stub = pinnedMessageStub ) { @@ -143,6 +143,7 @@ class ConversationBannerView @JvmOverloads constructor( PinnedMessagesBanner( messages = messages, canUnpin = canUnpin, + hasWallpaper = hasWallpaper, onUnpinMessage = { messageId -> listener?.onUnpinMessage(messageId) }, onGoToMessage = { messageId -> listener?.onGoToMessage(messageId) }, onViewAllMessages = { listener?.onViewAllMessages() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index bace444323..bbffd4e62d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -1203,7 +1203,7 @@ class ConversationFragment : .flowWithLifecycle(viewLifecycleOwner.lifecycle) .flowOn(Dispatchers.Main) .collect { - presentPinnedMessage(it) + presentPinnedMessage(it, args.wallpaper != null) } } @@ -1350,9 +1350,9 @@ class ConversationFragment : .addTo(disposables) } - private fun presentPinnedMessage(pinnedMessages: List) { + private fun presentPinnedMessage(pinnedMessages: List, hasWallpaper: Boolean) { if (pinnedMessages.isNotEmpty()) { - binding.conversationBanner.showPinnedMessageStub(messages = pinnedMessages, canUnpin = conversationGroupViewModel.canEditGroupInfo()) + binding.conversationBanner.showPinnedMessageStub(messages = pinnedMessages, canUnpin = conversationGroupViewModel.canEditGroupInfo(), hasWallpaper = hasWallpaper) } else { binding.conversationBanner.hidePinnedMessageStub() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinnedMessagesComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinnedMessagesComponent.kt index fd8b3d8a78..e2625ce3f2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinnedMessagesComponent.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/PinnedMessagesComponent.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.font.FontWeight @@ -65,6 +66,7 @@ import kotlin.jvm.optionals.getOrDefault fun PinnedMessagesBanner( messages: List = emptyList(), canUnpin: Boolean, + hasWallpaper: Boolean, onUnpinMessage: (Long) -> Unit = {}, onGoToMessage: (Long) -> Unit = {}, onViewAllMessages: () -> Unit = {} @@ -81,7 +83,7 @@ fun PinnedMessagesBanner( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .fillMaxWidth() - .background(SignalTheme.colors.colorSurface2) + .background(if (hasWallpaper) colorResource(R.color.conversation_toolbar_color_wallpaper_scrolled) else SignalTheme.colors.colorSurface2) .clickable { index = (index + 1) % messages.size onGoToMessage(message.id)