Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-02 03:40:16 +00:00
Code Issues Releases Wiki Activity

For #25750 - Use Headline7 for the expandable list headers that appear in cards

Browse Source
This commit is contained in:
Gabriel Luong 2022-06-24 12:27:27 -04:00 committed by mergify[bot]
parent 2f17888f79
commit 8fa08f31b9
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/compose/list/ExpandableListHeader.kt
View File

@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.mozilla.fenix.R
@ -30,6 +31,7 @@ import org.mozilla.fenix.theme.Theme
* Expandable header for sections of lists
*
* @param headerText The title of the header.
* @param headerTextStyle The text style of the header.
* @param expanded Indicates whether the section of content is expanded. If null, the Icon will be hidden.
* @param expandActionContentDescription The content description for expanding the section.
* @param collapseActionContentDescription The content description for collapsing the section.
@ -40,6 +42,7 @@ import org.mozilla.fenix.theme.Theme
@Composable
fun ExpandableListHeader(
headerText: String,
headerTextStyle: TextStyle = FirefoxTheme.typography.headline8,
expanded: Boolean? = null,
expandActionContentDescription: String? = null,
collapseActionContentDescription: String? = null,
@ -64,7 +67,7 @@ fun ExpandableListHeader(
Text(
text = headerText,
color = FirefoxTheme.colors.textPrimary,
style = FirefoxTheme.typography.headline8,
style = headerTextStyle,
maxLines = 1,
)

1
app/src/main/java/org/mozilla/fenix/home/collections/Collection.kt
View File

@ -105,6 +105,7 @@ fun Collection(
ExpandableListHeader(
headerText = collection.title,
headerTextStyle = FirefoxTheme.typography.headline7,
expanded = isExpanded,
) {
if (isExpanded) {

1
app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt
View File

@ -138,6 +138,7 @@ private fun InactiveTabsHeader(
) {
ExpandableListHeader(
headerText = stringResource(R.string.inactive_tabs_title),
headerTextStyle = FirefoxTheme.typography.headline7,
expanded = expanded,
expandActionContentDescription = stringResource(R.string.inactive_tabs_expand_content_description),
collapseActionContentDescription = stringResource(R.string.inactive_tabs_collapse_content_description),