Skip to content

Commit 3d87d56

Browse files
[Bug Fix]: Fixed text color updates on cards after light<>dark mode changes
1 parent d438a00 commit 3d87d56

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ import androidx.compose.material3.Text
4646
import androidx.compose.runtime.Composable
4747
import androidx.compose.runtime.CompositionLocalProvider
4848
import androidx.compose.runtime.getValue
49+
import androidx.compose.runtime.key
4950
import androidx.compose.runtime.mutableStateOf
5051
import androidx.compose.runtime.remember
5152
import androidx.compose.runtime.setValue
5253
import androidx.compose.ui.Alignment
5354
import androidx.compose.ui.Modifier
5455
import androidx.compose.ui.draganddrop.DragAndDropTransferData
5556
import androidx.compose.ui.graphics.Color
57+
import androidx.compose.ui.graphics.toArgb
5658
import androidx.compose.ui.layout.ContentScale
5759
import androidx.compose.ui.platform.LocalInspectionMode
5860
import androidx.compose.ui.platform.testTag
@@ -95,6 +97,31 @@ fun NewsResourceCardExpanded(
9597
onClick: () -> Unit,
9698
onTopicClick: (String) -> Unit,
9799
modifier: Modifier = Modifier,
100+
) {
101+
val onSurfaceColor = MaterialTheme.colorScheme.onSurface.toArgb()
102+
103+
key(onSurfaceColor) {
104+
NewsResourceCardExpandedContent(
105+
userNewsResource = userNewsResource,
106+
isBookmarked = isBookmarked,
107+
hasBeenViewed = hasBeenViewed,
108+
onToggleBookmark = onToggleBookmark,
109+
onClick = onClick,
110+
onTopicClick = onTopicClick,
111+
modifier = modifier,
112+
)
113+
}
114+
}
115+
116+
@Composable
117+
private fun NewsResourceCardContent(
118+
userNewsResource: UserNewsResource,
119+
isBookmarked: Boolean,
120+
hasBeenViewed: Boolean,
121+
onToggleBookmark: () -> Unit,
122+
onClick: () -> Unit,
123+
onTopicClick: (String) -> Unit,
124+
modifier: Modifier = Modifier,
98125
) {
99126
val clickActionLabel = stringResource(R.string.core_ui_card_tap_action)
100127
val sharingLabel = stringResource(R.string.core_ui_feed_sharing)

0 commit comments

Comments
 (0)