For #24467 - Enable Contile setting telemetry

This commit is contained in:
Noah Bond 2022-03-28 15:07:29 -07:00 committed by mergify[bot]
parent d9169af323
commit 57238fa5ca
1 changed files with 84 additions and 26 deletions

View File

@ -36,7 +36,9 @@ import org.mozilla.fenix.theme.FirefoxTheme
* @param expandActionContentDescription The content description for expanding the section.
* @param collapseActionContentDescription The content description for collapsing the section.
* @param onClick Optional lambda for handling header clicks.
* @param actions Optional Composable for adding UI to the end of the header.
*/
@Suppress("LongParameterList")
@Composable
fun ExpandableListHeader(
headerText: String,
@ -44,37 +46,44 @@ fun ExpandableListHeader(
expandActionContentDescription: String? = null,
collapseActionContentDescription: String? = null,
onClick: () -> Unit = {},
actions: @Composable () -> Unit = {},
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
.padding(horizontal = 16.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth(),
) {
PrimaryText(
text = headerText,
fontSize = 14.sp,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
maxLines = 1,
)
expanded?.let {
Spacer(modifier = Modifier.width(8.dp))
Icon(
painter = painterResource(
if (expanded) R.drawable.ic_chevron_down else R.drawable.ic_chevron_up
),
contentDescription = if (expanded) {
collapseActionContentDescription
} else {
expandActionContentDescription
},
modifier = Modifier.size(20.dp),
tint = FirefoxTheme.colors.iconPrimary,
Row(
modifier = Modifier
.weight(1f)
.clickable(onClick = onClick)
.padding(horizontal = 16.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
PrimaryText(
text = headerText,
fontSize = 14.sp,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
maxLines = 1,
)
expanded?.let {
Spacer(modifier = Modifier.width(8.dp))
Icon(
painter = painterResource(
if (expanded) R.drawable.ic_chevron_down else R.drawable.ic_chevron_up
),
contentDescription = if (expanded) {
collapseActionContentDescription
} else {
expandActionContentDescription
},
modifier = Modifier.size(20.dp),
tint = FirefoxTheme.colors.iconPrimary,
)
}
}
actions()
}
}
@ -103,3 +112,52 @@ private fun CollapsibleHeaderPreview() {
}
}
}
@Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun HeaderWithClickableIconPreview() {
FirefoxTheme {
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader(headerText = "Section title") {
Box(
modifier = Modifier
.clickable(onClick = { println("delete clicked") })
.padding(horizontal = 16.dp, vertical = 8.dp),
) {
Icon(
painter = painterResource(R.drawable.ic_delete),
contentDescription = "click me",
modifier = Modifier.size(20.dp),
tint = FirefoxTheme.colors.iconPrimary,
)
}
}
}
}
}
@Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun CollapsibleHeaderWithClickableIconPreview() {
FirefoxTheme {
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader(
headerText = "Section title",
expanded = true,
) {
Box(
modifier = Modifier
.clickable(onClick = { println("delete clicked") })
.padding(horizontal = 16.dp, vertical = 8.dp),
) {
Icon(
painter = painterResource(R.drawable.ic_delete),
contentDescription = "click me",
modifier = Modifier.size(20.dp),
tint = FirefoxTheme.colors.iconPrimary,
)
}
}
}
}
}