diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/common/button/MediaPlayButton.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/common/button/MediaPlayButton.kt deleted file mode 100644 index b7011c4d..00000000 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/button/MediaPlayButton.kt +++ /dev/null @@ -1,73 +0,0 @@ -package hu.bbara.purefin.ui.common.button - -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PlayArrow -import androidx.compose.material3.Icon -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.TextUnit -import androidx.compose.ui.unit.TextUnitType -import androidx.compose.ui.unit.dp - -@Composable -fun MediaPlayButton( - backgroundColor: Color, - foregroundColor: Color, - text: String = "Play", - subText: String? = null, - size: Dp, - onClick: () -> Unit, - modifier: Modifier = Modifier -) { - Row( - modifier = modifier - .height(size) - .clip(CircleShape) - .background(backgroundColor) - .padding(start = 16.dp, end = 32.dp) - .clickable { onClick() }, - horizontalArrangement = Arrangement.SpaceEvenly, - verticalAlignment = Alignment.CenterVertically, - ) { - Icon( - imageVector = Icons.Filled.PlayArrow, - contentDescription = "Play", - tint = foregroundColor, - modifier = Modifier.size(42.dp) - ) - Column() { - Text( - text = text, - color = foregroundColor, - fontSize = TextUnit( - value = 16f, - type = TextUnitType.Sp - ) - ) - subText?.let { - Text( - text = subText, - color = foregroundColor.copy(alpha = 0.7f), - fontSize = TextUnit( - value = 14f, - type = TextUnitType.Sp - ) - ) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt index 784ecb67..e136c048 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt @@ -6,24 +6,24 @@ private fun hslColor(hue: Float, saturation: Float, lightness: Float): Color = Color.hsl(hue = hue, saturation = saturation / 100f, lightness = lightness / 100f) -val primaryDark = hslColor(255f, 70f, 70f) -val onPrimaryDark = hslColor(255f, 60f, 12f) -val primaryContainerDark = hslColor(255f, 70f, 70f) -val onPrimaryContainerDark = hslColor(255f, 60f, 12f) -val secondaryDark = hslColor(255f, 40f, 40f) -val onSecondaryDark = hslColor(255f, 40f, 88f) -val secondaryContainerDark = hslColor(255f, 40f, 40f) -val onSecondaryContainerDark = hslColor(255f, 40f, 88f) -val tertiaryDark = hslColor(255f, 15f, 65f) -val onTertiaryDark = hslColor(255f, 15f, 12f) -val tertiaryContainerDark = hslColor(255f, 15f, 65.0f) -val onTertiaryContainerDark = hslColor(255f, 15f, 12f) +val primaryDark = hslColor(260f, 85f, 60f) +val onPrimaryDark = hslColor(255f, 0f, 100f) +val secondaryDark = hslColor(255f, 0f, 40f) +val onSecondaryDark = hslColor(255f, 10f, 88f) +val tertiaryDark = hslColor(255f, 0f, 65f) +val onTertiaryDark = hslColor(255f, 0f, 12f) val errorDark = hslColor(7f, 100f, 84f) val onErrorDark = hslColor(357f, 100f, 21f) val errorContainerDark = hslColor(355f, 100f, 29f) val onErrorContainerDark = hslColor(6f, 100f, 92f) -val backgroundDark = hslColor(255f, 60f, 8f) +val backgroundDark = hslColor(255f, 10f, 8f) val onBackgroundDark = hslColor(255f, 60f, 94f) -val surfaceDark = hslColor(255f, 40f, 12f) -val onSurfaceDark = hslColor(255f, 40f, 92f) -val surfaceContainerDark = hslColor(255f, 40f, 12f) +val surfaceDark = hslColor(255f, 10f, 16f) +val onSurfaceDark = hslColor(255f, 10f, 92f) +val primaryContainerDark = primaryDark +val onPrimaryContainerDark = onPrimaryDark +val secondaryContainerDark = secondaryDark +val onSecondaryContainerDark = onSecondaryDark +val tertiaryContainerDark = tertiaryDark +val onTertiaryContainerDark = onTertiaryDark +val surfaceContainerDark = surfaceDark diff --git a/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt index a1bd8c26..a89a6476 100644 --- a/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt +++ b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt @@ -59,7 +59,7 @@ fun MediaResumeButton( ) { val scheme = MaterialTheme.colorScheme val primaryColor = scheme.primary - val onPrimaryColor = scheme.onPrimary + val defaultColor = scheme.surface val shape = RoundedCornerShape(50) var isFocused by remember { mutableStateOf(false) } val scale by animateFloatAsState( @@ -93,7 +93,7 @@ fun MediaResumeButton( Box( modifier = Modifier .fillMaxSize() - .background(onPrimaryColor), + .background(defaultColor), contentAlignment = Alignment.Center ) { ResumeButtonContent( @@ -123,7 +123,7 @@ fun MediaResumeButton( ) { ResumeButtonContent( text = text, - color = onPrimaryColor, + color = defaultColor, textSize = textSize, iconSize = iconSize )