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

Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

Browse Source
This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/terminal/alias.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::terminal::model::session::Session;
use smol_str::SmolStr;
use std::sync::Arc;
use warp_completer::parsers::simple::all_parsed_commands;
use galaxy_completer::parsers::simple::all_parsed_commands;
/// Contains information about an aliased command.
#[derive(Clone, Debug, Eq, PartialEq)]
app/src/terminal/alt_screen/alt_screen_element.rs
+14 -14
View File
@@ -28,28 +28,28 @@ use num_traits::Float as _;
use parking_lot::FairMutex;
use pathfinder_geometry::vector::vec2f;
use vec1::Vec1;
use warp_core::features::FeatureFlag;
use warp_util::user_input::UserInput;
use warpui::elements::new_scrollable::{NewScrollableElement, ScrollableAxis};
use warpui::event::{KeyState, ModifiersState};
use warpui::platform::keyboard::KeyCode;
use warpui::text::SelectionType;
use galaxy_core::features::FeatureFlag;
use galaxy_util::user_input::UserInput;
use galaxyui::elements::new_scrollable::{NewScrollableElement, ScrollableAxis};
use galaxyui::event::{KeyState, ModifiersState};
use galaxyui::platform::keyboard::KeyCode;
use galaxyui::text::SelectionType;
use super::{should_intercept_mouse, should_intercept_scroll};
use std::ops::{Deref as _, Range};
use std::sync::Arc;
use warpui::elements::{Axis, Fill, Point as UiPoint, ScrollData, ScrollableElement};
use warpui::fonts::Properties;
use warpui::geometry::rect::RectF;
use warpui::geometry::vector::Vector2F;
use warpui::units::{IntoLines, IntoPixels, Lines, Pixels};
use warpui::{
use galaxyui::elements::{Axis, Fill, Point as UiPoint, ScrollData, ScrollableElement};
use galaxyui::fonts::Properties;
use galaxyui::geometry::rect::RectF;
use galaxyui::geometry::vector::Vector2F;
use galaxyui::units::{IntoLines, IntoPixels, Lines, Pixels};
use galaxyui::{
end_trace,
event::{DispatchedEvent, InBoundsExt},
record_trace_event, start_trace, AfterLayoutContext, AppContext, Element, Event, EventContext,
LayoutContext, PaintContext, SizeConstraint,
};
use warpui::{ClipBounds, EntityId, ModelHandle};
use galaxyui::{ClipBounds, EntityId, ModelHandle};
const CLI_SUBAGENT_HORIZONTAL_MARGIN: f32 = 8.;
const CLI_SUBAGENT_VERTICAL_MARGIN: f32 = 8.;
@@ -260,7 +260,7 @@ impl AltScreenElement {
ctx.dispatch_typed_action(TerminalAction::Focus);
// On mobile, request soft keyboard so users can input.
if warpui::platform::is_mobile_device() {
if galaxyui::platform::is_mobile_device() {
ctx.request_soft_keyboard();
}
app/src/terminal/alt_screen/mod.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use settings::Setting as _;
use warpui::{AppContext, SingletonEntity};
use galaxyui::{AppContext, SingletonEntity};
use super::{
alt_screen_reporting::AltScreenReporting, model::grid::grid_handler::TermMode, TerminalModel,
app/src/terminal/audible_bell/mod.rs
+1 -1
View File
@@ -1,7 +1,7 @@
//! Module containing the definition of a platform agnostic audible bell.
use anyhow::Result;
use warpui::{Entity, SingletonEntity};
use galaxyui::{Entity, SingletonEntity};
#[cfg_attr(target_os = "linux", path = "linux.rs")]
#[cfg_attr(target_os = "macos", path = "macos.rs")]
app/src/terminal/available_shells.rs
+6 -6
View File
@@ -9,8 +9,8 @@ use std::sync::Arc;
#[cfg(feature = "local_tty")]
use settings::Setting as _;
#[cfg(feature = "local_tty")]
use warpui::{AppContext, ModelContext};
use warpui::{Entity, SingletonEntity};
use galaxyui::{AppContext, ModelContext};
use galaxyui::{Entity, SingletonEntity};
#[cfg(feature = "local_tty")]
use crate::util::path::file_exists_and_is_executable;
@@ -606,7 +606,7 @@ impl AvailableShells {
ctx: &mut ModelContext<Self>,
) -> anyhow::Result<()> {
use super::session_settings::SessionSettings;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
SessionSettings::handle(ctx).update(ctx, |settings, ctx| {
if FeatureFlag::ShellSelector.is_enabled() {
settings
@@ -624,7 +624,7 @@ impl AvailableShells {
paths_to_search: &[PathBuf],
fallback_path: Option<&Path>,
) -> Vec<AvailableShell> {
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
if !FeatureFlag::ShellSelector.is_enabled() {
return vec![
@@ -722,7 +722,7 @@ impl AvailableShells {
fn locate_msys2_executables() -> Vec<PathBuf> {
use std::env;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
let mut paths = Vec::new();
@@ -982,7 +982,7 @@ impl Entity for AvailableShells {
impl SingletonEntity for AvailableShells {}
#[cfg(feature = "local_tty")]
pub fn register(app: &mut impl warpui::AddSingletonModel) {
pub fn register(app: &mut impl galaxyui::AddSingletonModel) {
#[cfg(windows)]
app.add_singleton_model(super::wsl::WslInfo::new);
app.add_singleton_model(AvailableShells::new);
app/src/terminal/available_shells_test.rs
+1 -1
View File
@@ -4,7 +4,7 @@ use crate::test_util::{Stub, VirtualFS};
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
fn make_available_shells(shells: Vec<AvailableShell>) -> AvailableShells {
AvailableShells {
app/src/terminal/block_filter.rs
+7 -7
View File
@@ -1,11 +1,11 @@
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use regex_automata::hybrid::BuildError;
use warp_editor::editor::NavigationKey;
use warpui::elements::{Align, Dash};
use warpui::ui_components::components::UiComponent;
use warpui::FocusContext;
use warpui::{
use galaxy_editor::editor::NavigationKey;
use galaxyui::elements::{Align, Dash};
use galaxyui::ui_components::components::UiComponent;
use galaxyui::FocusContext;
use galaxyui::{
accessibility::{AccessibilityContent, WarpA11yRole},
elements::{
Border, ChildAnchor, Clipped, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
@@ -475,7 +475,7 @@ impl BlockFilterEditor {
};
let icon = Container::new(
ConstrainedBox::new(
icon.to_warpui_icon(appearance.theme().active_ui_text_color())
icon.to_galaxyui_icon(appearance.theme().active_ui_text_color())
.finish(),
)
.with_height(size)
@@ -641,7 +641,7 @@ impl View for BlockFilterEditor {
|state| {
let context_line_icon = ConstrainedBox::new(
Icon::DistributeSpacingVertical
.to_warpui_icon(
.to_galaxyui_icon(
blended_colors::text_main(
appearance.theme(),
appearance.theme().background(),
app/src/terminal/block_list_element.rs
+24 -24
View File
@@ -27,12 +27,12 @@ use enum_iterator::Sequence;
use itertools::Itertools;
use parking_lot::FairMutex;
use vec1::Vec1;
use warp_core::semantic_selection::SemanticSelection;
use warp_core::ui::builder::UiBuilder;
use warp_core::ui::theme::AnsiColorIdentifier;
use warp_util::user_input::UserInput;
use warpui::platform::Cursor;
use warpui::text::SelectionType;
use galaxy_core::semantic_selection::SemanticSelection;
use galaxy_core::ui::builder::UiBuilder;
use galaxy_core::ui::theme::AnsiColorIdentifier;
use galaxy_util::user_input::UserInput;
use galaxyui::platform::Cursor;
use galaxyui::text::SelectionType;
use pathfinder_color::ColorU;
use session_sharing_protocol::common::{ParticipantId, Selection};
@@ -43,25 +43,25 @@ use std::ops::{Deref, Range, RangeInclusive};
use std::rc::Rc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, MutexGuard};
use warpui::elements::new_scrollable::{NewScrollableElement, ScrollableAxis};
use warpui::elements::{
use galaxyui::elements::new_scrollable::{NewScrollableElement, ScrollableAxis};
use galaxyui::elements::{
Axis, Border, ChildAnchor, ClippedScrollStateHandle, ConstrainedBox, Container, CornerRadius,
Hoverable, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
ParentOffsetBounds, Point, Radius, ScrollData, ScrollableElement, Stack, Text, ZIndex,
};
use warpui::event::{KeyState, ModifiersState};
use warpui::fonts::{FamilyId, Properties, Weight};
use warpui::geometry::rect::RectF;
use warpui::geometry::vector::{vec2f, Vector2F};
use warpui::platform::keyboard::KeyCode;
use warpui::ui_components::components::UiComponent;
use warpui::units::{IntoLines, IntoPixels, Lines, Pixels};
use warpui::{elements::Icon, ClipBounds};
use warpui::{
use galaxyui::event::{KeyState, ModifiersState};
use galaxyui::fonts::{FamilyId, Properties, Weight};
use galaxyui::geometry::rect::RectF;
use galaxyui::geometry::vector::{vec2f, Vector2F};
use galaxyui::platform::keyboard::KeyCode;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::units::{IntoLines, IntoPixels, Lines, Pixels};
use galaxyui::{elements::Icon, ClipBounds};
use galaxyui::{
elements::SavePosition, event::DispatchedEvent, AfterLayoutContext, AppContext, Element, Event,
EventContext, LayoutContext, PaintContext, SizeConstraint,
};
use warpui::{EntityId, ModelHandle, SingletonEntity as _};
use galaxyui::{EntityId, ModelHandle, SingletonEntity as _};
use super::block_list_viewport::{ClampingMode, InputMode, ScrollPosition, ViewportState};
use super::blockgrid_renderer::GridRenderParams;
@@ -1140,11 +1140,11 @@ impl BlockListElement {
let icon = Container::new(
ConstrainedBox::new(if FeatureFlag::AgentView.is_enabled() {
UIIcon::Icon::Paperclip
.to_warpui_icon(icon_color.into())
.to_galaxyui_icon(icon_color.into())
.finish()
} else if FeatureFlag::AgentMode.is_enabled() {
UIIcon::Icon::Stars
.to_warpui_icon(icon_color.into())
.to_galaxyui_icon(icon_color.into())
.finish()
} else {
Icon::new(AI_ASSISTANT_SVG_PATH, icon_color).finish()
@@ -1207,7 +1207,7 @@ impl BlockListElement {
let icon = Container::new(
ConstrainedBox::new(
ui_components::icons::Icon::Save
.to_warpui_icon(icon_color.into())
.to_galaxyui_icon(icon_color.into())
.finish(),
)
.with_height(16.)
@@ -1282,7 +1282,7 @@ impl BlockListElement {
}
/// We only want to process control characters here and return `false` for everything else.
/// That way, we'll receive a `warpui::Event::TypedCharacters` event for printable characters.
/// That way, we'll receive a `galaxyui::Event::TypedCharacters` event for printable characters.
/// So `TerminalAction::KeyDown` is for control characters only while
/// `TerminalAction::TypedCharacters` is for characters that can go into the editor.
fn key_down(&mut self, chars: &str, ctx: &mut EventContext) -> bool {
@@ -1576,7 +1576,7 @@ impl BlockListElement {
.is_some_and(|block| block.is_active_and_long_running());
// On mobile, request soft keyboard so users can input
if warpui::platform::is_mobile_device() && on_long_running_block {
if galaxyui::platform::is_mobile_device() && on_long_running_block {
ctx.request_soft_keyboard();
}
@@ -4113,7 +4113,7 @@ impl Element for BlockListElement {
None => 0.,
},
// Otherwise, we need to measure the prompt grid(s). Grids
// aren't warpui::Elements, and hence their width isn't
// aren't galaxyui::Elements, and hence their width isn't
// straightforward to measure. We'll use the column index of the
// right-most non-empty cell as a proxy for width.
None => {
app/src/terminal/block_list_viewport.rs
+2 -2
View File
@@ -3,8 +3,8 @@ use std::{ops::Range, rc::Rc, sync::MutexGuard};
use pathfinder_geometry::vector::Vector2F;
use serde::{Deserialize, Serialize};
use sum_tree::{Cursor, SeekBias};
use warp_core::features::FeatureFlag;
use warpui::{
use galaxy_core::features::FeatureFlag;
use galaxyui::{
elements::ClippedScrollStateHandle,
units::{IntoLines, IntoPixels, Lines, Pixels},
AppContext, ModelHandle,
app/src/terminal/blockgrid_element.rs
+3 -3
View File
@@ -6,12 +6,12 @@ use crate::terminal::model::grid::Dimensions;
use crate::terminal::model::ObfuscateSecrets;
use crate::terminal::{color, SizeInfo};
use pathfinder_geometry::vector::{vec2f, Vector2F};
use warpui::elements::{
use galaxyui::elements::{
AfterLayoutContext, AppContext, Element, EventContext, LayoutContext, PaintContext, Point,
SizeConstraint,
};
use warpui::event::DispatchedEvent;
use warpui::geometry::rect::RectF;
use galaxyui::event::DispatchedEvent;
use galaxyui::geometry::rect::RectF;
use super::blockgrid_renderer::GridRenderParams;
app/src/terminal/blockgrid_renderer.rs
+4 -4
View File
@@ -11,10 +11,10 @@ use pathfinder_color::ColorU;
use std::collections::HashMap;
use std::ops::Neg;
use std::ops::RangeInclusive;
use warpui::fonts::{FamilyId, Properties, Weight};
use warpui::geometry::rect::RectF;
use warpui::geometry::vector::{vec2f, Vector2F};
use warpui::{AppContext, Element, EntityId, PaintContext};
use galaxyui::fonts::{FamilyId, Properties, Weight};
use galaxyui::geometry::rect::RectF;
use galaxyui::geometry::vector::{vec2f, Vector2F};
use galaxyui::{AppContext, Element, EntityId, PaintContext};
use super::model::ansi::{CursorShape, CursorStyle};
use super::model::grid::RespectDisplayedOutput;
app/src/terminal/bootstrap.rs
+1 -1
View File
@@ -3,7 +3,7 @@ use std::borrow::Cow;
use itertools::Itertools;
use lazy_static::lazy_static;
use memo_map::MemoMap;
use warpui::{AppContext, AssetProvider, SingletonEntity};
use galaxyui::{AppContext, AssetProvider, SingletonEntity};
use crate::{
env_vars::EnvVar,
app/src/terminal/buy_credits_banner.rs
+15 -15
View File
@@ -5,20 +5,20 @@ use itertools::Itertools as _;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::Icon;
use warp_graphql::billing::AddonCreditsOption;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::Icon;
use galaxy_graphql::billing::AddonCreditsOption;
use galaxyui::elements::{
Align, Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DropShadow, Expanded, Flex, FormattedTextElement, HighlightedHyperlink,
Hoverable, Icon as WarpUiIcon, MainAxisAlignment, MainAxisSize, MouseStateHandle,
OffsetPositioning, ParentAnchor, ParentElement as _, ParentOffsetBounds, Radius, Shrinkable,
SizeConstraintCondition, SizeConstraintSwitch, Stack, Text,
};
use warpui::fonts::Weight;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent as _, UiComponentStyles};
use warpui::{AppContext, Element, Entity, SingletonEntity as _, View, ViewContext, ViewHandle};
use galaxyui::fonts::Weight;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{Coords, UiComponent as _, UiComponentStyles};
use galaxyui::{AppContext, Element, Entity, SingletonEntity as _, View, ViewContext, ViewHandle};
use crate::ai::request_usage_model::{
AIRequestUsageModel, AIRequestUsageModelEvent, BuyCreditsBannerDisplayState,
@@ -33,7 +33,7 @@ use crate::server::telemetry::{OutOfCreditsBannerAction, TelemetryEvent};
use crate::settings_view::create_discount_badge;
use crate::view_components::Dropdown;
use crate::workspaces::user_workspaces::{UserWorkspaces, UserWorkspacesEvent};
use warp_graphql::error::BudgetExceededError;
use galaxy_graphql::error::BudgetExceededError;
#[derive(Default)]
struct MouseStates {
@@ -384,7 +384,7 @@ impl BuyCreditsBanner {
let alert_icon = Container::new(
ConstrainedBox::new(
Icon::AlertCircle
.to_warpui_icon(theme.foreground())
.to_galaxyui_icon(theme.foreground())
.finish(),
)
.with_height(16.)
@@ -505,7 +505,7 @@ impl BuyCreditsBanner {
Container::new(
ConstrainedBox::new(
Icon::AlertCircle
.to_warpui_icon(theme.foreground())
.to_galaxyui_icon(theme.foreground())
.finish(),
)
.with_height(16.)
@@ -579,8 +579,8 @@ impl BuyCreditsBanner {
.with_hyperlink_font_color(theme.accent().into_solid())
.register_default_click_handlers_with_action_support(
|hyperlink_lens, event, _ctx| match hyperlink_lens {
warpui::elements::HyperlinkLens::Url(_url) => {}
warpui::elements::HyperlinkLens::Action(action_ref) => {
galaxyui::elements::HyperlinkLens::Url(_url) => {}
galaxyui::elements::HyperlinkLens::Action(action_ref) => {
if let Some(action) = action_ref.as_any().downcast_ref::<Action>() {
event.dispatch_typed_action(action.clone());
}
@@ -818,7 +818,7 @@ impl View for BuyCreditsBanner {
match display_state {
BuyCreditsBannerDisplayState::Hidden => {
Container::new(warpui::elements::Empty::new().finish()).finish()
Container::new(galaxyui::elements::Empty::new().finish()).finish()
}
BuyCreditsBannerDisplayState::OutOfCredits => {
self.render_out_of_credits(appearance, app)
@@ -839,7 +839,7 @@ pub enum Action {
ToggleAutoReload,
}
impl warpui::TypedActionView for BuyCreditsBanner {
impl galaxyui::TypedActionView for BuyCreditsBanner {
type Action = Action;
fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
app/src/terminal/cli_agent.rs
+4 -4
View File
@@ -13,9 +13,9 @@ use markdown_parser::parse_markdown;
use pathfinder_color::ColorU;
use serde::{Deserialize, Serialize};
use smol_str::SmolStr;
use warp_editor::content::{buffer::Buffer, markdown::MarkdownStyle};
use galaxy_editor::content::{buffer::Buffer, markdown::MarkdownStyle};
use warpui::{AppContext, SingletonEntity};
use galaxyui::{AppContext, SingletonEntity};
use crate::ai::agent::{AgentReviewCommentBatch, DiffSetHunk};
use crate::ai::blocklist::CLAUDE_ORANGE;
@@ -24,8 +24,8 @@ use crate::code_review::comments::AttachedReviewCommentTarget;
use crate::server::telemetry::CLIAgentType;
use crate::ui_components::icons::Icon;
use crate::workspaces::user_workspaces::UserWorkspaces;
use warp_completer::parsers::simple::top_level_command;
use warp_util::path::EscapeChar;
use galaxy_completer::parsers::simple::top_level_command;
use galaxy_util::path::EscapeChar;
/// UID for the Uber team.
/// See https://warp.metabaseapp.com/dashboard/1454?team_id=46347
app/src/terminal/cli_agent_sessions/listener/mod.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warpui::{EntityId, ModelContext, ModelHandle, SingletonEntity};
use galaxyui::{EntityId, ModelContext, ModelHandle, SingletonEntity};
use super::{CLIAgentEvent, CLIAgentSessionsModel};
use crate::terminal::cli_agent_sessions::event::parse_event;
@@ -152,7 +152,7 @@ pub struct CLIAgentSessionListener {
inner: Box<dyn CLIAgentSessionHandler>,
}
impl warpui::Entity for CLIAgentSessionListener {
impl galaxyui::Entity for CLIAgentSessionListener {
type Event = ();
}
app/src/terminal/cli_agent_sessions/mod.rs
+1 -1
View File
@@ -5,7 +5,7 @@ pub(crate) mod plugin_manager;
use std::collections::{HashMap, HashSet};
use warpui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
use galaxyui::{Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
use crate::ai::blocklist::InputConfig;
app/src/terminal/cli_agent_tests.rs
+3 -3
View File
@@ -4,9 +4,9 @@ use std::sync::Arc;
use chrono::Local;
use smol_str::SmolStr;
use warp_editor::render::model::LineCount;
use warp_util::path::EscapeChar;
use warpui::App;
use galaxy_editor::render::model::LineCount;
use galaxy_util::path::EscapeChar;
use galaxyui::App;
use super::{
build_diff_hunk_prompt, build_review_prompt, build_selection_line_range_prompt,
app/src/terminal/color.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use crate::terminal::model::ansi::color_index;
use crate::themes::theme::{AnsiColors, WarpTheme};
use std::fmt;
use std::ops::{Index, IndexMut};
use warpui::color::ColorU;
use galaxyui::color::ColorU;
pub const COUNT: usize = 269;
app/src/terminal/dynamic_enum_suggestions.rs
+3 -3
View File
@@ -1,4 +1,4 @@
use warp_completer::completer::{CommandOutput, GeneratorContext};
use galaxy_completer::completer::{CommandOutput, GeneratorContext};
use crate::completer::SessionContext;
@@ -17,7 +17,7 @@ pub(crate) async fn run_dynamic_enum_command(
/// trims each row and splits on newlines.
fn parse_dynamic_command(output: &CommandOutput) -> anyhow::Result<Vec<String>> {
match output.status {
warp_completer::completer::CommandExitStatus::Success => {
galaxy_completer::completer::CommandExitStatus::Success => {
let output = String::from_utf8_lossy(output.output());
let cleaned_output: Vec<String> = output
.split("\n")
@@ -26,7 +26,7 @@ fn parse_dynamic_command(output: &CommandOutput) -> anyhow::Result<Vec<String>>
.collect();
Ok(cleaned_output)
}
warp_completer::completer::CommandExitStatus::Failure => {
galaxy_completer::completer::CommandExitStatus::Failure => {
Err(anyhow::anyhow!("Command exited with failure code"))
}
}
app/src/terminal/enable_auto_reload_modal.rs
+12 -12
View File
@@ -3,16 +3,16 @@ use std::sync::Arc;
use enclose::enclose;
use itertools::Itertools as _;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use warp_core::ui::appearance::Appearance;
use warp_graphql::billing::AddonCreditsOption;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_graphql::billing::AddonCreditsOption;
use galaxyui::elements::{
Border, ChildView, Container, CrossAxisAlignment, Empty, Flex, HighlightedHyperlink,
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Text,
};
use warpui::fonts::Weight;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent as _, UiComponentStyles};
use warpui::{AppContext, Element, Entity, SingletonEntity as _, View, ViewContext, ViewHandle};
use galaxyui::fonts::Weight;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{Coords, UiComponent as _, UiComponentStyles};
use galaxyui::{AppContext, Element, Entity, SingletonEntity as _, View, ViewContext, ViewHandle};
use crate::features::FeatureFlag;
use crate::menu::MenuItemFields;
@@ -222,7 +222,7 @@ impl EnableAutoReloadModalBody {
"https://docs.warp.dev/support-and-community/plans-and-billing/add-on-credits#id-2.-enable-auto-reload",
),
];
let explanation_text = warpui::elements::FormattedTextElement::new(
let explanation_text = galaxyui::elements::FormattedTextElement::new(
FormattedText::new([FormattedTextLine::Line(explanation_fragments)]),
appearance.ui_font_size(),
appearance.ui_font_family(),
@@ -233,10 +233,10 @@ impl EnableAutoReloadModalBody {
.with_hyperlink_font_color(theme.accent().into_solid())
.register_default_click_handlers_with_action_support(|hyperlink_lens, _event, ctx| {
match hyperlink_lens {
warpui::elements::HyperlinkLens::Url(url) => {
galaxyui::elements::HyperlinkLens::Url(url) => {
ctx.open_url(url);
}
warpui::elements::HyperlinkLens::Action(_action_ref) => {}
galaxyui::elements::HyperlinkLens::Action(_action_ref) => {}
}
})
.finish();
@@ -370,7 +370,7 @@ pub enum Action {
Enable,
}
impl warpui::TypedActionView for EnableAutoReloadModalBody {
impl galaxyui::TypedActionView for EnableAutoReloadModalBody {
type Action = Action;
fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
@@ -490,7 +490,7 @@ impl Entity for EnableAutoReloadModal {
type Event = EnableAutoReloadModalEvent;
}
impl warpui::TypedActionView for EnableAutoReloadModal {
impl galaxyui::TypedActionView for EnableAutoReloadModal {
type Action = ();
}
app/src/terminal/find/model.rs
+1 -1
View File
@@ -14,7 +14,7 @@ use std::{collections::HashMap, sync::Arc};
use alt_screen::{run_find_on_alt_screen, AltScreenFindRun};
use parking_lot::FairMutex;
use settings::Setting as _;
use warpui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity, ViewHandle};
use galaxyui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity, ViewHandle};
use crate::{
settings::InputModeSettings,
app/src/terminal/find/model/block_list.rs
+1 -1
View File
@@ -2,7 +2,7 @@
use std::{collections::HashMap, iter, ops::RangeInclusive};
use itertools::Itertools;
use warpui::{units::Lines, AppContext, EntityId};
use galaxyui::{units::Lines, AppContext, EntityId};
use crate::terminal::{
model::{
app/src/terminal/find/model/block_list_test.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use itertools::Itertools;
use warpui::App;
use galaxyui::App;
use crate::terminal::{
block_filter::BlockFilterQuery,
app/src/terminal/find/model/rich_content.rs
+1 -1
View File
@@ -1,7 +1,7 @@
//! Traits and abstractions supporting the find operation across rich content blocks.
use std::sync::atomic::{AtomicUsize, Ordering};
use warpui::{AppContext, View, ViewContext, ViewHandle};
use galaxyui::{AppContext, View, ViewContext, ViewHandle};
use super::FindOptions;
app/src/terminal/general_settings.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::collections::HashSet;
use crate::{banner::BannerState, resource_center::Tip};
use warp_core::settings::{
use galaxy_core::settings::{
macros::define_settings_group, RespectUserSyncSetting, SupportedPlatforms, SyncToCloud,
};
app/src/terminal/grid_renderer.rs
+14 -14
View File
@@ -21,18 +21,18 @@ use std::cmp::Ordering;
use std::ops::Range;
use std::{collections::HashMap, ops::RangeInclusive};
use unicode_width::UnicodeWidthChar;
use warp_core::features::FeatureFlag;
use warpui::assets::asset_cache::{AssetCache, AssetSource, AssetState};
use warpui::color::ColorU;
use warpui::elements::{Border, CornerRadius, Fill, Radius, DEFAULT_UI_LINE_HEIGHT_RATIO};
use warpui::fonts::{FamilyId, FontId, Properties, Style, Weight};
use warpui::geometry::rect::RectF;
use warpui::geometry::vector::{vec2f, Vector2F};
use warpui::image_cache::{AnimatedImageBehavior, CacheOption, FitType, Image, ImageCache};
use warpui::platform::LineStyle;
use warpui::text_layout::{Line, StyleAndFont, TextStyle, DEFAULT_TOP_BOTTOM_RATIO};
use warpui::units::{IntoLines as _, Lines, Pixels};
use warpui::{AppContext, Element, EntityId, PaintContext, Scene, SingletonEntity};
use galaxy_core::features::FeatureFlag;
use galaxyui::assets::asset_cache::{AssetCache, AssetSource, AssetState};
use galaxyui::color::ColorU;
use galaxyui::elements::{Border, CornerRadius, Fill, Radius, DEFAULT_UI_LINE_HEIGHT_RATIO};
use galaxyui::fonts::{FamilyId, FontId, Properties, Style, Weight};
use galaxyui::geometry::rect::RectF;
use galaxyui::geometry::vector::{vec2f, Vector2F};
use galaxyui::image_cache::{AnimatedImageBehavior, CacheOption, FitType, Image, ImageCache};
use galaxyui::platform::LineStyle;
use galaxyui::text_layout::{Line, StyleAndFont, TextStyle, DEFAULT_TOP_BOTTOM_RATIO};
use galaxyui::units::{IntoLines as _, Lines, Pixels};
use galaxyui::{AppContext, Element, EntityId, PaintContext, Scene, SingletonEntity};
pub use self::cell_glyph_cache::CellGlyphCache;
use self::cell_type::{CellType, IsFocused, Secret};
@@ -583,7 +583,7 @@ fn render_grid_without_ligatures<'a>(
}
if !foreground_image_ids.is_empty() {
ctx.scene.start_layer(warpui::ClipBounds::ActiveLayer);
ctx.scene.start_layer(galaxyui::ClipBounds::ActiveLayer);
for image_placement in foreground_image_ids {
if let Some((image_metadata, image_placement_data)) = image_metadata
.get(&image_placement.image_id)
@@ -1082,7 +1082,7 @@ fn render_grid_with_ligatures<'a>(
}
if !foreground_image_ids.is_empty() {
ctx.scene.start_layer(warpui::ClipBounds::ActiveLayer);
ctx.scene.start_layer(galaxyui::ClipBounds::ActiveLayer);
for image_placement in foreground_image_ids {
if let Some((image_metadata, image_placement_data)) = image_metadata
.get(&image_placement.image_id)
app/src/terminal/grid_renderer/cell_glyph_cache.rs
+5 -5
View File
@@ -1,11 +1,11 @@
//! This module defines CellGlyphCache, a struct which manages the caching of glyph values for cells
//! when rendering Grids within Warp.
use warpui::elements::DEFAULT_LINE_HEIGHT_RATIO;
use galaxyui::elements::DEFAULT_LINE_HEIGHT_RATIO;
use warpui::fonts::{Cache as FontCache, FamilyId, FontId, GlyphId, Properties};
use warpui::platform::LineStyle;
use warpui::text_layout::{StyleAndFont, DEFAULT_TOP_BOTTOM_RATIO};
use warpui::PaintContext;
use galaxyui::fonts::{Cache as FontCache, FamilyId, FontId, GlyphId, Properties};
use galaxyui::platform::LineStyle;
use galaxyui::text_layout::{StyleAndFont, DEFAULT_TOP_BOTTOM_RATIO};
use galaxyui::PaintContext;
use std::collections::HashMap;
app/src/terminal/grid_renderer/cell_type.rs
+1 -1
View File
@@ -106,7 +106,7 @@ impl CellType {
} else if self.is_url() || self.is_hovered_secret() {
*URL_COLOR
} else if matches!(obfuscate_mode, ObfuscateSecrets::Strikethrough) && is_unhovered_secret {
warpui::color::ColorU::new(128, 128, 128, 255)
galaxyui::color::ColorU::new(128, 128, 128, 255)
} else if self.is_default()
|| self.is_marked_text_char()
|| is_unhovered_secret
app/src/terminal/grid_renderer_test.rs
+3 -3
View File
@@ -5,8 +5,8 @@ use crate::terminal::model::selection::SelectionPoint;
use crate::terminal::{grid_renderer, SizeInfo};
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use warpui::fonts::Cache as FontCache;
use warpui::units::{IntoLines, Lines, Pixels};
use galaxyui::fonts::Cache as FontCache;
use galaxyui::units::{IntoLines, Lines, Pixels};
fn rect_from_points(min_x: f32, min_y: f32, max_x: f32, max_y: f32) -> RectF {
RectF::from_points(vec2f(min_x, min_y), vec2f(max_x, max_y))
@@ -19,7 +19,7 @@ fn rect_from_points(min_x: f32, min_y: f32, max_x: f32, max_y: f32) -> RectF {
ignore = "Assumes existence of Arial font, which is only guaranteed on macOS"
)]
fn test_calculate_grid_baseline_position() {
let font_db = warpui::platform::test::FontDB::new();
let font_db = galaxyui::platform::test::FontDB::new();
let mut font_cache = FontCache::new(Box::new(font_db));
// Note we've restricted this unit test to Mac, so we expect Arial to exist.
let arial = font_cache
app/src/terminal/grid_size_util.rs
+4 -4
View File
@@ -3,10 +3,10 @@
use num_traits::Zero;
use pathfinder_geometry::vector::vec2f;
use pathfinder_geometry::vector::Vector2F;
use warpui::elements::DEFAULT_UI_LINE_HEIGHT_RATIO;
use warpui::fonts::Cache as FontCache;
use warpui::fonts::FamilyId;
use warpui::text_layout::ComputeBaselinePositionFn;
use galaxyui::elements::DEFAULT_UI_LINE_HEIGHT_RATIO;
use galaxyui::fonts::Cache as FontCache;
use galaxyui::fonts::FamilyId;
use galaxyui::text_layout::ComputeBaselinePositionFn;
/// Computes the grid cell size given the font and size at which the grid should
/// be rendered. We use a similar algorithm to Alacritty to do this, where the
app/src/terminal/history.rs
+2 -2
View File
@@ -6,8 +6,8 @@ use std::{
sync::Arc,
};
use warp_core::command::ExitCode;
use warpui::{AppContext, Entity, ModelContext, SingletonEntity};
use galaxy_core::command::ExitCode;
use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
use super::{
model::block::{AgentInteractionMetadata, Block, SerializedAIMetadata, SerializedBlock},
app/src/terminal/history/up_arrow.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::collections::HashSet;
use warp_core::features::FeatureFlag;
use warpui::{AppContext, EntityId, SingletonEntity};
use galaxy_core::features::FeatureFlag;
use galaxyui::{AppContext, EntityId, SingletonEntity};
use crate::ai::blocklist::BlocklistAIHistoryModel;
use crate::ai::blocklist::InputConfig;
app/src/terminal/history_tests.rs
+2 -2
View File
@@ -18,8 +18,8 @@ use futures::future::join_all;
use futures::Future;
use futures_lite::StreamExt;
use itertools::Itertools;
use warp_core::command::ExitCode;
use warpui::{App, ModelHandle};
use galaxy_core::command::ExitCode;
use galaxyui::{App, ModelHandle};
use std::path::PathBuf;
use std::pin::pin;
app/src/terminal/input.rs
+16 -16
View File
@@ -249,9 +249,9 @@ use std::{
use string_offset::CharOffset;
use vec1::Vec1;
use vim::vim::{VimHandler, VimMode};
use warp_completer::util::parse_current_commands_and_tokens;
use galaxy_completer::util::parse_current_commands_and_tokens;
use warp_completer::{
use galaxy_completer::{
completer::{
self, CompleterOptions, CompletionContext, CompletionsFallbackStrategy, Description, Match,
MatchStrategy, MatchType, PathSeparators, SuggestionResults,
@@ -260,14 +260,14 @@ use warp_completer::{
parsers::{simple::command_at_cursor_position, LiteCommand},
signatures::CommandRegistry,
};
use warp_core::user_preferences::GetUserPreferences as _;
use warp_core::{
use galaxy_core::user_preferences::GetUserPreferences as _;
use galaxy_core::{
context_flag::ContextFlag,
ui::theme::{color::internal_colors, AnsiColorIdentifier},
};
use warp_editor::editor::NavigationKey;
use warp_util::path::ShellFamily;
use warpui::{
use galaxy_editor::editor::NavigationKey;
use galaxy_util::path::ShellFamily;
use galaxyui::{
accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole},
clipboard::{ClipboardContent, ImageData},
clipboard_utils::CLIPBOARD_IMAGE_MIME_TYPES,
@@ -295,7 +295,7 @@ use warpui::{
AppContext, Entity, EntityId, FocusContext, ModelAsRef, ModelHandle, SingletonEntity,
TypedActionView, View, ViewContext, ViewHandle, WeakViewHandle,
};
pub use warpui::{
pub use galaxyui::{
elements::{ParentElement as _, Stack},
geometry::vector::{vec2f, Vector2F},
WindowId,
@@ -1728,7 +1728,7 @@ impl DeferredRemoteOperations {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
if cfg!(feature = "integration_tests") {
app.register_fixed_bindings([
@@ -8984,7 +8984,7 @@ impl Input {
// the completions finish quickly, since that causes a jittery UX.
let _ = ctx.spawn(
async move {
warpui::r#async::Timer::after(Duration::from_millis(750)).await;
galaxyui::r#async::Timer::after(Duration::from_millis(750)).await;
old_buffer_text_original
},
move |input, old_buffer_text_original, ctx| {
@@ -9603,7 +9603,7 @@ impl Input {
.map(|session| session.is_wsl())
.unwrap_or(false);
let relative_path = warp_util::path::to_relative_path(
let relative_path = galaxy_util::path::to_relative_path(
is_wsl,
&absolute_path,
Path::new(pwd),
@@ -9680,7 +9680,7 @@ impl Input {
None => image_filepaths.clone(),
};
let paths_str =
warpui::clipboard_utils::escaped_paths_str(&transformed, shell_family);
galaxyui::clipboard_utils::escaped_paths_str(&transformed, shell_family);
self.editor.update(ctx, |editor, ctx| {
editor.user_insert(&paths_str, ctx);
@@ -9726,7 +9726,7 @@ impl Input {
// Check if we should insert clipboard text in advance
let mut already_inserted_text = false;
if warpui::clipboard::should_insert_text_on_paste(&content) {
if galaxyui::clipboard::should_insert_text_on_paste(&content) {
self.insert_clipboard_text_content(ctx, content.clone());
already_inserted_text = true;
}
@@ -9738,7 +9738,7 @@ impl Input {
self.handle_pasted_image_data(content.clone(), ctx) == 0
} else if content.num_paths() > 0 {
// Else, we check the pasted file paths for any images.
let image_filepaths = warpui::clipboard_utils::get_image_filepaths_from_paths(
let image_filepaths = galaxyui::clipboard_utils::get_image_filepaths_from_paths(
content.paths.as_deref().unwrap_or(&[]),
);
let num_images_expected = image_filepaths.len();
@@ -13623,7 +13623,7 @@ impl Input {
..Default::default()
},
)
.with_icon(icon.to_warpui_icon(
.with_icon(icon.to_galaxyui_icon(
blended_colors::text_main(appearance.theme(), appearance.theme().background()).into(),
))
.with_close_button(close_button)
@@ -14108,7 +14108,7 @@ impl View for Input {
}
}
fn keymap_context(&self, app: &AppContext) -> warpui::keymap::Context {
fn keymap_context(&self, app: &AppContext) -> galaxyui::keymap::Context {
let mut ctx = Self::default_keymap_context();
let ai_settings = AISettings::as_ref(app);
app/src/terminal/input/agent.rs
+5 -5
View File
@@ -22,10 +22,10 @@ use crate::{
terminal::{settings::TerminalSettings, view::TerminalAction},
BlocklistAIHistoryModel,
};
use warp_core::settings::Setting;
use warp_core::ui::theme::color::internal_colors;
use warpui::elements::Expanded;
use warpui::{
use galaxy_core::settings::Setting;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::elements::Expanded;
use galaxyui::{
elements::{
Align, AnchorPair, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
DispatchEventResult, DropTarget, Element, EventHandler, Flex, Hoverable, MainAxisSize,
@@ -600,7 +600,7 @@ impl Input {
pub mod styles {
use pathfinder_color::ColorU;
use warp_core::ui::theme::WarpTheme;
use galaxy_core::ui::theme::WarpTheme;
use crate::ui_components::blended_colors;
app/src/terminal/input/buffer_model.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{Entity, ModelContext, ViewHandle};
use galaxyui::{Entity, ModelContext, ViewHandle};
use crate::editor::{self, EditorView, Point};
app/src/terminal/input/classic.rs
+1 -1
View File
@@ -23,7 +23,7 @@ use crate::{
};
use pathfinder_geometry::vector::vec2f;
use settings::Setting;
use warpui::{
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, Clipped, Container, DropTarget, Element, Empty, Flex,
Hoverable, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds,
app/src/terminal/input/cli_agent.rs
+2 -2
View File
@@ -11,11 +11,11 @@ use crate::{
features::FeatureFlag,
terminal::{cli_agent_sessions::CLIAgentSessionsModel, view::TerminalAction},
};
use warp_core::ui::{
use galaxy_core::ui::{
color::{contrast::MinimumAllowedContrast, ContrastingColor},
theme::color::internal_colors,
};
use warpui::{
use galaxyui::{
elements::{
Border, Clipped, ConstrainedBox, Container, DispatchEventResult, DropTarget, Element,
EventHandler, Flex, Hoverable, ParentElement, SavePosition, Stack,
app/src/terminal/input/cloud_mode_v2_history_menu.rs
+5 -5
View File
@@ -1,13 +1,13 @@
use std::collections::HashSet;
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CornerRadius, DropShadow, Radius, Text,
};
use warpui::{
use galaxyui::{
AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, View, ViewContext,
ViewHandle,
};
app/src/terminal/input/common.rs
+7 -7
View File
@@ -18,9 +18,9 @@ use crate::{
};
use pathfinder_geometry::vector::vec2f;
use vim::vim::{VimMode, VimState};
use warp_completer::completer::Description;
use warp_core::features::FeatureFlag;
use warpui::{
use galaxy_completer::completer::Description;
use galaxy_core::features::FeatureFlag;
use galaxyui::{
elements::{
AnchorPair, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DispatchEventResult, Element, EventHandler, Flex, OffsetPositioning,
@@ -54,17 +54,17 @@ pub(super) fn render_vim_status(vim_state: &VimState, appearance: &Appearance) -
let theme = appearance.theme();
let ansi_colors = theme.terminal_colors().bright;
let icon = match vim_state.mode {
VimMode::Normal => Icon::VimNormalMode.to_warpui_icon(ansi_colors.green.into()),
VimMode::Normal => Icon::VimNormalMode.to_galaxyui_icon(ansi_colors.green.into()),
VimMode::Insert => {
use crate::themes::theme::Blend;
Icon::VimInsertMode.to_warpui_icon(
Icon::VimInsertMode.to_galaxyui_icon(
theme
.background()
.blend(&theme.foreground().with_opacity(50)),
)
}
VimMode::Visual(_) => Icon::VimVisualMode.to_warpui_icon(ansi_colors.blue.into()),
VimMode::Replace => Icon::VimReplaceMode.to_warpui_icon(ansi_colors.red.into()),
VimMode::Visual(_) => Icon::VimVisualMode.to_galaxyui_icon(ansi_colors.blue.into()),
VimMode::Replace => Icon::VimReplaceMode.to_galaxyui_icon(ansi_colors.red.into()),
};
Container::new(
Flex::row()
app/src/terminal/input/conversations/data_source.rs
+1 -1
View File
@@ -2,7 +2,7 @@
use itertools::Itertools;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, ModelHandle};
use galaxyui::{AppContext, Entity, ModelHandle};
use crate::ai::blocklist::agent_view::AgentViewController;
use crate::ai::conversation_navigation::ConversationNavigationData;
app/src/terminal/input/conversations/mod.rs
+2 -2
View File
@@ -7,8 +7,8 @@ mod view;
pub use view::{InlineConversationMenuEvent, InlineConversationMenuView};
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warpui::{keymap::Keystroke, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{keymap::Keystroke, SingletonEntity};
use crate::ai::active_agent_views_model::{ActiveAgentViewsModel, ConversationOrTaskId};
use crate::ai::conversation_navigation::ConversationNavigationData;
app/src/terminal/input/conversations/search_item.rs
+10 -10
View File
@@ -2,15 +2,15 @@
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use warpui::fonts::{Properties, Style, Weight};
use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use warpui::scene::{CornerRadius, Radius};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use galaxyui::fonts::{Properties, Style, Weight};
use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use galaxyui::scene::{CornerRadius, Radius};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::ai::active_agent_views_model::{ActiveAgentViewsModel, ConversationOrTaskId};
use crate::ai::agent::conversation::ConversationStatus;
@@ -76,7 +76,7 @@ impl SearchItem for ConversationSearchItem {
.theme()
.sub_text_color(appearance.theme().background());
Container::new(
ConstrainedBox::new(Icon::History.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::History.to_galaxyui_icon(icon_color).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish(),
app/src/terminal/input/conversations/view.rs
+3 -3
View File
@@ -3,8 +3,8 @@
use std::collections::HashSet;
use std::sync::LazyLock;
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, SingletonEntity, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, SingletonEntity, View, ViewContext, ViewHandle};
use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
use crate::ai::blocklist::agent_view::AgentViewController;
@@ -200,7 +200,7 @@ impl View for InlineConversationMenuView {
"InlineConversationMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/decorations.rs
+3 -3
View File
@@ -5,8 +5,8 @@ use std::{collections::HashMap, ops::Range};
use settings::Setting as _;
use string_offset::{ByteOffset, CharOffset};
use warp_core::features::FeatureFlag;
use warpui::{AppContext, SingletonEntity, ViewContext};
use galaxy_core::features::FeatureFlag;
use galaxyui::{AppContext, SingletonEntity, ViewContext};
use crate::{
appearance::Appearance,
@@ -18,7 +18,7 @@ use crate::{
use super::Input;
pub use warp_completer::{
pub use galaxy_completer::{
completer::SuggestionTypeName, util::parse_current_commands_and_tokens, ParsedTokenData,
ParsedTokensSnapshot,
};
app/src/terminal/input/decorations_tests.rs
+3 -3
View File
@@ -1,4 +1,4 @@
use warpui::{text_layout::TextStyle, App};
use galaxyui::{text_layout::TextStyle, App};
use crate::{
appearance::Appearance,
@@ -14,7 +14,7 @@ use crate::{
},
themes::theme::AnsiColorIdentifier,
};
use warp_completer::completer::SuggestionTypeName;
use galaxy_completer::completer::SuggestionTypeName;
#[test]
fn test_decorations_with_multibyte_chars() {
@@ -45,7 +45,7 @@ fn test_decorations_with_multibyte_chars() {
.update(ctx, |sessions, _ctx| {
// Wait until external commands have been loaded.
let session = sessions.get(session_id).expect("session should exist");
warpui::r#async::block_on(session.load_external_commands());
galaxyui::r#async::block_on(session.load_external_commands());
});
session_id
});
app/src/terminal/input/inline_history/data_source.rs
+1 -1
View File
@@ -24,7 +24,7 @@ use crate::terminal::model::session::SessionId;
use chrono::{DateTime, Local};
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, EntityId, ModelHandle, SingletonEntity};
use galaxyui::{AppContext, Entity, EntityId, ModelHandle, SingletonEntity};
#[derive(Clone, Debug)]
pub enum AcceptHistoryItem {
app/src/terminal/input/inline_history/search_item.rs
+11 -11
View File
@@ -9,15 +9,15 @@ use crate::util::time_format::format_approx_duration_from_now_utc;
use chrono::{DateTime, Local};
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use warpui::fonts::{Properties, Weight};
use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use warpui::scene::{CornerRadius, Radius};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use galaxyui::scene::{CornerRadius, Radius};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
#[derive(Debug, Clone)]
pub struct InlineHistoryItem {
@@ -123,7 +123,7 @@ impl SearchItem for InlineHistoryItem {
HistoryItemType::Command { .. } => {
let icon_color = inline_styles::icon_color(appearance);
Container::new(
ConstrainedBox::new(Icon::Terminal.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::Terminal.to_galaxyui_icon(icon_color).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish(),
@@ -138,7 +138,7 @@ impl SearchItem for InlineHistoryItem {
HistoryItemType::AIPrompt { .. } => {
let icon_color = inline_styles::icon_color(appearance);
Container::new(
ConstrainedBox::new(Icon::Prompt.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::Prompt.to_galaxyui_icon(icon_color).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish(),
app/src/terminal/input/inline_history/view.rs
+6 -6
View File
@@ -2,11 +2,11 @@
use std::collections::HashSet;
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use warpui::elements::ChildView;
use warpui::{AppContext, Element, Entity, EntityId, ModelHandle, View, ViewContext, ViewHandle};
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::ChildView;
use galaxyui::{AppContext, Element, Entity, EntityId, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewControllerEvent};
@@ -518,7 +518,7 @@ impl View for InlineHistoryMenuView {
"InlineHistoryMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/inline_menu/message_bar.rs
+5 -5
View File
@@ -1,8 +1,8 @@
use warp_core::ui::appearance::Appearance;
use warpui::elements::Element;
use warpui::prelude::Container;
use warpui::scene::Border;
use warpui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::Element;
use galaxyui::prelude::Container;
use galaxyui::scene::Border;
use galaxyui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewControllerEvent};
use crate::terminal::input::inline_menu::model::InlineMenuModel;
app/src/terminal/input/inline_menu/message_provider.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::marker::PhantomData;
use std::sync::LazyLock;
use warpui::{keymap::Keystroke, AppContext};
use galaxyui::{keymap::Keystroke, AppContext};
use crate::editor::{SELECT_DOWN_ACTION_NAME, SELECT_UP_ACTION_NAME};
use crate::terminal::input::inline_menu::{
app/src/terminal/input/inline_menu/model.rs
+2 -2
View File
@@ -1,7 +1,7 @@
//! Generic model for tracking the selected item in an inline menu.
use std::collections::HashSet;
use warpui::elements::MouseStateHandle;
use warpui::{Entity, ModelContext};
use galaxyui::elements::MouseStateHandle;
use galaxyui::{Entity, ModelContext};
use crate::search::data_source::QueryFilter;
use crate::terminal::input::inline_menu::view::InlineMenuAction;
app/src/terminal/input/inline_menu/positioning.rs
+2 -2
View File
@@ -1,8 +1,8 @@
use super::styles::{HEADER_BORDER, HEADER_ROW_HEIGHT};
use settings::Setting as _;
use std::collections::HashMap;
use warp_core::features::FeatureFlag;
use warpui::{
use galaxy_core::features::FeatureFlag;
use galaxyui::{
units::{IntoPixels, Pixels},
AppContext, Entity, ModelContext, ModelHandle, SingletonEntity, WindowId,
};
app/src/terminal/input/inline_menu/styles.rs
+5 -5
View File
@@ -3,11 +3,11 @@
//! This module provides common styling functions used across all inline menu
//! implementations (models, slash commands, conversations) to ensure consistent
//! visual design matching the Figma specifications.
use warp_core::ui::appearance::Appearance;
use warp_core::ui::color::blend::Blend;
use warp_core::ui::theme::{Fill, WarpTheme};
use warpui::color::ColorU;
use warpui::{AppContext, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::color::blend::Blend;
use galaxy_core::ui::theme::{Fill, WarpTheme};
use galaxyui::color::ColorU;
use galaxyui::{AppContext, SingletonEntity};
use crate::ai::blocklist::agent_view::agent_view_bg_fill;
use crate::search::result_renderer::ItemHighlightState;
app/src/terminal/input/inline_menu/view.rs
+20 -20
View File
@@ -3,30 +3,30 @@ use std::sync::LazyLock;
use itertools::Itertools;
use pathfinder_geometry::vector::vec2f;
use warp_core::features::FeatureFlag;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::color::blend::Blend;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::color::ColorU;
use warpui::elements::{
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::color::blend::Blend;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::color::ColorU;
use galaxyui::elements::{
drag_resize::drag_resize_handle, ChildAnchor, Clipped, DispatchEventResult, DragResizeElement,
DragResizeHandle, EventHandler, Expanded, Hoverable, MainAxisAlignment, MainAxisSize,
MouseInBehavior, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
ParentOffsetBounds, ResizeEndFn, Scrollable, ScrollableElement, ScrollbarWidth,
SizeConstraintCondition, SizeConstraintSwitch, Stack, UniformList, UniformListState,
};
use warpui::fonts::Weight;
use warpui::platform::Cursor;
use warpui::prelude::{
use galaxyui::fonts::Weight;
use galaxyui::platform::Cursor;
use galaxyui::prelude::{
Align, ChildView, ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, SavePosition,
Text,
};
use warpui::scene::{Border, CornerRadius, Radius};
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{elements::ScrollStateHandle, ModelHandle, View};
use warpui::{
use galaxyui::scene::{Border, CornerRadius, Radius};
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{elements::ScrollStateHandle, ModelHandle, View};
use galaxyui::{
Action, AppContext, Element, Entity, SingletonEntity, TypedActionView, ViewContext, ViewHandle,
WeakViewHandle,
};
@@ -117,8 +117,8 @@ impl<A: InlineMenuAction> QueryResultRenderer<A> {
is_selected: bool,
app: &AppContext,
) -> Box<dyn Element> {
use warpui::elements::{DispatchEventResult, EventHandler, Hoverable};
use warpui::platform::Cursor;
use galaxyui::elements::{DispatchEventResult, EventHandler, Hoverable};
use galaxyui::platform::Cursor;
if self.search_result.is_static_separator() {
return self.render_inline_with_highlight_state(ItemHighlightState::Default, true, app);
@@ -175,7 +175,7 @@ impl<A: InlineMenuAction> QueryResultRenderer<A> {
is_static_separator: bool,
app: &AppContext,
) -> Box<dyn Element> {
use warpui::elements::{MainAxisSize, Shrinkable};
use galaxyui::elements::{MainAxisSize, Shrinkable};
let appearance = Appearance::as_ref(app);
let icon = self.search_result.render_icon(highlight_state, appearance);
@@ -811,7 +811,7 @@ impl<A: InlineMenuAction, T: 'static + Send + Sync> InlineMenuView<A, T> {
let drag_indicator = Hoverable::new(self.drag_indicator_mouse_state.clone(), |_| {
ConstrainedBox::new(
Icon::DragIndicator
.to_warpui_icon(Fill::Solid(
.to_galaxyui_icon(Fill::Solid(
theme.disabled_text_color(header_bg.into()).into_solid(),
))
.finish(),
@@ -914,7 +914,7 @@ impl<A: InlineMenuAction, T: 'static + Send + Sync> InlineMenuView<A, T> {
ScrollbarWidth::Auto,
theme.nonactive_ui_detail().into(),
theme.active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.with_overlayed_scrollbar()
.finish();
app/src/terminal/input/message_bar/attached_context.rs
+2 -2
View File
@@ -1,7 +1,7 @@
//! Shared message producers for displaying attached blocks/text context.
use warp_core::features::FeatureFlag;
use warpui::keymap::Keystroke;
use galaxy_core::features::FeatureFlag;
use galaxyui::keymap::Keystroke;
use crate::ai::blocklist::agent_view::{AgentMessageBarMouseStates, AgentViewController};
use crate::ai::blocklist::{BlocklistAIContextModel, BlocklistAIInputModel};
app/src/terminal/input/message_bar/common.rs
+15 -15
View File
@@ -1,16 +1,16 @@
use crate::ai::blocklist::agent_view::agent_view_bg_color;
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{
Border, CacheOption, Clipped, Container, CornerRadius, Element, Hoverable, Image,
ParentElement, Radius,
};
use warpui::platform::Cursor;
use warpui::prelude::{Align, ConstrainedBox, CrossAxisAlignment, Flex, Text};
use warpui::ui_components::keyboard_shortcut::keystroke_to_keys;
use warpui::{AppContext, SingletonEntity};
use galaxyui::platform::Cursor;
use galaxyui::prelude::{Align, ConstrainedBox, CrossAxisAlignment, Flex, Text};
use galaxyui::ui_components::keyboard_shortcut::keystroke_to_keys;
use galaxyui::{AppContext, SingletonEntity};
use crate::ai::blocklist::agent_view::shortcuts::render_keystroke_with_color_overrides;
use crate::terminal;
@@ -29,7 +29,7 @@ pub fn render_standard_message_bar(
right_element: Option<Box<dyn Element>>,
app: &AppContext,
) -> Box<dyn Element> {
use warpui::prelude::{MainAxisAlignment, MainAxisSize};
use galaxyui::prelude::{MainAxisAlignment, MainAxisSize};
let (left_items, right_chips): (Vec<_>, Vec<_>) = message.items.into_iter().partition(|item| {
!matches!(
@@ -145,7 +145,7 @@ fn render_message_bar_items(items: &[MessageItem], app: &AppContext) -> Box<dyn
}
MessageItem::Icon { icon, color } => {
let icon_color = color.unwrap_or(default_font_color);
ConstrainedBox::new(icon.to_warpui_icon(Fill::Solid(icon_color)).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
.with_height(styles::font_size(app))
.with_width(styles::font_size(app))
.finish()
@@ -284,7 +284,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
let rendered_key = if key_text == "⏎" {
ConstrainedBox::new(
Icon::CornerDownLeft
.to_warpui_icon(Fill::Solid(keystroke_color))
.to_galaxyui_icon(Fill::Solid(keystroke_color))
.finish(),
)
.with_height(icon_size)
@@ -293,7 +293,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
} else if key_text == "⇧" {
ConstrainedBox::new(
Icon::ArrowBlockUp
.to_warpui_icon(Fill::Solid(keystroke_color))
.to_galaxyui_icon(Fill::Solid(keystroke_color))
.finish(),
)
.with_height(icon_size)
@@ -349,7 +349,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
}
MessageItem::Icon { icon, color } => {
let icon_color = color.unwrap_or(default_text_color);
ConstrainedBox::new(icon.to_warpui_icon(Fill::Solid(icon_color)).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
.with_height(icon_size)
.with_width(icon_size)
.finish()
@@ -469,8 +469,8 @@ pub fn disableable_message_item_color_overrides(
pub mod styles {
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warpui::{AppContext, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{AppContext, SingletonEntity};
use crate::ui_components::blended_colors;
app/src/terminal/input/message_bar/mod.rs
+5 -5
View File
@@ -6,11 +6,11 @@ use std::borrow::Cow;
use std::sync::Arc;
use pathfinder_color::ColorU;
use warp_core::ui::Icon;
use warpui::assets::asset_cache::AssetSource;
use warpui::elements::MouseStateHandle;
use warpui::keymap::Keystroke;
use warpui::EventContext;
use galaxy_core::ui::Icon;
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::elements::MouseStateHandle;
use galaxyui::keymap::Keystroke;
use galaxyui::EventContext;
/// A trait for types that can produce a message based on some contextual arguments.
///
/// The generic `Args` parameter allows each call site to define its own
app/src/terminal/input/message_bar/mod_tests.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use warp_core::ui::Icon;
use warpui::assets::asset_cache::AssetSource;
use warpui::elements::MouseStateHandle;
use galaxy_core::ui::Icon;
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::elements::MouseStateHandle;
use super::{ChipHorizontalAlignment, MessageItem};
app/src/terminal/input/models/data_source.rs
+20 -20
View File
@@ -2,20 +2,20 @@ use fuzzy_match::{match_indices_case_insensitive, FuzzyMatchResult};
use itertools::Itertools;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use ordered_float::OrderedFloat;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::icons::Icon;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::icons::Icon;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
ConstrainedBox, Container, CornerRadius, FormattedTextElement, Highlight, HighlightedHyperlink,
MouseStateHandle, Radius, Text,
};
use warpui::fonts::{Properties, Style, Weight};
use warpui::platform::Cursor;
use warpui::text_layout::ClipConfig;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{AppContext, Element, Entity, EntityId, SingletonEntity as _};
use galaxyui::fonts::{Properties, Style, Weight};
use galaxyui::platform::Cursor;
use galaxyui::text_layout::ClipConfig;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{AppContext, Element, Entity, EntityId, SingletonEntity as _};
use crate::ai::llms::{
is_using_api_key_for_provider, DisableReason, LLMId, LLMInfo, LLMPreferences, LLMProvider,
@@ -35,8 +35,8 @@ use crate::terminal::input::inline_menu::{styles as inline_styles, DetailsRender
use crate::terminal::input::message_bar::{Message, MessageItem};
use crate::workspace::WorkspaceAction;
use crate::workspaces::user_workspaces::UserWorkspaces;
use warpui::keymap::Keystroke;
use warpui::platform::OperatingSystem;
use galaxyui::keymap::Keystroke;
use galaxyui::platform::OperatingSystem;
use super::model_spec_scores::{
render_model_spec_header, render_model_spec_scores, CostRow, ModelSpecScoresLayout,
@@ -273,7 +273,7 @@ impl SearchItem for ModelSearchItem {
let icon = self
.provider_icon
.unwrap_or(Icon::Oz)
.to_warpui_icon(icon_color)
.to_galaxyui_icon(icon_color)
.finish();
Container::new(
@@ -291,8 +291,8 @@ impl SearchItem for ModelSearchItem {
_highlight_state: ItemHighlightState,
app: &AppContext,
) -> Box<dyn Element> {
use warpui::elements::{Flex, ParentElement as _};
use warpui::prelude::CrossAxisAlignment;
use galaxyui::elements::{Flex, ParentElement as _};
use galaxyui::prelude::CrossAxisAlignment;
let appearance = crate::appearance::Appearance::as_ref(app);
let theme = appearance.theme();
@@ -332,7 +332,7 @@ impl SearchItem for ModelSearchItem {
if is_using_api_key_for_provider(&self.provider, app) {
let key_icon =
ConstrainedBox::new(Icon::Key.to_warpui_icon(secondary_text_color).finish())
ConstrainedBox::new(Icon::Key.to_galaxyui_icon(secondary_text_color).finish())
.with_width(font_size)
.with_height(font_size)
.finish();
@@ -412,7 +412,7 @@ impl SearchItem for ModelSearchItem {
}
fn render_details(&self, app: &AppContext) -> Option<Box<dyn Element>> {
use warpui::elements::{Flex, ParentElement as _};
use galaxyui::elements::{Flex, ParentElement as _};
let appearance = crate::appearance::Appearance::as_ref(app);
let theme = appearance.theme();
@@ -528,10 +528,10 @@ impl SearchItem for ModelSearchItem {
.with_hyperlink_font_color(theme.accent().into_solid())
.register_default_click_handlers_with_action_support(|hyperlink_lens, event, ctx| {
match hyperlink_lens {
warpui::elements::HyperlinkLens::Url(url) => {
galaxyui::elements::HyperlinkLens::Url(url) => {
ctx.open_url(url);
}
warpui::elements::HyperlinkLens::Action(action_ref) => {
galaxyui::elements::HyperlinkLens::Action(action_ref) => {
if let Some(action) = action_ref.as_any().downcast_ref::<WorkspaceAction>()
{
event.dispatch_typed_action(action.clone());
app/src/terminal/input/models/model_spec_scores.rs
+5 -5
View File
@@ -1,12 +1,12 @@
use pathfinder_color::ColorU;
use warp_core::ui::theme::color::internal_colors;
use warpui::elements::{
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::elements::{
Border, ConstrainedBox, Container, CornerRadius, Expanded, Flex, MainAxisAlignment,
MainAxisSize, ParentElement as _, Percentage, Radius, Rect, Stack, Text,
};
use warpui::prelude::{Align, CrossAxisAlignment};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity as _};
use galaxyui::prelude::{Align, CrossAxisAlignment};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity as _};
use crate::ai::llms::LLMSpec;
use crate::appearance::Appearance;
app/src/terminal/input/models/view.rs
+6 -6
View File
@@ -2,11 +2,11 @@ use std::collections::HashSet;
use std::sync::LazyLock;
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use warpui::elements::{ChildView, MainAxisSize};
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{ChildView, MainAxisSize};
use galaxyui::{
AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity as _, View, ViewContext,
ViewHandle,
};
@@ -488,7 +488,7 @@ impl View for InlineModelSelectorView {
"InlineModelSelectorView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/plans/data_source.rs
+1 -1
View File
@@ -3,7 +3,7 @@
use fuzzy_match::match_indices_case_insensitive;
use itertools::Itertools;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, SingletonEntity};
use galaxyui::{AppContext, Entity, SingletonEntity};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::document::ai_document_model::AIDocumentModel;
app/src/terminal/input/plans/mod.rs
+1 -1
View File
@@ -6,7 +6,7 @@ mod view;
pub use view::{InlinePlanMenuEvent, InlinePlanMenuView};
use ai::document::AIDocumentId;
use warpui::keymap::Keystroke;
use galaxyui::keymap::Keystroke;
use crate::ai::document::ai_document_model::AIDocumentVersion;
use crate::terminal::input::inline_menu::{
app/src/terminal/input/plans/search_item.rs
+8 -8
View File
@@ -3,13 +3,13 @@
use ai::document::AIDocumentId;
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use warpui::fonts::{Properties, Weight};
use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::ai::document::ai_document_model::{AIDocument, AIDocumentVersion};
use crate::appearance::Appearance;
@@ -68,7 +68,7 @@ impl SearchItem for PlanSearchItem {
.sub_text_color(appearance.theme().background());
let icon = Container::new(
ConstrainedBox::new(Icon::Compass.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::Compass.to_galaxyui_icon(icon_color).finish())
.with_width(ICON_SIZE)
.with_height(ICON_SIZE)
.finish(),
app/src/terminal/input/plans/view.rs
+3 -3
View File
@@ -1,8 +1,8 @@
//! Inline plan menu view for selecting among multiple AI document plans.
use ai::document::AIDocumentId;
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::blocklist::agent_view::AgentViewController;
@@ -141,7 +141,7 @@ impl View for InlinePlanMenuView {
"InlinePlanMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/profiles/data_source.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use fuzzy_match::match_indices_case_insensitive;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, EntityId, SingletonEntity};
use galaxyui::{AppContext, Entity, EntityId, SingletonEntity};
use crate::ai::execution_profiles::profiles::{AIExecutionProfilesModel, ClientProfileId};
use crate::cloud_object::model::generic_string_model::StringModel;
app/src/terminal/input/profiles/search_item.rs
+8 -8
View File
@@ -1,12 +1,12 @@
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Flex, Highlight, ParentElement as _, Text};
use warpui::fonts::{Properties, Style, Weight};
use warpui::prelude::CrossAxisAlignment;
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity as _};
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Flex, Highlight, ParentElement as _, Text};
use galaxyui::fonts::{Properties, Style, Weight};
use galaxyui::prelude::CrossAxisAlignment;
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity as _};
use crate::ai::execution_profiles::profiles::ClientProfileId;
use crate::appearance::Appearance;
@@ -81,7 +81,7 @@ impl SearchItem for ProfileSearchItem {
ProfileSearchItemKind::Profile { .. } => Icon::Psychology,
ProfileSearchItemKind::ManageProfiles => Icon::Gear,
}
.to_warpui_icon(inline_styles::icon_color(appearance));
.to_galaxyui_icon(inline_styles::icon_color(appearance));
Container::new(
ConstrainedBox::new(icon.finish())
app/src/terminal/input/profiles/view.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use warpui::elements::ChildView;
use warpui::{
use galaxyui::elements::ChildView;
use galaxyui::{
Element, Entity, EntityId, ModelHandle, SingletonEntity as _, View, ViewContext, ViewHandle,
};
@@ -210,7 +210,7 @@ impl View for InlineProfileSelectorView {
"InlineProfileSelectorView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/prompts/data_source.rs
+7 -7
View File
@@ -1,10 +1,10 @@
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::icons::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, Text};
use warpui::fonts::{Properties, Weight};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, Entity, ModelContext, ModelHandle, SingletonEntity as _};
use galaxy_core::ui::icons::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, Text};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, Entity, ModelContext, ModelHandle, SingletonEntity as _};
use crate::appearance::Appearance;
use crate::cloud_object::model::persistence::CloudModel;
@@ -164,7 +164,7 @@ impl SearchItem for PromptSearchItem {
let icon_color = inline_styles::icon_color(appearance);
let icon_size = inline_styles::font_size(appearance);
let icon = Icon::Prompt.to_warpui_icon(icon_color).finish();
let icon = Icon::Prompt.to_galaxyui_icon(icon_color).finish();
Container::new(
ConstrainedBox::new(icon)
@@ -209,7 +209,7 @@ impl SearchItem for PromptSearchItem {
&self,
highlight_state: ItemHighlightState,
appearance: &Appearance,
) -> Option<warp_core::ui::theme::Fill> {
) -> Option<galaxy_core::ui::theme::Fill> {
inline_styles::item_background(highlight_state, appearance)
}
app/src/terminal/input/prompts/view.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::blocklist::agent_view::AgentViewController;
use crate::search::data_source::Query;
@@ -119,7 +119,7 @@ impl View for InlinePromptsMenuView {
"InlinePromptsMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/repos/data_source.rs
+1 -1
View File
@@ -2,7 +2,7 @@
use std::path::PathBuf;
use warpui::{AppContext, Entity, SingletonEntity};
use galaxyui::{AppContext, Entity, SingletonEntity};
use crate::ai::persisted_workspace::PersistedWorkspace;
use crate::search::data_source::{Query, QueryResult};
app/src/terminal/input/repos/mod.rs
+1 -1
View File
@@ -8,7 +8,7 @@ pub use view::{InlineReposMenuEvent, InlineReposMenuView};
use std::path::PathBuf;
use warpui::keymap::Keystroke;
use galaxyui::keymap::Keystroke;
use crate::terminal::input::inline_menu::{
default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuRowAction,
app/src/terminal/input/repos/search_item.rs
+7 -7
View File
@@ -4,12 +4,12 @@ use std::path::{Path, PathBuf};
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::theme::{AnsiColorIdentifier, Fill};
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, Text};
use warpui::fonts::{Properties, Weight};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, Text};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::appearance::Appearance;
use crate::search::result_renderer::ItemHighlightState;
@@ -62,7 +62,7 @@ impl SearchItem for RepoSearchItem {
let icon_size = inline_styles::font_size(appearance);
let icon_color = inline_styles::icon_color(appearance);
let icon = ConstrainedBox::new(Icon::Folder.to_warpui_icon(icon_color).finish())
let icon = ConstrainedBox::new(Icon::Folder.to_galaxyui_icon(icon_color).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish();
app/src/terminal/input/repos/view.rs
+3 -3
View File
@@ -3,8 +3,8 @@
use std::collections::HashSet;
use std::path::PathBuf;
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::blocklist::agent_view::AgentViewController;
use crate::search::data_source::{Query, QueryFilter};
@@ -145,7 +145,7 @@ impl View for InlineReposMenuView {
"InlineReposMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/rewind/data_source.rs
+1 -1
View File
@@ -5,7 +5,7 @@ use std::collections::HashSet;
use ai::agent::action_result::RequestFileEditsResult;
use itertools::Itertools;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, SingletonEntity};
use galaxyui::{AppContext, Entity, SingletonEntity};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::agent::{AIAgentActionResultType, AIAgentExchangeId, AIAgentInput};
app/src/terminal/input/rewind/mod.rs
+1 -1
View File
@@ -8,7 +8,7 @@ mod view;
pub use data_source::SelectRewindPoint;
pub use view::{RewindMenuEvent, RewindMenuView};
use warpui::keymap::Keystroke;
use galaxyui::keymap::Keystroke;
use crate::terminal::input::inline_menu::{
default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuType,
app/src/terminal/input/rewind/search_item.rs
+10 -10
View File
@@ -3,16 +3,16 @@
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, ParentElement, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::scene::{CornerRadius, Radius};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::scene::{CornerRadius, Radius};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::ai::agent::AIAgentExchangeId;
use crate::appearance::Appearance;
@@ -93,7 +93,7 @@ impl SearchItem for RewindSearchItem {
let color = icon_color(appearance);
let icon = Container::new(
ConstrainedBox::new(Icon::ClockRewind.to_warpui_icon(color).finish())
ConstrainedBox::new(Icon::ClockRewind.to_galaxyui_icon(color).finish())
.with_width(appearance.monospace_font_size())
.with_height(appearance.monospace_font_size())
.finish(),
@@ -135,7 +135,7 @@ impl SearchItem for RewindSearchItem {
}
// Line 2: Code changes summary
let secondary_text_color: warpui::color::ColorU =
let secondary_text_color: galaxyui::color::ColorU =
theme.sub_text_color(theme.surface_1()).into();
let changes_element: Box<dyn Element> = if self.is_current {
app/src/terminal/input/rewind/view.rs
+3 -3
View File
@@ -1,7 +1,7 @@
//! View for the rewind menu.
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::agent::AIAgentExchangeId;
@@ -138,7 +138,7 @@ impl View for RewindMenuView {
"RewindMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/skills/data_source.rs
+10 -10
View File
@@ -3,16 +3,16 @@ use std::path::PathBuf;
use ai::skills::{SkillProvider, SkillReference, SkillScope};
use fuzzy_match::{match_indices_case_insensitive, FuzzyMatchResult};
use ordered_float::OrderedFloat;
use warp_core::ui::icons::Icon;
use warp_core::ui::theme::Fill;
use warpui::elements::{
use galaxy_core::ui::icons::Icon;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, ParentElement, Shrinkable, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::Keystroke;
use warpui::scene::{CornerRadius, Radius};
use warpui::text_layout::ClipConfig;
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::keymap::Keystroke;
use galaxyui::scene::{CornerRadius, Radius};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{
AppContext, Element, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity as _,
};
@@ -266,11 +266,11 @@ impl SearchItem for SkillSearchItem {
// Use icon_override if set (e.g. Figma skills), otherwise derive from provider.
let icon = if let Some(override_icon) = self.icon_override {
override_icon.to_warpui_icon(icon_color).finish()
override_icon.to_galaxyui_icon(icon_color).finish()
} else {
self.provider
.icon()
.to_warpui_icon(self.provider.icon_fill(icon_color))
.to_galaxyui_icon(self.provider.icon_fill(icon_color))
.finish()
};
app/src/terminal/input/skills/view.rs
+4 -4
View File
@@ -1,6 +1,6 @@
use ai::skills::SkillReference;
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::blocklist::agent_view::AgentViewController;
use crate::search::data_source::Query;
@@ -14,7 +14,7 @@ use crate::terminal::input::suggestions_mode_model::{
InputSuggestionsModeEvent, InputSuggestionsModeModel,
};
use crate::terminal::model::session::active_session::ActiveSession;
use warpui::EntityId;
use galaxyui::EntityId;
#[derive(Debug, Clone)]
pub enum InlineSkillSelectorEvent {
@@ -156,7 +156,7 @@ impl View for InlineSkillSelectorView {
"InlineSkillSelectorView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/slash_command_model.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use ai::skills::SkillReference;
use input_classifier::InputType;
use warp_core::features::FeatureFlag;
use warpui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
use galaxy_core::features::FeatureFlag;
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
use crate::ai::blocklist::{BlocklistAIInputEvent, BlocklistAIInputModel};
use crate::ai::skills::SkillManager;
app/src/terminal/input/slash_command_model_tests.rs
+1 -1
View File
@@ -4,7 +4,7 @@ use crate::search::slash_command_menu::static_commands::commands;
use crate::settings::AISettings;
use crate::terminal::input::tests::{add_window_with_bootstrapped_terminal, initialize_app};
use settings::Setting as _;
use warpui::{App, SingletonEntity as _};
use galaxyui::{App, SingletonEntity as _};
#[test]
fn test_parse_slash_command_handles_argument_rules() {
app/src/terminal/input/slash_commands/data_source/mod.rs
+6 -6
View File
@@ -3,7 +3,7 @@ mod zero_state;
use ai::skills::SkillProvider;
pub(crate) use saved_prompts::*;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
pub use zero_state::*;
use std::collections::HashMap;
@@ -11,9 +11,9 @@ use std::path::PathBuf;
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::appearance::Appearance;
use warpui::fonts::FamilyId;
use warpui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::fonts::FamilyId;
use galaxyui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
use crate::ai::blocklist::BlocklistAIHistoryModel;
use crate::ai::skills::{SkillDescriptor, SkillManager};
@@ -25,7 +25,7 @@ use crate::terminal::cli_agent_sessions::{
CLIAgentInputState, CLIAgentSessionsModel, CLIAgentSessionsModelEvent,
};
use crate::terminal::model::session::SessionType;
use warp_core::ui::Icon as WarpIcon;
use galaxy_core::ui::Icon as WarpIcon;
use super::AcceptSlashCommandOrSavedPrompt;
use crate::{
@@ -279,7 +279,7 @@ impl SyncDataSource for SlashCommandDataSource {
fn run_query(
&self,
query: &Query,
app: &warpui::AppContext,
app: &galaxyui::AppContext,
) -> Result<Vec<QueryResult<Self::Action>>, DataSourceRunErrorWrapper> {
if query.text.is_empty() {
return Ok(vec![]);
app/src/terminal/input/slash_commands/data_source/saved_prompts.rs
+3 -3
View File
@@ -2,9 +2,9 @@ use std::sync::Arc;
use futures_lite::future::yield_now;
use ordered_float::OrderedFloat;
use warp_core::ui::appearance::Appearance;
use warpui::fonts::FamilyId;
use warpui::{AppContext, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::fonts::FamilyId;
use galaxyui::{AppContext, SingletonEntity};
use crate::cloud_object::model::persistence::CloudModel;
use crate::cloud_object::CloudObject;
app/src/terminal/input/slash_commands/data_source/saved_prompts_tests.rs
+1 -1
View File
@@ -7,7 +7,7 @@ use ordered_float::OrderedFloat;
use super::{fuzzy_match_saved_prompts, SavedPromptCandidate, SavedPromptsSnapshot};
const TEST_FONT_FAMILY: warpui::fonts::FamilyId = warpui::fonts::FamilyId(0);
const TEST_FONT_FAMILY: galaxyui::fonts::FamilyId = galaxyui::fonts::FamilyId(0);
fn test_candidate(name: &str, query: &str) -> SavedPromptCandidate {
SavedPromptCandidate {
app/src/terminal/input/slash_commands/data_source/zero_state.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use itertools::Itertools;
use warpui::{Entity, ModelHandle};
use galaxyui::{Entity, ModelHandle};
use crate::search::data_source::{Query, QueryResult};
use crate::search::mixer::DataSourceRunErrorWrapper;
@@ -31,7 +31,7 @@ impl SyncDataSource for ZeroStateDataSource {
fn run_query(
&self,
query: &Query,
app: &warpui::AppContext,
app: &galaxyui::AppContext,
) -> Result<Vec<QueryResult<Self::Action>>, DataSourceRunErrorWrapper> {
if !query.text.is_empty() {
return Ok(vec![]);
app/src/terminal/input/slash_commands/mod.rs
+6 -6
View File
@@ -6,11 +6,11 @@ pub use data_source::*;
pub use view::*;
use ai::skills::SkillReference;
use warp_core::features::FeatureFlag;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::appearance::Appearance;
use warpui::clipboard::ClipboardContent;
use warpui::{SingletonEntity, ViewContext};
use galaxy_core::features::FeatureFlag;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::clipboard::ClipboardContent;
use galaxyui::{SingletonEntity, ViewContext};
use crate::ai::blocklist::agent_view::{
AgentViewEntryOrigin, DismissalStrategy, EphemeralMessage, ENTER_OR_EXIT_CONFIRMATION_WINDOW,
@@ -451,7 +451,7 @@ impl Input {
match argument {
Some(args) if !args.is_empty() => {
use shellexpand::tilde;
use warp_util::path::CleanPathResult;
use galaxy_util::path::CleanPathResult;
let Some(session_id) = self.active_block_session_id() else {
return false;
app/src/terminal/input/slash_commands/search_item.rs
+6 -6
View File
@@ -1,10 +1,10 @@
use ordered_float::OrderedFloat;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warpui::elements::{Expanded, Highlight, Icon, ParentElement, Shrinkable};
use warpui::fonts::{Properties, Weight};
use warpui::prelude::{ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, Text};
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{Expanded, Highlight, Icon, ParentElement, Shrinkable};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::prelude::{ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, Text};
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::ai::blocklist::agent_view::shortcuts::render_keystroke_with_color_overrides;
use crate::search::slash_command_menu::static_commands::commands::COMMAND_REGISTRY;
app/src/terminal/input/slash_commands/view.rs
+4 -4
View File
@@ -2,9 +2,9 @@ use std::collections::HashSet;
use ai::skills::SkillReference;
use lazy_static::lazy_static;
use warpui::elements::ChildView;
use warpui::{AppContext, Element, ViewContext};
use warpui::{Entity, ModelHandle, View, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{AppContext, Element, ViewContext};
use galaxyui::{Entity, ModelHandle, View, ViewHandle};
use crate::ai::blocklist::agent_view::AgentViewController;
use crate::search::data_source::{Query, QueryFilter};
@@ -268,7 +268,7 @@ impl View for InlineSlashCommandView {
"InlineSlashCommandView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input/suggestions_mode_menu.rs
+3 -3
View File
@@ -19,13 +19,13 @@ use crate::input_suggestions::{
LABEL_PADDING as InputSuggestionsLabelPadding,
};
use crate::themes::theme::WarpTheme;
use warpui::elements::{
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DragBarSide,
DropShadow, Element, Empty, Flex, ParentElement, Radius, Resizable, Shrinkable,
SizeConstraintCondition, SizeConstraintSwitch, Text,
};
use warpui::presenter::ChildView;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::presenter::ChildView;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
enum SuggestionsResizeConfig {
WidthAndHeight,
app/src/terminal/input/suggestions_mode_model.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{Entity, ModelContext, ModelHandle};
use galaxyui::{Entity, ModelContext, ModelHandle};
use crate::ai::agent::conversation::AIConversationId;
use crate::terminal::input::buffer_model::InputBufferModel;
app/src/terminal/input/terminal.rs
+3 -3
View File
@@ -17,8 +17,8 @@ use crate::{
settings::TerminalSettings, view::TerminalAction,
},
};
use warp_core::settings::Setting;
use warpui::{
use galaxy_core::settings::Setting;
use galaxyui::{
elements::{
Border, Clipped, Container, DropTarget, Element, Flex, Hoverable, ParentElement,
SavePosition, Stack,
@@ -299,7 +299,7 @@ impl Input {
pub mod styles {
use pathfinder_color::ColorU;
use warp_core::ui::theme::WarpTheme;
use galaxy_core::ui::theme::WarpTheme;
pub fn default_border_color(theme: &WarpTheme) -> ColorU {
theme.outline().into()
app/src/terminal/input/terminal_message_bar.rs
+4 -4
View File
@@ -2,10 +2,10 @@ use std::sync::Arc;
use parking_lot::FairMutex;
use pathfinder_color::ColorU;
use warp_core::ui::theme::WarpTheme;
use warpui::elements::{Container, Element};
use warpui::keymap::Keystroke;
use warpui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
use galaxy_core::ui::theme::WarpTheme;
use galaxyui::elements::{Container, Element};
use galaxyui::keymap::Keystroke;
use galaxyui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
use super::buffer_model::InputBufferModel;
use super::message_bar::{
app/src/terminal/input/universal.rs
+1 -1
View File
@@ -13,7 +13,7 @@ use crate::{
themes::theme::color::internal_colors,
};
use settings::Setting;
use warpui::{
use galaxyui::{
elements::{
Border, ChildView, Container, CornerRadius, DropTarget, Element, Flex, Hoverable,
ParentElement, Radius, SavePosition, Stack,
app/src/terminal/input/user_query/data_source.rs
+1 -1
View File
@@ -2,7 +2,7 @@
use itertools::Itertools;
use ordered_float::OrderedFloat;
use warpui::{AppContext, Entity, SingletonEntity};
use galaxyui::{AppContext, Entity, SingletonEntity};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::agent::AIAgentExchangeId;
app/src/terminal/input/user_query/mod.rs
+2 -2
View File
@@ -8,8 +8,8 @@ mod view;
pub use data_source::SelectUserQuery;
pub use view::{UserQueryMenuEvent, UserQueryMenuView};
use warpui::keymap::Keystroke;
use warpui::platform::OperatingSystem;
use galaxyui::keymap::Keystroke;
use galaxyui::platform::OperatingSystem;
use crate::terminal::input::inline_menu::{
default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuRowAction,
app/src/terminal/input/user_query/search_item.rs
+9 -9
View File
@@ -2,14 +2,14 @@
use fuzzy_match::FuzzyMatchResult;
use ordered_float::OrderedFloat;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::Fill;
use warp_core::ui::Icon;
use warpui::elements::{ConstrainedBox, Container, Highlight, Shrinkable, Text};
use warpui::fonts::{Properties, Weight};
use warpui::scene::{CornerRadius, Radius};
use warpui::text_layout::ClipConfig;
use warpui::{AppContext, Element, SingletonEntity};
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::Fill;
use galaxy_core::ui::Icon;
use galaxyui::elements::{ConstrainedBox, Container, Highlight, Shrinkable, Text};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::scene::{CornerRadius, Radius};
use galaxyui::text_layout::ClipConfig;
use galaxyui::{AppContext, Element, SingletonEntity};
use crate::ai::agent::AIAgentExchangeId;
use crate::appearance::Appearance;
@@ -65,7 +65,7 @@ impl SearchItem for UserQuerySearchItem {
// Once this search item is used by multiple sources,
// we'll want to set this icon based on which source is generating this item.
let icon = Container::new(
ConstrainedBox::new(Icon::ArrowSplit.to_warpui_icon(color).finish())
ConstrainedBox::new(Icon::ArrowSplit.to_galaxyui_icon(color).finish())
.with_width(appearance.monospace_font_size())
.with_height(appearance.monospace_font_size())
.finish(),
app/src/terminal/input/user_query/view.rs
+3 -3
View File
@@ -1,7 +1,7 @@
//! View for the user query menu.
use warpui::elements::ChildView;
use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use galaxyui::elements::ChildView;
use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::agent::AIAgentExchangeId;
@@ -148,7 +148,7 @@ impl View for UserQueryMenuView {
"UserQueryMenuView"
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
ChildView::new(&self.menu_view).finish()
}
}
app/src/terminal/input_test.rs
+6 -6
View File
@@ -60,7 +60,7 @@ use crate::terminal::model::session::{BootstrapSessionType, SessionInfo};
use crate::terminal::model::terminal_model::BlockIndex;
use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
use chrono::Local;
use warpui::text::SelectionType;
use galaxyui::text::SelectionType;
use crate::terminal::shell::ShellType;
use crate::test_util::settings::initialize_settings_for_tests;
@@ -74,22 +74,22 @@ use crate::{experiments, AgentNotificationsModel};
use fuzzy_match::FuzzyMatchResult;
use session_sharing_protocol::common::Role;
use smol_str::SmolStr;
use warp_completer::completer::{
use galaxy_completer::completer::{
EngineFileType, Match, MatchStrategy, MatchedSuggestion, Priority, Suggestion,
SuggestionResults, SuggestionType,
};
use warp_completer::meta::Span;
use galaxy_completer::meta::Span;
use unindent::Unindent;
#[cfg(feature = "voice_input")]
use voice_input::VoiceInputToggledFrom;
use warpui::platform::WindowStyle;
use warpui::{App, ReadModel, UpdateView};
use galaxyui::platform::WindowStyle;
use galaxyui::{App, ReadModel, UpdateView};
use crate::terminal::universal_developer_input::UniversalDeveloperInputButtonBarEvent;
use warp_util::user_input::UserInput;
use galaxy_util::user_input::UserInput;
use workflows::workflow::{Argument, ArgumentType, Workflow};
use crate::context_chips::prompt::Prompt;

Some files were not shown because too many files have changed in this diff Show More