Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
For #27579 - Fix broken previews for MessageCard
Browse files Browse the repository at this point in the history
  • Loading branch information
@MozillaNoah @mergify
MozillaNoah authored and mergify[bot] committed Nov 1, 2022
1 parent 62a661a commit 0933f90
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 74 deletions.
119 changes: 46 additions & 73 deletions app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

package org.mozilla.fenix.compose

import android.content.res.Configuration
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
Expand All @@ -27,34 +28,35 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.mozilla.experiments.nimbus.StringHolder
import org.mozilla.fenix.R
import org.mozilla.fenix.compose.button.PrimaryButton
import org.mozilla.fenix.gleanplumb.Message
import org.mozilla.fenix.nimbus.MessageData
import org.mozilla.fenix.nimbus.StyleData
import org.mozilla.fenix.theme.FirefoxTheme
import org.mozilla.fenix.theme.Theme

/**
* Message Card.
*
* @param message [Message] that holds a representation of GleanPlum message from Nimbus.
* @param messageText The message card's body text to be displayed.
* @param titleText An optional title of message card. If the title is blank or null is provided,
* the title will not be shown.
* @param buttonText An optional button text of the message card. If the button text is blank or null is provided,
* the button won't be shown.
* @param onClick Invoked when user clicks on the message card.
* @param onCloseButtonClick Invoked when user clicks on close button to remove message.
*/
@Suppress("LongMethod")
@Composable
fun MessageCard(
message: Message,
messageText: String,
titleText: String? = null,
buttonText: String? = null,
onClick: () -> Unit,
onCloseButtonClick: () -> Unit,
) {
Card(
modifier = Modifier
.padding(vertical = 16.dp)
.then(
if (message.data.buttonLabel.isNullOrBlank()) {
if (buttonText.isNullOrBlank()) {
Modifier.clickable(onClick = onClick)
} else {
Modifier
Expand All @@ -68,13 +70,12 @@ fun MessageCard(
.padding(all = 16.dp)
.fillMaxWidth(),
) {
val title = message.data.title
if (!title.isNullOrBlank()) {
if (!titleText.isNullOrBlank()) {
Row(
modifier = Modifier.fillMaxWidth(),
) {
Text(
text = title,
text = titleText,
modifier = Modifier.weight(1f),
color = FirefoxTheme.colors.textPrimary,
overflow = TextOverflow.Ellipsis,
Expand All @@ -97,7 +98,7 @@ fun MessageCard(
}

Text(
text = message.data.text,
text = messageText,
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp,
color = FirefoxTheme.colors.textSecondary,
Expand All @@ -107,7 +108,7 @@ fun MessageCard(
modifier = Modifier.fillMaxWidth(),
) {
Text(
text = message.data.text,
text = messageText,
modifier = Modifier.weight(1f),
fontSize = 14.sp,
color = FirefoxTheme.colors.textPrimary,
Expand All @@ -128,12 +129,11 @@ fun MessageCard(
}
}

val buttonLabel = message.data.buttonLabel
if (!buttonLabel.isNullOrBlank()) {
if (!buttonText.isNullOrBlank()) {
Spacer(modifier = Modifier.height(16.dp))

PrimaryButton(
text = buttonLabel,
text = buttonText,
onClick = onClick,
)
}
Expand All @@ -142,28 +142,18 @@ fun MessageCard(
}

@Composable
@Preview
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun MessageCardPreview() {
FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
FirefoxTheme {
Box(
Modifier
.background(FirefoxTheme.colors.layer1)
.padding(all = 16.dp),
) {
MessageCard(
message = Message(
id = "end-",
data = MessageData(
title = StringHolder(
R.string.bookmark_empty_title_error,
"Title",
),
text = StringHolder(
R.string.default_browser_experiment_card_text,
"description",
),
),
action = "action",
style = StyleData(),
triggers = listOf("trigger"),
metadata = Message.Metadata("end-"),
),
messageText = stringResource(id = R.string.default_browser_experiment_card_text),
titleText = stringResource(id = R.string.bookmark_empty_title_error),
onClick = {},
onCloseButtonClick = {},
)
Expand All @@ -172,24 +162,17 @@ private fun MessageCardPreview() {
}

@Composable
@Preview
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun MessageCardWithoutTitlePreview() {
FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
FirefoxTheme {
Box(
modifier = Modifier
.background(FirefoxTheme.colors.layer1)
.padding(all = 16.dp),
) {
MessageCard(
message = Message(
id = "end-",
data = MessageData(
text = StringHolder(
R.string.default_browser_experiment_card_text,
"description",
),
),
action = "action",
style = StyleData(),
triggers = listOf("trigger"),
metadata = Message.Metadata("end-"),
),
messageText = stringResource(id = R.string.default_browser_experiment_card_text),
onClick = {},
onCloseButtonClick = {},
)
Expand All @@ -198,29 +181,19 @@ private fun MessageCardWithoutTitlePreview() {
}

@Composable
@Preview
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun MessageCardWithButtonLabelPreview() {
FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
FirefoxTheme {
Box(
modifier = Modifier
.background(FirefoxTheme.colors.layer1)
.padding(all = 16.dp),
) {
MessageCard(
message = Message(
id = "end-",
data = MessageData(
buttonLabel = StringHolder(R.string.preferences_set_as_default_browser, ""),
title = StringHolder(
R.string.bookmark_empty_title_error,
"Title",
),
text = StringHolder(
R.string.default_browser_experiment_card_text,
"description",
),
),
action = "action",
style = StyleData(),
triggers = listOf("trigger"),
metadata = Message.Metadata("end-"),
),
messageText = stringResource(id = R.string.default_browser_experiment_card_text),
titleText = stringResource(id = R.string.bookmark_empty_title_error),
buttonText = stringResource(id = R.string.preferences_set_as_default_browser),
onClick = {},
onCloseButtonClick = {},
)
Expand Down
4 changes: 3 additions & 1 deletion ...ava/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/MessageCardViewHolder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ class MessageCardViewHolder(
val message by remember { mutableStateOf(messageGlobal) }

MessageCard(
message = message,
messageText = message.data.text,
titleText = message.data.title,
buttonText = message.data.buttonLabel,
onClick = { interactor.onMessageClicked(message) },
onCloseButtonClick = { interactor.onMessageClosedClicked(message) },
)
Expand Down

0 comments on commit 0933f90

Please sign in to comment.