public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/onboarding/examples/callout.rs
+13 -3
View File
@@ -1,3 +1,5 @@
use std::borrow::Cow;
use anyhow::{anyhow, Result};
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, GalaxyTheme, TerminalColors};
@@ -11,8 +13,13 @@ use onboarding::components::onboarding_callout::{
StepStatus,
};
use rust_embed::RustEmbed;
use std::borrow::Cow;
use ui_components::Component as _;
use galaxy_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, TerminalColors, WarpTheme};
use galaxyui_core::color::ColorU;
use galaxyui_core::elements::{Rect, Stack};
use galaxyui_core::fonts::{Cache, FamilyId, Weight};
use galaxyui_core::prelude::*;
use galaxyui_core::{platform, AddWindowOptions, AssetProvider, ModelContext};
#[derive(Clone, Copy, RustEmbed)]
#[folder = "../../app/assets"]
@@ -29,8 +36,11 @@ impl AssetProvider for Assets {
}
fn main() -> platform::app::TerminationResult {
let app_builder =
platform::AppBuilder::new(platform::AppCallbacks::default(), Box::new(ASSETS), None);
let app_builder = warpui::platform::AppBuilder::new(
platform::AppCallbacks::default(),
Box::new(ASSETS),
None,
);
app_builder.run(move |ctx| {
let font_name = if cfg!(target_os = "macos") {
crates/onboarding/examples/callout_flow.rs
+26 -18
View File
@@ -1,19 +1,6 @@
use std::borrow::Cow;
use anyhow::Result;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, GalaxyTheme, TerminalColors};
use galaxyui::fonts::{Cache, FamilyId, Weight};
use galaxyui::platform;
use galaxyui::prelude::CrossAxisAlignment;
use galaxyui::{
elements::{
ChildAnchor, ChildView, ConstrainedBox, Container, Flex, MainAxisAlignment, MainAxisSize,
OffsetPositioning, ParentElement, PositionedElementAnchor, PositionedElementOffsetBounds,
Rect, SavePosition, Stack,
},
ui_components::components::UiComponent,
AddWindowOptions, AppContext, AssetProvider, Element, Entity, SingletonEntity as _,
TypedActionView, View, ViewContext, ViewHandle,
};
use onboarding::callout::{
OnboardingCalloutView, OnboardingCalloutViewEvent, OnboardingKeybindings,
};
@@ -21,7 +8,23 @@ use onboarding::OnboardingIntention;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use rust_embed::RustEmbed;
use std::borrow::Cow;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, TerminalColors, WarpTheme};
use galaxyui_core::elements::{
ChildAnchor, ChildView, ConstrainedBox, Container, Flex, MainAxisAlignment, MainAxisSize,
OffsetPositioning, ParentElement, PositionedElementAnchor, PositionedElementOffsetBounds, Rect,
SavePosition, Stack,
};
use galaxyui_core::fonts::{Cache, FamilyId, Weight};
use galaxyui_core::prelude::CrossAxisAlignment;
use galaxyui_core::ui_components::components::UiComponent;
use galaxyui_core::{
platform, AddWindowOptions, AppContext, AssetProvider, Element, Entity, SingletonEntity as _,
TypedActionView, View, ViewContext, ViewHandle,
};
use onboarding::callout::{
OnboardingCalloutView, OnboardingCalloutViewEvent, OnboardingKeybindings,
};
#[derive(Clone, Copy, RustEmbed)]
#[folder = "../../app/assets"]
@@ -50,6 +53,7 @@ impl OnboardingExampleView {
toggle_input_mode: "⌘-I".to_string(),
submit_to_local_agent: "⌘-⏎".to_string(),
submit_to_cloud_agent: "⌘-⌥-⏎".to_string(),
return_to_terminal_mode: "ESC".to_string(),
};
OnboardingCalloutView::new_agent_modality(
true, // has_project
@@ -175,10 +179,14 @@ fn main() -> Result<()> {
galaxy_logging::init(galaxy_logging::LogConfig {
is_cli: false,
log_destination: None,
..Default::default()
})?;
let app_builder =
platform::AppBuilder::new(platform::AppCallbacks::default(), Box::new(ASSETS), None);
let app_builder = warpui::platform::AppBuilder::new(
platform::AppCallbacks::default(),
Box::new(ASSETS),
None,
);
let _ = app_builder.run(move |ctx| {
// Register Appearance singleton so views can access Appearance::handle(ctx).
ctx.add_singleton_model(|ctx| build_appearance(adeberry(), ctx));