Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/26587 - Replace the color in DefaultImagePlaceholder with FirefoxTheme layer2

Browse Source
This commit is contained in:
Noah Bond 2022-08-22 11:43:50 -07:00 committed by mergify[bot]
parent d808fc60d8
commit 4daac14987
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mozilla/fenix/compose/Image.kt
View File

@ -17,6 +17,7 @@ import androidx.compose.ui.unit.dp
import mozilla.components.support.images.compose.loader.ImageLoader
import mozilla.components.support.images.compose.loader.WithImage
import org.mozilla.fenix.components.components
import org.mozilla.fenix.theme.FirefoxTheme
/**
* A composable that lays out and draws the image from a given URL while showing a default placeholder
@ -75,8 +76,10 @@ fun Image(
@Composable
@Preview
private fun ImagePreview() {
Image(
"https://mozilla.com",
Modifier.height(100.dp).width(200.dp)
)
FirefoxTheme {
Image(
url = "https://mozilla.com",
modifier = Modifier.height(100.dp).width(200.dp)
)
}
}

22
app/src/main/java/org/mozilla/fenix/compose/ImagesPlaceholder.kt
View File

@ -5,7 +5,6 @@
package org.mozilla.fenix.compose
import androidx.compose.foundation.Image
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
@ -17,7 +16,7 @@ import androidx.compose.ui.unit.dp
import mozilla.components.support.images.compose.loader.Fallback
import mozilla.components.support.images.compose.loader.ImageLoaderScope
import mozilla.components.support.images.compose.loader.Placeholder
import mozilla.components.ui.colors.PhotonColors
import org.mozilla.fenix.theme.FirefoxTheme
/**
* Renders the app default image placeholder while the image is still getting loaded.
@ -68,20 +67,17 @@ internal fun DefaultImagePlaceholder(
modifier: Modifier,
contentDescription: String? = null
) {
val color = when (isSystemInDarkTheme()) {
true -> PhotonColors.DarkGrey30
false -> PhotonColors.LightGrey30
}
Image(ColorPainter(color), contentDescription, modifier)
Image(ColorPainter(FirefoxTheme.colors.layer2), contentDescription, modifier)
}
@Composable
@Preview
private fun DefaultImagePlaceholderPreview() {
DefaultImagePlaceholder(
Modifier
.size(200.dp, 100.dp)
.clip(RoundedCornerShape(8.dp))
)
FirefoxTheme {
DefaultImagePlaceholder(
Modifier
.size(200.dp, 100.dp)
.clip(RoundedCornerShape(8.dp))
)
}
}