Skip to content

Polish Mast project home UI #33

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
udaychandra merged 1 commit into from
May 7, 2026
Merged

Polish Mast project home UI #33

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
164 changes: 74 additions & 90 deletions crates/onboarding/src/basics_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,12 @@ use crate::{
theme_preview::{ThemePreviewStyle, ThemePreviewTile},
};

const LIGHT_THEMES: [&str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
const DARK_THEMES: [&str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
const FAMILY_NAMES: [SharedString; 3] = [
SharedString::new_static("One"),
SharedString::new_static("Ayu"),
SharedString::new_static("Gruvbox"),
];
const MAST_LIGHT_THEME: &str = "Mast Light";
const MAST_DARK_THEME: &str = "Mast Dark";

fn get_theme_family_themes(theme_name: &str) -> Option<(&'static str, &'static str)> {
for i in 0..LIGHT_THEMES.len() {
if LIGHT_THEMES[i] == theme_name || DARK_THEMES[i] == theme_name {
return Some((LIGHT_THEMES[i], DARK_THEMES[i]));
}
if theme_name == MAST_LIGHT_THEME || theme_name == MAST_DARK_THEME {
return Some((MAST_LIGHT_THEME, MAST_DARK_THEME));
}
None
}
Expand Down Expand Up @@ -94,14 +87,14 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
h_flex()
.gap_2()
.justify_between()
.children(render_theme_previews(tab_index, &theme_selection, cx)),
.child(render_theme_preview(tab_index, &theme_selection, cx)),
);

fn render_theme_previews(
fn render_theme_preview(
tab_index: &mut isize,
theme_selection: &ThemeSelection,
cx: &mut App,
) -> [impl IntoElement; 3] {
) -> impl IntoElement {
let system_appearance = SystemAppearance::global(cx);
let theme_registry = ThemeRegistry::global(cx);

Expand All @@ -118,84 +111,75 @@ fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement
ThemeAppearanceMode::System => *system_appearance,
};
let current_theme_name: SharedString = theme_selection.name(appearance).0.into();

let theme_names = match appearance {
Appearance::Light => LIGHT_THEMES,
Appearance::Dark => DARK_THEMES,
let light = theme_registry.get(MAST_LIGHT_THEME).unwrap();
let dark = theme_registry.get(MAST_DARK_THEME).unwrap();
let theme = match appearance {
Appearance::Light => light.clone(),
Appearance::Dark => dark.clone(),
};
let is_selected =
current_theme_name == MAST_LIGHT_THEME || current_theme_name == MAST_DARK_THEME;
let colors = cx.theme().colors();

let themes = theme_names.map(|theme| theme_registry.get(theme).unwrap());

[0, 1, 2].map(|index| {
let theme = &themes[index];
let is_selected = theme.name == current_theme_name;
let name = theme.name.clone();
let colors = cx.theme().colors();

v_flex()
.w_full()
.items_center()
.gap_1()
.child(
h_flex()
.id(name)
.relative()
.w_full()
.border_2()
.border_color(colors.border_transparent)
.rounded(ThemePreviewTile::ROOT_RADIUS)
.map(|this| {
if is_selected {
this.border_color(colors.border_selected)
} else {
this.opacity(0.8).hover(|s| s.border_color(colors.border))
}
})
.tab_index({
*tab_index += 1;
*tab_index - 1
})
.focus(|mut style| {
style.border_color = Some(colors.border_focused);
style
})
.on_click({
let theme_name = theme.name.clone();
let current_theme_name = current_theme_name.clone();

move |_, _, cx| {
write_theme_change(theme_name.clone(), theme_mode, cx);
telemetry::event!(
"Welcome Theme Changed",
from = current_theme_name,
to = theme_name
);
}
})
.map(|this| {
if theme_mode == ThemeAppearanceMode::System {
let (light, dark) = (
theme_registry.get(LIGHT_THEMES[index]).unwrap(),
theme_registry.get(DARK_THEMES[index]).unwrap(),
);
this.child(
ThemePreviewTile::new(light, theme_seed)
.style(ThemePreviewStyle::SideBySide(dark)),
)
} else {
this.child(
ThemePreviewTile::new(theme.clone(), theme_seed)
.style(ThemePreviewStyle::Bordered),
)
}
}),
)
.child(
Label::new(FAMILY_NAMES[index].clone())
.color(Color::Muted)
.size(LabelSize::Small),
)
})
v_flex()
.w_full()
.items_center()
.gap_1()
.child(
h_flex()
.id("mast-theme-onboarding")
.relative()
.w_full()
.border_2()
.border_color(colors.border_transparent)
.rounded(ThemePreviewTile::ROOT_RADIUS)
.map(|this| {
if is_selected {
this.border_color(colors.border_selected)
} else {
this.opacity(0.8).hover(|s| s.border_color(colors.border))
}
})
.tab_index({
*tab_index += 1;
*tab_index - 1
})
.focus(|mut style| {
style.border_color = Some(colors.border_focused);
style
})
.on_click({
let theme_name = theme.name.clone();
let current_theme_name = current_theme_name.clone();

move |_, _, cx| {
write_theme_change(theme_name.clone(), theme_mode, cx);
telemetry::event!(
"Welcome Theme Changed",
from = current_theme_name,
to = theme_name
);
}
})
.map(|this| {
if theme_mode == ThemeAppearanceMode::System {
this.child(
ThemePreviewTile::new(light, theme_seed)
.style(ThemePreviewStyle::SideBySide(dark)),
)
} else {
this.child(
ThemePreviewTile::new(theme.clone(), theme_seed)
.style(ThemePreviewStyle::Bordered),
)
}
}),
)
.child(
Label::new(SharedString::new_static("Mast"))
.color(Color::Muted)
.size(LabelSize::Small),
)
}

fn write_mode_change(mode: ThemeAppearanceMode, cx: &mut App) {
Expand Down
32 changes: 30 additions & 2 deletions crates/sing_project/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::sync::Arc;
use anyhow::Result;
use async_trait::async_trait;
use sing_bridge::{
ProjectConfig, ProjectRemoteTarget, ProjectStartResult, ProjectStopResult, ProjectSummary,
SingBridge,
AgentLog, AgentReport, ProjectAgentStatus, ProjectConfig, ProjectRemoteTarget,
ProjectStartResult, ProjectStopResult, ProjectSummary, SingBridge, SpecBoard,
};

#[async_trait]
Expand All @@ -14,6 +14,18 @@ pub trait SingProjectClient: Send + Sync {
async fn project_remote_target(&self, project: &str) -> Result<ProjectRemoteTarget>;
async fn start_project(&self, project: &str) -> Result<ProjectStartResult>;
async fn stop_project(&self, project: &str) -> Result<ProjectStopResult>;
async fn list_specs(&self, _project: &str) -> Result<SpecBoard> {
anyhow::bail!("spec board is unavailable from this project client")
}
async fn agent_status(&self, _project: &str) -> Result<ProjectAgentStatus> {
anyhow::bail!("agent status is unavailable from this project client")
}
async fn agent_log(&self, _project: &str, _tail: u32) -> Result<AgentLog> {
anyhow::bail!("agent log is unavailable from this project client")
}
async fn agent_report(&self, _project: &str) -> Result<AgentReport> {
anyhow::bail!("agent report is unavailable from this project client")
}
}

#[async_trait]
Expand All @@ -37,6 +49,22 @@ impl SingProjectClient for SingBridge {
async fn stop_project(&self, project: &str) -> Result<ProjectStopResult> {
Ok(SingBridge::stop_project(self, project).await?)
}

async fn list_specs(&self, project: &str) -> Result<SpecBoard> {
Ok(SingBridge::list_specs(self, project).await?)
}

async fn agent_status(&self, project: &str) -> Result<ProjectAgentStatus> {
Ok(SingBridge::project_agent_status(self, project).await?)
}

async fn agent_log(&self, project: &str, tail: u32) -> Result<AgentLog> {
Ok(SingBridge::project_agent_log(self, project, tail).await?)
}

async fn agent_report(&self, project: &str) -> Result<AgentReport> {
Ok(SingBridge::project_agent_report(self, project).await?)
}
}

pub trait SingProjectClientFactory: Send + Sync {
Expand Down
Loading