fix(settings): clarify active saved profile contrast and border (#708)
Fix active saved profile visibility in Catppuccin light mode and Monochrome light/dark modes by adjusting primaryContainer contrast and adding a primary border stroke.
This commit is contained in:
3 files changed
+34
-7
No files matched your search
@@ -49,8 +49,8 @@ val CatppuccinLightColorScheme =
|
|||||||
lightColorScheme(
|
lightColorScheme(
|
||||||
primary = Color(0xFF8839EF), // Mauve
|
primary = Color(0xFF8839EF), // Mauve
|
||||||
onPrimary = Color(0xFFEFF1F5), // Base
|
onPrimary = Color(0xFFEFF1F5), // Base
|
||||||
primaryContainer = Color(0xFFCCD0DA), // Surface 0
|
primaryContainer = Color(0xFFE6CAFA), // Light Mauve Container
|
||||||
onPrimaryContainer = Color(0xFF4C4F69), // Text
|
onPrimaryContainer = Color(0xFF380075),
|
||||||
inversePrimary = Color(0xFFCBA6F7), // Mocha Mauve
|
inversePrimary = Color(0xFFCBA6F7), // Mocha Mauve
|
||||||
secondary = Color(0xFF1E66F5), // Blue
|
secondary = Color(0xFF1E66F5), // Blue
|
||||||
onSecondary = Color(0xFFEFF1F5), // Base
|
onSecondary = Color(0xFFEFF1F5), // Base
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ val MonochromeDarkColorScheme =
|
|||||||
darkColorScheme(
|
darkColorScheme(
|
||||||
primary = Color.White,
|
primary = Color.White,
|
||||||
onPrimary = Color.Black,
|
onPrimary = Color.Black,
|
||||||
primaryContainer = Color(0xFF2B2B2B),
|
primaryContainer = Color(0xFF404040),
|
||||||
onPrimaryContainer = Color.White,
|
onPrimaryContainer = Color.White,
|
||||||
inversePrimary = Color(0xFF121212),
|
inversePrimary = Color(0xFF121212),
|
||||||
secondary = Color(0xFFB0B0B0),
|
secondary = Color(0xFFB0B0B0),
|
||||||
@@ -49,7 +49,7 @@ val MonochromeLightColorScheme =
|
|||||||
lightColorScheme(
|
lightColorScheme(
|
||||||
primary = Color.Black,
|
primary = Color.Black,
|
||||||
onPrimary = Color.White,
|
onPrimary = Color.White,
|
||||||
primaryContainer = Color(0xFFE0E0E0),
|
primaryContainer = Color(0xFFC8C8C8),
|
||||||
onPrimaryContainer = Color.Black,
|
onPrimaryContainer = Color.Black,
|
||||||
inversePrimary = Color(0xFFE0E0E0),
|
inversePrimary = Color(0xFFE0E0E0),
|
||||||
secondary = Color(0xFF4A4A4A),
|
secondary = Color(0xFF4A4A4A),
|
||||||
|
|||||||
+30
-3
@@ -3,6 +3,7 @@ package com.m57.hermescontrol.ui.settings.components
|
|||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
|
import androidx.compose.foundation.BorderStroke
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -69,11 +70,17 @@ internal fun ConnectionSection(
|
|||||||
CardDefaults.cardColors(
|
CardDefaults.cardColors(
|
||||||
containerColor =
|
containerColor =
|
||||||
if (isActive) {
|
if (isActive) {
|
||||||
MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)
|
MaterialTheme.colorScheme.primaryContainer
|
||||||
} else {
|
} else {
|
||||||
MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
|
MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
border =
|
||||||
|
if (isActive) {
|
||||||
|
BorderStroke(1.5.dp, MaterialTheme.colorScheme.primary)
|
||||||
|
} else {
|
||||||
|
BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f))
|
||||||
|
},
|
||||||
elevation = CardDefaults.cardElevation(0.dp),
|
elevation = CardDefaults.cardElevation(0.dp),
|
||||||
) {
|
) {
|
||||||
Row(
|
Row(
|
||||||
@@ -83,13 +90,27 @@ internal fun ConnectionSection(
|
|||||||
Column(modifier = Modifier.weight(1f)) {
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
Text(
|
Text(
|
||||||
text = profile.name,
|
text = profile.name,
|
||||||
style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
|
style =
|
||||||
|
MaterialTheme.typography.bodyMedium.copy(
|
||||||
|
fontWeight = if (isActive) FontWeight.Bold else FontWeight.Medium,
|
||||||
|
),
|
||||||
|
color =
|
||||||
|
if (isActive) {
|
||||||
|
MaterialTheme.colorScheme.onPrimaryContainer
|
||||||
|
} else {
|
||||||
|
MaterialTheme.colorScheme.onSurface
|
||||||
|
},
|
||||||
)
|
)
|
||||||
Text(
|
Text(
|
||||||
text = profile.resolveBaseUrl(state.baseUrl),
|
text = profile.resolveBaseUrl(state.baseUrl),
|
||||||
style =
|
style =
|
||||||
MaterialTheme.typography.bodySmall.copy(
|
MaterialTheme.typography.bodySmall.copy(
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
color =
|
||||||
|
if (isActive) {
|
||||||
|
MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
|
||||||
|
} else {
|
||||||
|
MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -101,6 +122,12 @@ internal fun ConnectionSection(
|
|||||||
imageVector = Icons.Filled.Edit,
|
imageVector = Icons.Filled.Edit,
|
||||||
contentDescription = stringResource(R.string.settings_action_edit_profile),
|
contentDescription = stringResource(R.string.settings_action_edit_profile),
|
||||||
modifier = Modifier.size(18.dp),
|
modifier = Modifier.size(18.dp),
|
||||||
|
tint =
|
||||||
|
if (isActive) {
|
||||||
|
MaterialTheme.colorScheme.onPrimaryContainer
|
||||||
|
} else {
|
||||||
|
MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
IconButton(
|
IconButton(
|
||||||
|
|||||||
Reference in new issue
Block a user