Skip to content

style(ui): Refine theming and styling across various UI components #599

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

Merged
haiphucnguyen merged 1 commit into from
Aug 4, 2026
Merged

style(ui): Refine theming and styling across various UI components #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions desktop-shared/src/main/kotlin/io/askimo/ui/discover/DiscoverView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private fun statCardsSection(
statCard(
label = stringResource("discover.stat.chats"),
value = totalChats?.let { LocalizationManager.formatNumber(it) } ?: "—",
icon = { Icon(Icons.Default.ChatBubbleOutline, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSecondaryContainer) },
icon = { Icon(Icons.Default.ChatBubbleOutline, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant) },
onClick = onNavigateToSessions,
modifier = Modifier.weight(1f),
)
Expand All @@ -284,7 +284,7 @@ private fun statCardsSection(
statCard(
label = stringResource("discover.stat.projects"),
value = totalProjects?.let { LocalizationManager.formatNumber(it) } ?: "—",
icon = { Icon(Icons.Default.FolderOpen, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSecondaryContainer) },
icon = { Icon(Icons.Default.FolderOpen, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant) },
onClick = onNavigateToProjects,
modifier = Modifier.weight(1f),
)
Expand All @@ -294,7 +294,7 @@ private fun statCardsSection(
statCard(
label = stringResource("discover.stat.mcp"),
value = LocalizationManager.formatNumber(totalMcpServers),
icon = { Icon(Icons.Default.Settings, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSecondaryContainer) },
icon = { Icon(Icons.Default.Settings, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant) },
onClick = onNavigateToMcpSettings,
modifier = Modifier.weight(1f),
)
Expand All @@ -304,7 +304,7 @@ private fun statCardsSection(
statCard(
label = stringResource("discover.stat.plans"),
value = totalPlans?.let { LocalizationManager.formatNumber(it) } ?: "—",
icon = { Icon(Icons.Default.PlayCircle, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSecondaryContainer) },
icon = { Icon(Icons.Default.PlayCircle, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant) },
onClick = onNavigateToPlans,
modifier = Modifier.weight(1f),
)
Expand All @@ -314,7 +314,7 @@ private fun statCardsSection(
statCard(
label = stringResource("discover.stat.skills"),
value = totalSkills?.let { LocalizationManager.formatNumber(it) } ?: "—",
icon = { Icon(Icons.Default.Extension, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSecondaryContainer) },
icon = { Icon(Icons.Default.Extension, contentDescription = null, modifier = Modifier.size(24.dp), tint = MaterialTheme.colorScheme.onSurfaceVariant) },
onClick = onNavigateToSkills,
modifier = Modifier.weight(1f),
)
Expand All @@ -330,7 +330,7 @@ private fun statCard(
modifier: Modifier = Modifier,
onClick: (() -> Unit)? = null,
) {
clickableCard(onClick = onClick, modifier = modifier, colors = AppComponents.secondaryCardColors()) {
clickableCard(onClick = onClick, modifier = modifier) {
Column(
modifier = Modifier.fillMaxWidth().padding(Spacing.large),
verticalArrangement = Arrangement.spacedBy(Spacing.medium),
Expand All @@ -339,12 +339,10 @@ private fun statCard(
Text(
text = value,
style = AppTextStyles.pageTitle,
color = MaterialTheme.colorScheme.onSecondaryContainer,
)
Text(
text = label,
style = AppTextStyles.body,
color = MaterialTheme.colorScheme.onSecondaryContainer.copy(alpha = 0.82f),
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions desktop-shared/src/main/kotlin/io/askimo/ui/session/ExportSessionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private fun formatCard(
imageVector = icon,
contentDescription = null,
tint = if (isSelected) {
MaterialTheme.colorScheme.onSurface
MaterialTheme.colorScheme.onPrimaryContainer
} else {
MaterialTheme.colorScheme.onSurfaceVariant
},
Expand Down Expand Up @@ -308,7 +308,7 @@ private fun formatCard(
Icon(
imageVector = Icons.Default.CheckCircle,
contentDescription = "Selected",
tint = AppTextStyles.primaryContent,
tint = MaterialTheme.colorScheme.onPrimaryContainer,
modifier = Modifier.size(24.dp),
)
}
Expand Down
34 changes: 29 additions & 5 deletions desktop-shared/src/main/kotlin/io/askimo/ui/shell/NavigationSidebar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,13 @@ private fun expandedNavigationSidebar(
) {
NavigationDrawerItem(
icon = { Icon(Icons.Default.FolderOpen, contentDescription = null) },
label = { Text(stringResource("project.title"), style = AppTextStyles.groupTitle) },
label = {
Text(
stringResource("project.title"),
style = AppTextStyles.groupTitle,
color = if (isProjectsSelected) MaterialTheme.colorScheme.onPrimaryContainer else AppTextStyles.primaryContent,
)
},
selected = isProjectsSelected,
onClick = onNavigateToProjects,
badge = {
Expand All @@ -361,7 +367,7 @@ private fun expandedNavigationSidebar(
Icon(
Icons.Default.Add,
contentDescription = stringResource("project.new.dialog.title"),
tint = AppTextStyles.secondaryContent,
tint = if (isProjectsSelected) MaterialTheme.colorScheme.onPrimaryContainer else AppTextStyles.secondaryContent,
modifier = Modifier.size((18 * fontScale).dp),
)
}
Expand All @@ -379,7 +385,13 @@ private fun expandedNavigationSidebar(
if (showPlansInSidebar) {
NavigationDrawerItem(
icon = { Icon(Icons.Default.PlayCircle, contentDescription = null) },
label = { Text(stringResource("plans.nav.title"), style = AppTextStyles.groupTitle) },
label = {
Text(
stringResource("plans.nav.title"),
style = AppTextStyles.groupTitle,
color = if (isPlansSelected) MaterialTheme.colorScheme.onPrimaryContainer else AppTextStyles.primaryContent,
)
},
selected = isPlansSelected,
onClick = onNavigateToPlans,
modifier = Modifier
Expand All @@ -394,7 +406,13 @@ private fun expandedNavigationSidebar(
if (showSkillsInSidebar) {
NavigationDrawerItem(
icon = { Icon(Icons.Default.Extension, contentDescription = null) },
label = { Text(stringResource("skills.nav.title"), style = AppTextStyles.groupTitle) },
label = {
Text(
stringResource("skills.nav.title"),
style = AppTextStyles.groupTitle,
color = if (isSkillsSelected) MaterialTheme.colorScheme.onPrimaryContainer else AppTextStyles.primaryContent,
)
},
selected = isSkillsSelected,
onClick = onNavigateToSkills,
modifier = Modifier
Expand Down Expand Up @@ -426,7 +444,13 @@ private fun expandedNavigationSidebar(
// Sessions header (collapsible)
NavigationDrawerItem(
icon = { Icon(Icons.Default.History, contentDescription = null) },
label = { Text(stringResource("chat.sessions"), style = AppTextStyles.groupTitle) },
label = {
Text(
stringResource("chat.sessions"),
style = AppTextStyles.groupTitle,
color = if (isSessionsSelected) MaterialTheme.colorScheme.onPrimaryContainer else AppTextStyles.primaryContent,
)
},
selected = isSessionsSelected,
onClick = onToggleSessions,
badge = {
Expand Down