github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-01 02:06:52 -05:00
Code Issues 1.8k Packages Projects Releases 126 Wiki Activity

BIT-1204: Improve avatar color visiblity (#270)

Browse Source
This commit is contained in:
Brian Yencho
2023-11-22 09:40:21 -06:00
committed by GitHub
parent 69bccf469f
commit 1c2413d4dc
6 changed files with 132 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/test/java/com/x8bit/bitwarden/data/platform/base/util/ColorExtensionsTest.kt Normal file
View File

@@ -0,0 +1,61 @@
package com.x8bit.bitwarden.data.platform.base.util
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.graphics.Color
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.isLightOverlayRequired
import com.x8bit.bitwarden.ui.platform.base.util.toSafeOverlayColor
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
class ColorExtensionsTest : BaseComposeTest() {
@Suppress("MaxLineLength")
@Test
fun `isLightOverlayRequired for a color with luminance below the light threshold should return true`() {
assertTrue(Color.Blue.isLightOverlayRequired)
}
@Suppress("MaxLineLength")
@Test
fun `isLightOverlayRequired for a color with luminance above the light threshold should return false`() {
assertFalse(Color.Yellow.isLightOverlayRequired)
}
@Test
fun `toSafeOverlayColor for a dark color in light mode should use the surface color`() =
runTestWithTheme(isDarkTheme = false) {
assertEquals(
MaterialTheme.colorScheme.surface,
Color.Blue.toSafeOverlayColor(),
)
}
@Test
fun `toSafeOverlayColor for a dark color in dark mode should use the onSurface color`() =
runTestWithTheme(isDarkTheme = true) {
assertEquals(
MaterialTheme.colorScheme.onSurface,
Color.Blue.toSafeOverlayColor(),
)
}
@Test
fun `toSafeOverlayColor for a light color in light mode should use the onSurface color`() =
runTestWithTheme(isDarkTheme = false) {
assertEquals(
MaterialTheme.colorScheme.onSurface,
Color.Yellow.toSafeOverlayColor(),
)
}
@Test
fun `toSafeOverlayColor for a light color in dark mode should use the surface color`() =
runTestWithTheme(isDarkTheme = true) {
assertEquals(
MaterialTheme.colorScheme.surface,
Color.Yellow.toSafeOverlayColor(),
)
}
}

19
app/src/test/java/com/x8bit/bitwarden/ui/platform/base/BaseComposeTest.kt
View File

@@ -1,6 +1,8 @@
package com.x8bit.bitwarden.ui.platform.base
import androidx.compose.runtime.Composable
import androidx.compose.ui.test.junit4.createComposeRule
import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
import dagger.hilt.android.testing.HiltTestApplication
import org.junit.Rule
import org.junit.runner.RunWith
@@ -24,4 +26,21 @@ abstract class BaseComposeTest {
init {
ShadowLog.stream = System.out
}
/**
* Helper for testing a basic Composable function that only requires a Composable environment
* with the [BitwardenTheme].
*/
protected fun runTestWithTheme(
isDarkTheme: Boolean,
test: @Composable () -> Unit,
) {
composeTestRule.setContent {
BitwardenTheme(
darkTheme = isDarkTheme,
) {
test()
}
}
}
}