From 904a790d0c39e58b80e2977d7ce32defcf01a760 Mon Sep 17 00:00:00 2001 From: eneim <1776230+eneim@users.noreply.github.com> Date: Sat, 29 May 2021 18:20:53 +0900 Subject: [PATCH] Fix: constrast, constast, etc --> contrast --- .../src/main/java/com/example/jetcaster/ui/home/Home.kt | 8 ++++---- .../src/main/java/com/example/jetcaster/util/Colors.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt index 88fea0a188..c98ae284a4 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -69,7 +69,7 @@ import com.example.jetcaster.ui.theme.JetcasterTheme import com.example.jetcaster.ui.theme.Keyline1 import com.example.jetcaster.util.DynamicThemePrimaryColorsFromImage import com.example.jetcaster.util.ToggleFollowPodcastIconButton -import com.example.jetcaster.util.constrastAgainst +import com.example.jetcaster.util.contrastAgainst import com.example.jetcaster.util.quantityStringResource import com.example.jetcaster.util.rememberDominantColorState import com.example.jetcaster.util.verticalGradientScrim @@ -149,11 +149,11 @@ fun HomeAppBar( } /** - * This is the minimum amount of calculated constrast for a color to be used on top of the + * This is the minimum amount of calculated contrast for a color to be used on top of the * surface color. These values are defined within the WCAG AA guidelines, and we use a value of * 3:1 which is the minimum for user-interface components. */ -private const val MinConstastOfPrimaryVsSurface = 3f +private const val MinContrastOfPrimaryVsSurface = 3f @OptIn(ExperimentalPagerApi::class) // HorizontalPager is experimental @Composable @@ -173,7 +173,7 @@ fun HomeContent( val surfaceColor = MaterialTheme.colors.surface val dominantColorState = rememberDominantColorState { color -> // We want a color which has sufficient contrast against the surface color - color.constrastAgainst(surfaceColor) >= MinConstastOfPrimaryVsSurface + color.contrastAgainst(surfaceColor) >= MinContrastOfPrimaryVsSurface } DynamicThemePrimaryColorsFromImage(dominantColorState) { diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt index 25a86a300b..96d8df128a 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.graphics.luminance import kotlin.math.max import kotlin.math.min -fun Color.constrastAgainst(background: Color): Float { +fun Color.contrastAgainst(background: Color): Float { val fg = if (alpha < 1f) compositeOver(background) else this val fgLuminance = fg.luminance() + 0.05f