Skip to content

[Bug Fix]: Fixed text color updates on cards after light<>dark mode changes #1996

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

Open
shrikantbadwaik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Bug Fix]: Fixed text color updates on cards after light<>dark mode changes #1996

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
27 changes: 27 additions & 0 deletions core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draganddrop.DragAndDropTransferData
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.platform.testTag
Expand Down Expand Up @@ -95,6 +97,31 @@ fun NewsResourceCardExpanded(
onClick: () -> Unit,
onTopicClick: (String) -> Unit,
modifier: Modifier = Modifier,
) {
val onSurfaceColor = MaterialTheme.colorScheme.onSurface.toArgb()

key(onSurfaceColor) {
NewsResourceCardContent(
userNewsResource = userNewsResource,
isBookmarked = isBookmarked,
hasBeenViewed = hasBeenViewed,
onToggleBookmark = onToggleBookmark,
onClick = onClick,
onTopicClick = onTopicClick,
modifier = modifier,
)
}
}

@Composable
private fun NewsResourceCardContent(
userNewsResource: UserNewsResource,
isBookmarked: Boolean,
hasBeenViewed: Boolean,
onToggleBookmark: () -> Unit,
onClick: () -> Unit,
onTopicClick: (String) -> Unit,
modifier: Modifier = Modifier,
) {
val clickActionLabel = stringResource(R.string.core_ui_card_tap_action)
val sharingLabel = stringResource(R.string.core_ui_feed_sharing)
Expand Down