Skip to content

fix: update secondary text color tokens #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edschema wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

fix: update secondary text color tokens #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cf9199
fix: add secondary color theme tokens
edschema May 27, 2026
2b76ed3
fix: retokenize placeholder colors
edschema May 27, 2026
8ab0f65
fix: retokenize secondary text colors
edschema May 27, 2026
ec9ba95
fix: retokenize empty state icon colors
edschema May 27, 2026
32b7dbe
fix: retokenize secondary content colors
edschema May 27, 2026
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
2 changes: 1 addition & 1 deletion ...org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private fun StorageBar(
freeSpace.toFileSize(1, false)
),
style = MaterialTheme.appTypography.labelSmall,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
modifier = Modifier.weight(1f)
)
Text(
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fun DownloadDialogItem(
Text(
text = downloadDialogItem.size.toFileSize(1, false),
style = MaterialTheme.appTypography.bodySmall,
color = MaterialTheme.appColors.textFieldHint
color = MaterialTheme.appColors.textSecondary
)
}
}
6 changes: 3 additions & 3 deletions core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ fun SearchBar(
.testTag("txt_search_placeholder")
.fillMaxWidth(),
text = label,
color = MaterialTheme.appColors.textSecondary,
color = MaterialTheme.appColors.textFieldHint,
style = MaterialTheme.appTypography.bodyMedium
)
},
Expand Down Expand Up @@ -367,7 +367,7 @@ fun SearchBarStateless(
Text(
modifier = Modifier.fillMaxWidth(),
text = label,
color = MaterialTheme.appColors.textSecondary,
color = MaterialTheme.appColors.textFieldHint,
style = MaterialTheme.appTypography.bodyMedium
)
},
Expand Down Expand Up @@ -1126,7 +1126,7 @@ fun NoContentScreen(message: String, icon: Painter) {
),
painter = icon,
contentDescription = null,
tint = MaterialTheme.appColors.progressBarBackgroundColor,
tint = MaterialTheme.appColors.emptyStateIconColor,
)
Spacer(Modifier.height(24.dp))
Text(
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ data class AppColors(
val textPrimaryLight: Color,
val textHyperLink: Color,
val textSecondary: Color,
val emptyStateIconColor: Color,
val secondaryContentColor: Color,
val textDark: Color,
val textAccent: Color,
val textWarning: Color,
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/org/openedx/core/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ private val DarkColorPalette = AppColors(
textPrimaryVariant = dark_text_primary_variant,
textPrimaryLight = dark_text_primary_light,
textSecondary = dark_text_secondary,
emptyStateIconColor = dark_empty_state_icon_color,
secondaryContentColor = dark_secondary_content_color,
textDark = dark_text_dark,
textAccent = dark_text_accent,
textWarning = dark_text_warning,
Expand Down Expand Up @@ -142,6 +144,8 @@ private val LightColorPalette = AppColors(
textPrimaryVariant = light_text_primary_variant,
textPrimaryLight = light_text_primary_light,
textSecondary = light_text_secondary,
emptyStateIconColor = light_empty_state_icon_color,
secondaryContentColor = light_secondary_content_color,
textDark = light_text_dark,
textAccent = light_text_accent,
textWarning = light_text_warning,
Expand Down
8 changes: 6 additions & 2 deletions core/src/openedx/org/openedx/core/ui/theme/Colors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ val light_info_variant = light_primary
val light_text_primary = Color(0xFF212121)
val light_text_primary_variant = Color(0xFF3D4964)
val light_text_primary_light = light_text_primary
val light_text_secondary = Color(0xFFB3B3B3)
val light_text_secondary = Color(0xFF3D4964)
val light_empty_state_icon_color = Color(0xFF3D4964)
val light_secondary_content_color = Color(0xFF3D4964)
val light_text_dark = Color(0xFF19212F)
val light_text_accent = light_primary
val light_text_warning = Color(0xFF19212F)
Expand Down Expand Up @@ -93,7 +95,9 @@ val dark_onError = Color.Black
val dark_text_primary = Color.White
val dark_text_primary_light = dark_text_primary
val dark_text_primary_variant = Color.White
val dark_text_secondary = Color(0xFFB3B3B3)
val dark_text_secondary = Color(0xFF8E9BAE)
val dark_empty_state_icon_color = Color(0xFF8E9BAE)
val dark_secondary_content_color = Color(0xFF8E9BAE)
val dark_text_dark = Color.White
val dark_text_accent = Color(0xFF879FF5)
val dark_text_warning = Color(0xFF19212F)
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fun ContentTabEmptyState(
.size(120.dp),
painter = painterResource(R.drawable.course_ic_warning),
contentDescription = null,
tint = MaterialTheme.appColors.textFieldHint
tint = MaterialTheme.appColors.emptyStateIconColor
)
Spacer(Modifier.height(24.dp))
}
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private fun HandoutsItem(
Text(
text = description,
style = MaterialTheme.appTypography.labelSmall,
color = MaterialTheme.appColors.textFieldHint
color = MaterialTheme.appColors.textSecondary
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,13 @@ private fun NoDownloadableBlocksProgress(
Text(
text = stringResource(R.string.core_0mb),
style = MaterialTheme.appTypography.titleLarge,
color = MaterialTheme.appColors.textFieldHint
color = MaterialTheme.appColors.textSecondary
)
Spacer(modifier = Modifier.height(4.dp))
IconText(
text = stringResource(R.string.core_available_to_download),
icon = Icons.Outlined.CloudDownload,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.secondaryContentColor,
textStyle = MaterialTheme.appTypography.labelLarge
)
Spacer(modifier = Modifier.height(20.dp))
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ fun CourseItem(
.padding(horizontal = 8.dp)
.padding(top = 4.dp),
style = MaterialTheme.appTypography.labelMedium,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
overflow = TextOverflow.Ellipsis,
minLines = 1,
maxLines = 2,
Expand Down Expand Up @@ -519,7 +519,7 @@ fun EmptyState(
) {
Icon(
painter = painterResource(id = R.drawable.core_ic_book),
tint = MaterialTheme.appColors.textFieldBorder,
tint = MaterialTheme.appColors.emptyStateIconColor,
contentDescription = null
)
Spacer(Modifier.height(4.dp))
Expand Down
6 changes: 3 additions & 3 deletions dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ private fun PrimaryCourseTitle(
modifier = Modifier.fillMaxWidth(),
text = primaryCourse.course.org,
style = MaterialTheme.appTypography.labelMedium,
color = MaterialTheme.appColors.textFieldHint
color = MaterialTheme.appColors.textSecondary
)
Text(
modifier = Modifier
Expand All @@ -828,7 +828,7 @@ private fun PrimaryCourseTitle(
.fillMaxWidth()
.padding(top = 4.dp),
style = MaterialTheme.appTypography.labelMedium,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
text = TimeUtils.getCourseFormattedDate(
LocalContext.current,
Date(),
Expand Down Expand Up @@ -876,7 +876,7 @@ private fun NoCoursesInfo(
) {
Icon(
painter = painterResource(id = CoreR.drawable.core_ic_book),
tint = MaterialTheme.appColors.textFieldBorder,
tint = MaterialTheme.appColors.emptyStateIconColor,
contentDescription = null
)
Spacer(Modifier.height(4.dp))
Expand Down
6 changes: 3 additions & 3 deletions dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ private fun CourseItem(
Text(
modifier = Modifier.testTag("txt_course_org"),
text = enrolledCourse.course.org,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
style = MaterialTheme.appTypography.labelMedium
)
Spacer(modifier = Modifier.height(4.dp))
Expand Down Expand Up @@ -432,7 +432,7 @@ private fun CourseItem(
enrolledCourse.course.startType,
enrolledCourse.course.startDisplay
),
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
style = MaterialTheme.appTypography.labelMedium
)
Box(
Expand Down Expand Up @@ -475,7 +475,7 @@ private fun EmptyState() {
Icon(
painter = painterResource(id = R.drawable.dashboard_ic_empty),
contentDescription = null,
tint = MaterialTheme.appColors.textFieldBorder
tint = MaterialTheme.appColors.emptyStateIconColor
)
Spacer(Modifier.height(16.dp))
Text(
Expand Down
2 changes: 1 addition & 1 deletion dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ private fun EmptyState(
Icon(
modifier = Modifier.size(100.dp),
imageVector = Icons.Outlined.CalendarMonth,
tint = MaterialTheme.appColors.textFieldBorder,
tint = MaterialTheme.appColors.emptyStateIconColor,
contentDescription = null
)
Spacer(Modifier.height(4.dp))
Expand Down
2 changes: 1 addition & 1 deletion discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ fun DiscoveryCourseItem(
.testTag("txt_course_org")
.padding(top = 12.dp),
text = course.org,
color = MaterialTheme.appColors.textFieldHint,
color = MaterialTheme.appColors.textSecondary,
style = MaterialTheme.appTypography.labelMedium
)
Text(
Expand Down
2 changes: 1 addition & 1 deletion downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ private fun EmptyState(
) {
Icon(
painter = painterResource(id = org.openedx.core.R.drawable.core_ic_book),
tint = MaterialTheme.appColors.textFieldBorder,
tint = MaterialTheme.appColors.emptyStateIconColor,
contentDescription = null
)
Spacer(Modifier.height(4.dp))
Expand Down
2 changes: 1 addition & 1 deletion profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fun CalendarSyncSection(
Text(
text = stringResource(id = calendarSyncState.title),
style = MaterialTheme.appTypography.labelSmall,
color = MaterialTheme.appColors.textFieldHint
color = MaterialTheme.appColors.textSecondary
)
}
if (calendarSyncState == CalendarSyncState.SYNCHRONIZATION) {
Expand Down
2 changes: 1 addition & 1 deletion profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ private fun EmptyListState(
Icon(
modifier = Modifier.size(96.dp),
painter = painterResource(id = coreR.drawable.core_ic_book),
tint = MaterialTheme.appColors.divider,
tint = MaterialTheme.appColors.emptyStateIconColor,
contentDescription = null
)
Text(
Expand Down
Loading