Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/24528 - Remove isPrivate conditional in getTheme in favor of inComposePreview

Browse Source
pull/600/head
Alexandru2909 2 years ago committed by mergify[bot]
parent 06a5205cbb
commit ae62eb26cb
31 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/mozilla/fenix/compose/ClickableSubstringLink.kt
Unescape Escape View File

@ -87,7 +87,7 @@ fun ClickableSubstringLink(
private fun ClickableSubstringTextPreview() { private fun ClickableSubstringTextPreview() {
val text = "This text contains a link" val text = "This text contains a link"
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(modifier = Modifier.background(color = FirefoxTheme.colors.layer1)) { Box(modifier = Modifier.background(color = FirefoxTheme.colors.layer1)) {
ClickableSubstringLink( ClickableSubstringLink(
text = text, text = text,

2
app/src/main/java/org/mozilla/fenix/compose/Favicon.kt
Unescape Escape View File

@ -98,7 +98,7 @@ private fun FaviconPlaceholder(
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun FaviconPreview() { private fun FaviconPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
Favicon( Favicon(
url = "www.mozilla.com", url = "www.mozilla.com",

4
app/src/main/java/org/mozilla/fenix/compose/ListItemTabLarge.kt
Unescape Escape View File

@ -154,7 +154,7 @@ fun ListItemTabSurface(
@Composable @Composable
@Preview @Preview
private fun ListItemTabLargePreview() { private fun ListItemTabLargePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
ListItemTabLarge( ListItemTabLarge(
imageUrl = "", imageUrl = "",
title = "This is a very long title for a tab but needs to be so for this preview", title = "This is a very long title for a tab but needs to be so for this preview",
@ -166,7 +166,7 @@ private fun ListItemTabLargePreview() {
@Composable @Composable
@Preview @Preview
private fun ListItemTabSurfacePreview() { private fun ListItemTabSurfacePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
ListItemTabSurface( ListItemTabSurface(
imageUrl = "" imageUrl = ""
) { ) {

2
app/src/main/java/org/mozilla/fenix/compose/ListItemTabLargePlaceholder.kt
Unescape Escape View File

@ -74,7 +74,7 @@ fun ListItemTabLargePlaceholder(
@Composable @Composable
@Preview @Preview
private fun ListItemTabLargePlaceholderPreview() { private fun ListItemTabLargePlaceholderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
ListItemTabLargePlaceholder(text = "Item placeholder") ListItemTabLargePlaceholder(text = "Item placeholder")
} }
} }

6
app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
Unescape Escape View File

@ -137,7 +137,7 @@ fun MessageCard(
@Composable @Composable
@Preview @Preview
private fun MessageCardPreview() { private fun MessageCardPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
MessageCard( MessageCard(
message = Message( message = Message(
@ -166,7 +166,7 @@ private fun MessageCardPreview() {
@Composable @Composable
@Preview @Preview
private fun MessageCardWithoutTitlePreview() { private fun MessageCardWithoutTitlePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
MessageCard( MessageCard(
message = Message( message = Message(
@ -191,7 +191,7 @@ private fun MessageCardWithoutTitlePreview() {
@Composable @Composable
@Preview @Preview
private fun MessageCardWithButtonLabelPreview() { private fun MessageCardWithButtonLabelPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
MessageCard( MessageCard(
message = Message( message = Message(

4
app/src/main/java/org/mozilla/fenix/compose/SelectableChip.kt
Unescape Escape View File

@ -68,7 +68,7 @@ fun SelectableChip(
@Composable @Composable
@Preview(uiMode = UI_MODE_NIGHT_YES) @Preview(uiMode = UI_MODE_NIGHT_YES)
private fun SelectableChipDarkThemePreview() { private fun SelectableChipDarkThemePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -84,7 +84,7 @@ private fun SelectableChipDarkThemePreview() {
@Composable @Composable
@Preview(uiMode = UI_MODE_NIGHT_NO) @Preview(uiMode = UI_MODE_NIGHT_NO)
private fun SelectableChipLightThemePreview() { private fun SelectableChipLightThemePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()

2
app/src/main/java/org/mozilla/fenix/compose/StaggeredHorizontalGrid.kt
Unescape Escape View File

@ -121,7 +121,7 @@ fun StaggeredHorizontalGrid(
@Composable @Composable
@Preview @Preview
private fun StaggeredHorizontalGridPreview() { private fun StaggeredHorizontalGridPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer2)) { Box(Modifier.background(FirefoxTheme.colors.layer2)) {
StaggeredHorizontalGrid( StaggeredHorizontalGrid(
horizontalItemsSpacing = 8.dp, horizontalItemsSpacing = 8.dp,

2
app/src/main/java/org/mozilla/fenix/compose/TabSubtitleWithInterdot.kt
Unescape Escape View File

@ -106,7 +106,7 @@ fun TabSubtitleWithInterdot(
@Composable @Composable
@Preview @Preview
private fun TabSubtitleWithInterdotPreview() { private fun TabSubtitleWithInterdotPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer2)) { Box(Modifier.background(FirefoxTheme.colors.layer2)) {
TabSubtitleWithInterdot( TabSubtitleWithInterdot(
firstText = "firstText", firstText = "firstText",

2
app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt
Unescape Escape View File

@ -130,7 +130,7 @@ private fun ThumbnailImage(
@Preview @Preview
@Composable @Composable
private fun ThumbnailCardPreview() { private fun ThumbnailCardPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
ThumbnailCard( ThumbnailCard(
url = "https://mozilla.com", url = "https://mozilla.com",
key = "123", key = "123",

2
app/src/main/java/org/mozilla/fenix/compose/button/Button.kt
Unescape Escape View File

@ -171,7 +171,7 @@ fun DestructiveButton(
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun ButtonPreview() { private fun ButtonPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Column( Column(
modifier = Modifier modifier = Modifier
.background(FirefoxTheme.colors.layer1) .background(FirefoxTheme.colors.layer1)

2
app/src/main/java/org/mozilla/fenix/compose/button/TextButton.kt
Unescape Escape View File

@ -48,7 +48,7 @@ fun TextButton(
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun TextButtonPreview() { private fun TextButtonPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
TextButton( TextButton(
text = "label", text = "label",

2
app/src/main/java/org/mozilla/fenix/compose/home/HomeSectionHeader.kt
Unescape Escape View File

@ -66,7 +66,7 @@ fun HomeSectionHeader(
@Composable @Composable
@Preview @Preview
private fun HomeSectionsHeaderPreview() { private fun HomeSectionsHeaderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
HomeSectionHeader( HomeSectionHeader(
headerText = stringResource(R.string.recent_bookmarks_title), headerText = stringResource(R.string.recent_bookmarks_title),
description = stringResource(R.string.recently_saved_show_all_content_description_2), description = stringResource(R.string.recently_saved_show_all_content_description_2),

8
app/src/main/java/org/mozilla/fenix/compose/list/ExpandableListHeader.kt
Unescape Escape View File

@ -96,7 +96,7 @@ fun ExpandableListHeader(
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun TextOnlyHeaderPreview() { private fun TextOnlyHeaderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader(headerText = "Section title") ExpandableListHeader(headerText = "Section title")
} }
@ -106,7 +106,7 @@ private fun TextOnlyHeaderPreview() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun CollapsibleHeaderPreview() { private fun CollapsibleHeaderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader( ExpandableListHeader(
headerText = "Collapsible section title", headerText = "Collapsible section title",
@ -122,7 +122,7 @@ private fun CollapsibleHeaderPreview() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun HeaderWithClickableIconPreview() { private fun HeaderWithClickableIconPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader(headerText = "Section title") { ExpandableListHeader(headerText = "Section title") {
Box( Box(
@ -145,7 +145,7 @@ private fun HeaderWithClickableIconPreview() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun CollapsibleHeaderWithClickableIconPreview() { private fun CollapsibleHeaderWithClickableIconPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
ExpandableListHeader( ExpandableListHeader(
headerText = "Section title", headerText = "Section title",

12
app/src/main/java/org/mozilla/fenix/compose/list/ListItem.kt
Unescape Escape View File

@ -250,7 +250,7 @@ private fun ListItem(
@Composable @Composable
@Preview(name = "TextListItem", uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(name = "TextListItem", uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun TextListItemPreview() { private fun TextListItemPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
TextListItem(label = "Label only") TextListItem(label = "Label only")
} }
@ -260,7 +260,7 @@ private fun TextListItemPreview() {
@Composable @Composable
@Preview(name = "TextListItem with a description", uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(name = "TextListItem with a description", uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun TextListItemWithDescriptionPreview() { private fun TextListItemWithDescriptionPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
TextListItem( TextListItem(
label = "Label + description", label = "Label + description",
@ -273,7 +273,7 @@ private fun TextListItemWithDescriptionPreview() {
@Composable @Composable
@Preview(name = "TextListItem with a right icon", uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(name = "TextListItem with a right icon", uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun TextListItemWithIconPreview() { private fun TextListItemWithIconPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
TextListItem( TextListItem(
label = "Label + right icon", label = "Label + right icon",
@ -288,7 +288,7 @@ private fun TextListItemWithIconPreview() {
@Composable @Composable
@Preview(name = "IconListItem", uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(name = "IconListItem", uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun IconListItemPreview() { private fun IconListItemPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
IconListItem( IconListItem(
label = "Left icon list item", label = "Left icon list item",
@ -305,7 +305,7 @@ private fun IconListItemPreview() {
uiMode = Configuration.UI_MODE_NIGHT_YES uiMode = Configuration.UI_MODE_NIGHT_YES
) )
private fun IconListItemWithRightIconPreview() { private fun IconListItemWithRightIconPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
IconListItem( IconListItem(
label = "Left icon list item + right icon", label = "Left icon list item + right icon",
@ -325,7 +325,7 @@ private fun IconListItemWithRightIconPreview() {
uiMode = Configuration.UI_MODE_NIGHT_YES uiMode = Configuration.UI_MODE_NIGHT_YES
) )
private fun FaviconListItemPreview() { private fun FaviconListItemPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
FaviconListItem( FaviconListItem(
label = "Favicon + right icon + clicks", label = "Favicon + right icon + clicks",

2
app/src/main/java/org/mozilla/fenix/compose/tabstray/MediaImage.kt
Unescape Escape View File

@ -59,7 +59,7 @@ fun MediaImage(
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun ImagePreview() { private fun ImagePreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
MediaImage( MediaImage(
tab = createTab(url = "https://mozilla.com"), tab = createTab(url = "https://mozilla.com"),
onMediaIconClicked = {}, onMediaIconClicked = {},

4
app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt
Unescape Escape View File

@ -173,7 +173,7 @@ private fun Thumbnail(
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun TabListItemPreview() { private fun TabListItemPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
TabListItem( TabListItem(
tab = createTab(url = "www.mozilla.com", title = "Mozilla"), tab = createTab(url = "www.mozilla.com", title = "Mozilla"),
onCloseClick = {}, onCloseClick = {},
@ -188,7 +188,7 @@ private fun TabListItemPreview() {
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun SelectedTabListItemPreview() { private fun SelectedTabListItemPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
TabListItem( TabListItem(
tab = createTab(url = "www.mozilla.com", title = "Mozilla"), tab = createTab(url = "www.mozilla.com", title = "Mozilla"),
onCloseClick = {}, onCloseClick = {},

2
app/src/main/java/org/mozilla/fenix/home/collections/CollectionItem.kt
Unescape Escape View File

@ -195,7 +195,7 @@ private fun Modifier.clipTop() = this.then(
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun TabInCollectionPreview() { private fun TabInCollectionPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Column { Column {
Box(modifier = Modifier.height(56.dp)) { Box(modifier = Modifier.height(56.dp)) {
DismissedTabBackground( DismissedTabBackground(

2
app/src/main/java/org/mozilla/fenix/home/pocket/PocketCategoriesViewHolder.kt
Unescape Escape View File

@ -104,7 +104,7 @@ private fun PocketTopics(
@Composable @Composable
@Preview @Preview
private fun PocketCategoriesViewHolderPreview() { private fun PocketCategoriesViewHolderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
PocketTopics( PocketTopics(
categories = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor" categories = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor"
.split(" ") .split(" ")

2
app/src/main/java/org/mozilla/fenix/home/pocket/PocketRecommendationsHeaderViewHolder.kt
Unescape Escape View File

@ -60,7 +60,7 @@ class PocketRecommendationsHeaderViewHolder(
@Composable @Composable
@Preview @Preview
fun PocketRecommendationsFooterViewHolderPreview() { fun PocketRecommendationsFooterViewHolderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
PoweredByPocketHeader( PoweredByPocketHeader(
onLearnMoreClicked = {} onLearnMoreClicked = {}
) )

2
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt
Unescape Escape View File

@ -446,7 +446,7 @@ fun PoweredByPocketHeader(
@Composable @Composable
@Preview @Preview
private fun PocketStoriesComposablesPreview() { private fun PocketStoriesComposablesPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer2)) { Box(Modifier.background(FirefoxTheme.colors.layer2)) {
Column { Column {
PocketStories( PocketStories(

2
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesViewHolder.kt
Unescape Escape View File

@ -103,7 +103,7 @@ class PocketStoriesViewHolder(
@Composable @Composable
@Preview @Preview
fun PocketStoriesViewHolderPreview() { fun PocketStoriesViewHolderPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Column { Column {
SectionHeader( SectionHeader(
text = stringResource(R.string.pocket_stories_header_1), text = stringResource(R.string.pocket_stories_header_1),

2
app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt
Unescape Escape View File

@ -219,7 +219,7 @@ private fun RecentBookmarksMenu(
@Composable @Composable
@Preview @Preview
private fun RecentBookmarksPreview() { private fun RecentBookmarksPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
RecentBookmarks( RecentBookmarks(
bookmarks = listOf( bookmarks = listOf(
RecentBookmark( RecentBookmark(

4
app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt
Unescape Escape View File

@ -200,7 +200,7 @@ private fun LoadedRecentSyncedTab() {
url = "https://mozilla.org", url = "https://mozilla.org",
iconUrl = "https://mozilla.org", iconUrl = "https://mozilla.org",
) )
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
RecentSyncedTab( RecentSyncedTab(
tab = tab, tab = tab,
onRecentSyncedTabClick = {}, onRecentSyncedTabClick = {},
@ -212,7 +212,7 @@ private fun LoadedRecentSyncedTab() {
@Preview @Preview
@Composable @Composable
private fun LoadingRecentSyncedTab() { private fun LoadingRecentSyncedTab() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
RecentSyncedTab( RecentSyncedTab(
tab = null, tab = null,
onRecentSyncedTabClick = {}, onRecentSyncedTabClick = {},

2
app/src/main/java/org/mozilla/fenix/home/recentvisits/view/RecentlyVisited.kt
Unescape Escape View File

@ -370,7 +370,7 @@ private val LazyListState.atLeastHalfVisibleItems
@Composable @Composable
@Preview @Preview
private fun RecentlyVisitedPreview() { private fun RecentlyVisitedPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
RecentlyVisited( RecentlyVisited(
recentVisits = listOf( recentVisits = listOf(
RecentHistoryGroup(title = "running shoes"), RecentHistoryGroup(title = "running shoes"),

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
Unescape Escape View File

@ -116,7 +116,7 @@ fun PrivateBrowsingDescription(
@Composable @Composable
@Preview @Preview
private fun PrivateBrowsingDescriptionPreview() { private fun PrivateBrowsingDescriptionPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
PrivateBrowsingDescription( PrivateBrowsingDescription(
onLearnMoreClick = {} onLearnMoreClick = {}
) )

2
app/src/main/java/org/mozilla/fenix/settings/address/view/AddressList.kt
Unescape Escape View File

@ -61,7 +61,7 @@ fun AddressList(
@Preview @Preview
@Composable @Composable
private fun AddressListPreview() { private fun AddressListPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer2)) { Box(Modifier.background(FirefoxTheme.colors.layer2)) {
AddressList( AddressList(
addresses = listOf( addresses = listOf(

4
app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
Unescape Escape View File

@ -294,7 +294,7 @@ private fun WallpaperLogoSwitch(
@Preview @Preview
@Composable @Composable
private fun WallpaperThumbnailsPreview() { private fun WallpaperThumbnailsPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
val context = LocalContext.current val context = LocalContext.current
val wallpaperManager = context.components.wallpaperManager val wallpaperManager = context.components.wallpaperManager
@ -316,7 +316,7 @@ private fun WallpaperThumbnailsPreview() {
@Preview @Preview
@Composable @Composable
private fun WallpaperSnackbarPreview() { private fun WallpaperSnackbarPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
WallpaperSnackbar( WallpaperSnackbar(
onViewWallpaper = {} onViewWallpaper = {}
) )

4
app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt
Unescape Escape View File

@ -229,7 +229,7 @@ private fun InactiveTabsAutoClosePrompt(
@Preview(name = "Auto close dialog dark", uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(name = "Auto close dialog dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
@Preview(name = "Auto close dialog light", uiMode = Configuration.UI_MODE_NIGHT_NO) @Preview(name = "Auto close dialog light", uiMode = Configuration.UI_MODE_NIGHT_NO)
private fun InactiveTabsAutoClosePromptPreview() { private fun InactiveTabsAutoClosePromptPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
InactiveTabsAutoClosePrompt( InactiveTabsAutoClosePrompt(
onDismissClick = {}, onDismissClick = {},
@ -246,7 +246,7 @@ private fun InactiveTabsListPreview() {
var expanded by remember { mutableStateOf(true) } var expanded by remember { mutableStateOf(true) }
var showAutoClosePrompt by remember { mutableStateOf(true) } var showAutoClosePrompt by remember { mutableStateOf(true) }
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
InactiveTabsList( InactiveTabsList(
inactiveTabs = generateFakeInactiveTabsList(), inactiveTabs = generateFakeInactiveTabsList(),

6
app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabs.kt
Unescape Escape View File

@ -240,7 +240,7 @@ fun SyncedTabsNoTabsItem() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun SyncedTabsListItemsPreview() { private fun SyncedTabsListItemsPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Column(Modifier.background(FirefoxTheme.colors.layer1)) { Column(Modifier.background(FirefoxTheme.colors.layer1)) {
SyncedTabsSectionHeader(headerText = "Google Pixel Pro Max +Ultra 5000") SyncedTabsSectionHeader(headerText = "Google Pixel Pro Max +Ultra 5000")
@ -276,7 +276,7 @@ private fun SyncedTabsListItemsPreview() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun SyncedTabsErrorPreview() { private fun SyncedTabsErrorPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
SyncedTabsErrorItem( SyncedTabsErrorItem(
errorText = stringResource(R.string.synced_tabs_no_tabs), errorText = stringResource(R.string.synced_tabs_no_tabs),
@ -293,7 +293,7 @@ private fun SyncedTabsErrorPreview() {
@Composable @Composable
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
private fun SyncedTabsListPreview() { private fun SyncedTabsListPreview() {
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
Box(Modifier.background(FirefoxTheme.colors.layer1)) { Box(Modifier.background(FirefoxTheme.colors.layer1)) {
SyncedTabsList( SyncedTabsList(
syncedTabs = getFakeSyncedTabList(), syncedTabs = getFakeSyncedTabList(),

2
app/src/main/java/org/mozilla/fenix/theme/FenixTypography.kt
Unescape Escape View File

@ -144,7 +144,7 @@ private fun TypographyPreview() {
Pair("Overline", defaultTypography.overline), Pair("Overline", defaultTypography.overline),
) )
FirefoxTheme(theme = Theme.getTheme(isPrivate = false)) { FirefoxTheme(theme = Theme.getTheme()) {
LazyColumn( LazyColumn(
modifier = Modifier modifier = Modifier
.background(FirefoxTheme.colors.layer1) .background(FirefoxTheme.colors.layer1)

6
app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
Unescape Escape View File

@ -19,6 +19,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import mozilla.components.ui.colors.PhotonColors import mozilla.components.ui.colors.PhotonColors
import org.mozilla.fenix.compose.inComposePreview
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
/** /**
@ -33,12 +34,11 @@ enum class Theme {
/** /**
* Returns the current [Theme] that is displayed. * Returns the current [Theme] that is displayed.
* *
* @param isPrivate Whether or not private browsing mode is enabled.
* @return the current [Theme] that is displayed. * @return the current [Theme] that is displayed.
*/ */
@Composable @Composable
fun getTheme(isPrivate: Boolean = LocalContext.current.settings().lastKnownMode.isPrivate) = fun getTheme() =
if (isPrivate) { if (!inComposePreview && LocalContext.current.settings().lastKnownMode.isPrivate) {
Private Private
} else if (isSystemInDarkTheme()) { } else if (isSystemInDarkTheme()) {
Dark Dark

Write Preview
Loading…
Cancel
Save