Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ 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.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -85,7 +84,7 @@ fun AboutPageItemComp(
if (descText != null) {
Text(
text = descText,
color = Color.Gray,
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(top = 4.dp),
)
Expand All @@ -98,7 +97,7 @@ fun AboutPageItemComp(
.padding(start = 6.dp)
.size(24.dp),
contentDescription = stringResource(R.string.i18n_app_accessibility_trailing_icon),
tint = Color.Gray,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ 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.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
Expand Down Expand Up @@ -81,7 +80,7 @@ fun ClickableItemComp(
if (!desc.isNullOrEmpty()) {
Text(
text = desc,
color = Color.Gray,
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(top = 4.dp),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import be.scri.ui.screens.Alpha

/**
* A composable component that displays a switch alongside a title and description.
Expand Down Expand Up @@ -104,7 +103,7 @@ fun SwitchableItemComp(
desc?.let { description ->
Text(
text = description,
color = Color.Gray.copy(alpha = Alpha.MEDIUM),
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(top = 4.dp),
)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/be/scri/ui/theme/Colors.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ val theme_light_switch_selector_color = Color(color = 0xFFFEDE9E)
val theme_light_unchecked_switch_selector_color = Color(color = 0xFFEEEEEE)
val theme_light_corner_button_color = Color(color = 0xFFFDAD0D)
val theme_light_success_color = Color(color = 0xFF9BC53D)
val theme_light_caption_color = Color(color = 0xE558564B)

val theme_dark_card_view_color = Color(color = 0xFF000000)
val theme_dark_button_color = Color(color = 0xFFD17B0F)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/be/scri/ui/theme/ScribeTheme.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ private val LightColors =
outlineVariant = theme_light_unchecked_switch_selector_color,
surfaceContainer = theme_light_corner_button_color,
surfaceVariant = theme_light_success_color,
onSurfaceVariant = theme_light_caption_color,
)

private val DarkColors =
Expand Down
Loading