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/view/action.rs
+6 -6
View File
@@ -8,11 +8,11 @@ use command_corrections::Correction;
use pathfinder_geometry::vector::Vector2F;
use session_sharing_protocol::common::Role;
use session_sharing_protocol::sharer::RoleUpdateReason;
use warp_util::user_input::UserInput;
use warpui::elements::HyperlinkUrl;
use warpui::event::ModifiersState;
use warpui::units::Lines;
use warpui::EntityId;
use galaxy_util::user_input::UserInput;
use galaxyui::elements::HyperlinkUrl;
use galaxyui::event::ModifiersState;
use galaxyui::units::Lines;
use galaxyui::EntityId;
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::agent::AIAgentExchangeId;
@@ -281,7 +281,7 @@ pub enum TerminalAction {
OpenCodeInWarp {
path: PathBuf,
layout: crate::util::file::external_editor::settings::EditorLayout,
line_col: Option<warp_util::path::LineAndColumnArg>,
line_col: Option<galaxy_util::path::LineAndColumnArg>,
},
OpenWorkflowModal,
OpenWorkflowModalForAIWorkflow(Workflow),
app/src/terminal/view/agent_view.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_core::{features::FeatureFlag, send_telemetry_from_ctx, ui::appearance::Appearance};
use warpui::{keymap::Keystroke, EntityId, SingletonEntity, ViewContext};
use galaxy_core::{features::FeatureFlag, send_telemetry_from_ctx, ui::appearance::Appearance};
use galaxyui::{keymap::Keystroke, EntityId, SingletonEntity, ViewContext};
use crate::{
ai::{
app/src/terminal/view/ambient_agent/block.rs
+2 -2
View File
@@ -8,8 +8,8 @@ pub use query::*;
pub use setup_command::*;
pub use setup_command_text::*;
use warpui::prelude::Container;
use warpui::{AppContext, Element, ModelHandle};
use galaxyui::prelude::Container;
use galaxyui::{AppContext, Element, ModelHandle};
use crate::ai::blocklist::block::view_impl::{
WithContentItemSpacing, CONTENT_ITEM_VERTICAL_MARGIN,
app/src/terminal/view/ambient_agent/block/entry.rs
+9 -9
View File
@@ -1,9 +1,9 @@
use settings::Setting;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::{appearance::Appearance, Icon};
use warpui::prelude::Empty;
use warpui::AppContext;
use warpui::{
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::{appearance::Appearance, Icon};
use galaxyui::prelude::Empty;
use galaxyui::AppContext;
use galaxyui::{
elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, Hoverable, MainAxisSize,
MouseStateHandle, ParentElement, Shrinkable, Text,
@@ -132,7 +132,7 @@ impl AmbientAgentEntryBlock {
&self,
appearance: &Appearance,
app: &AppContext,
) -> Box<dyn warpui::Element> {
) -> Box<dyn galaxyui::Element> {
let theme = appearance.theme();
let view_model = self.ambient_agent_view_model(app);
@@ -155,7 +155,7 @@ impl AmbientAgentEntryBlock {
};
Container::new(
ConstrainedBox::new(icon.to_warpui_icon(color.into()).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(color.into()).finish())
.with_width(STATUS_ICON_SIZE)
.with_height(STATUS_ICON_SIZE)
.finish(),
@@ -191,7 +191,7 @@ impl View for AmbientAgentEntryBlock {
)
.with_color(theme.main_text_color(theme.background()).into_solid())
.with_style(Properties {
weight: warpui::fonts::Weight::Bold,
weight: galaxyui::fonts::Weight::Bold,
..Default::default()
})
.soft_wrap(false)
@@ -232,7 +232,7 @@ impl View for AmbientAgentEntryBlock {
.with_child(
ConstrainedBox::new(
Icon::ChevronRight
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish(),
)
.with_height(20.)
app/src/terminal/view/ambient_agent/block/query.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::ParentElement,
prelude::{Container, Empty, Flex, Text},
AppContext, Element, Entity, ModelHandle, SingletonEntity, View, ViewContext,
app/src/terminal/view/ambient_agent/block/setup_command.rs
+3 -3
View File
@@ -1,9 +1,9 @@
use std::sync::Arc;
use parking_lot::FairMutex;
use warp_core::ui::appearance::Appearance;
use warp_terminal::model::BlockId;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_terminal::model::BlockId;
use galaxyui::{
prelude::{Container, Empty, MouseStateHandle},
scene::{CornerRadius, Radius},
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
app/src/terminal/view/ambient_agent/block/setup_command_text.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use warp_core::ui::{appearance::Appearance, Icon};
use warpui::{
use galaxy_core::ui::{appearance::Appearance, Icon};
use galaxyui::{
elements::ParentElement,
prelude::{
ConstrainedBox, Container, CrossAxisAlignment, Cursor, Empty, Flex, Hoverable,
@@ -164,7 +164,7 @@ impl View for CloudModeSetupTextBlock {
.with_child(
Container::new(
ConstrainedBox::new(
chevron_icon.to_warpui_icon(text_color.into()).finish(),
chevron_icon.to_galaxyui_icon(text_color.into()).finish(),
)
.with_width(icon_size)
.with_height(icon_size)
app/src/terminal/view/ambient_agent/first_time_setup.rs
+3 -3
View File
@@ -17,8 +17,8 @@ use crate::{
ui_components::blended_colors,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use warp_core::ui::theme::{AnsiColorIdentifier, Fill};
use warpui::{
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
use galaxyui::{
elements::{
new_scrollable::SingleAxisConfig, Align, Border, ChildView, ClippedScrollStateHandle,
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element, Expanded, Flex,
@@ -355,7 +355,7 @@ impl View for FirstTimeCloudAgentSetupView {
},
appearance.theme().nonactive_ui_detail().into(),
appearance.theme().active_ui_detail().into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.finish();
app/src/terminal/view/ambient_agent/footer.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use pathfinder_color::ColorU;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment,
MainAxisSize, ParentElement, Text,
@@ -100,7 +100,7 @@ pub fn render_error_footer(error_message: &str, appearance: &Appearance) -> Box<
let header_color = theme.ui_error_color();
let body_color = blended_colors::text_main(theme, theme.background());
let background: ColorU = {
let red: warp_core::ui::theme::Fill = theme.ui_error_color().into();
let red: galaxy_core::ui::theme::Fill = theme.ui_error_color().into();
red.with_opacity(50).into()
};
let border_color = theme.ui_error_color();
app/src/terminal/view/ambient_agent/harness_selector.rs
+5 -5
View File
@@ -5,7 +5,7 @@
use std::sync::Arc;
use pathfinder_geometry::vector::vec2f;
use warpui::{
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, OffsetPositioning, ParentAnchor, ParentElement as _,
ParentOffsetBounds, Stack,
@@ -14,10 +14,10 @@ use warpui::{
ViewHandle,
};
use warp_cli::agent::Harness;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use galaxy_cli::agent::Harness;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use crate::ai::blocklist::agent_view::agent_input_footer::AgentInputButtonTheme;
use crate::ai::harness_display::{display_name, icon_for};
app/src/terminal/view/ambient_agent/host_selector.rs
+4 -4
View File
@@ -2,7 +2,7 @@ use std::sync::Arc;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warpui::{
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, OffsetPositioning, ParentAnchor, ParentElement as _,
ParentOffsetBounds, Stack,
@@ -11,9 +11,9 @@ use warpui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use crate::menu::{Event as MenuEvent, Menu, MenuItem, MenuItemFields};
use crate::terminal::input::{MenuPositioning, MenuPositioningProvider};
app/src/terminal/view/ambient_agent/loading_screen.rs
+21 -21
View File
@@ -1,22 +1,22 @@
//! Loading screen UI for cloud mode initialization.
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::AnsiColorIdentifier;
use warp_core::ui::Icon;
use warpui::elements::shimmering_text::ShimmeringTextStateHandle;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::AnsiColorIdentifier;
use galaxy_core::ui::Icon;
use galaxyui::elements::shimmering_text::ShimmeringTextStateHandle;
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Element, Expanded, Flex,
FormattedTextElement, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement,
SelectableArea, SelectionHandle, Text,
};
use warpui::fonts::Properties;
use warpui::fonts::Weight;
use warpui::prelude::{CornerRadius, Radius};
use warpui::text_layout::TextAlignment;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::UiComponent;
use warpui::{AppContext, ModelHandle, SingletonEntity};
use galaxyui::fonts::Properties;
use galaxyui::fonts::Weight;
use galaxyui::prelude::{CornerRadius, Radius};
use galaxyui::text_layout::TextAlignment;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::{AppContext, ModelHandle, SingletonEntity};
use crate::ai::agent_tips::{AITip, AITipModel};
use crate::ai::loading::shimmering_warp_loading_text;
@@ -67,7 +67,7 @@ pub fn render_cloud_mode_loading_screen(
.with_hyperlink_font_color(theme.accent().into())
.set_selectable(true)
.register_default_click_handlers_with_action_support(|link, _evt, app| {
use warpui::elements::HyperlinkLens;
use galaxyui::elements::HyperlinkLens;
if let HyperlinkLens::Url(url) = link {
app.open_url(url);
}
@@ -182,7 +182,7 @@ fn render_tier_limits_footer(
.with_alignment(TextAlignment::Center)
.with_hyperlink_font_color(theme.accent().into())
.register_default_click_handlers_with_action_support(|link, _evt, app| {
use warpui::elements::HyperlinkLens;
use galaxyui::elements::HyperlinkLens;
if let HyperlinkLens::Url(url) = link {
app.open_url(url);
}
@@ -193,7 +193,7 @@ fn render_tier_limits_footer(
let icon_size = footer_font_size;
let info_icon = ConstrainedBox::new(
Icon::Info
.to_warpui_icon(blended_colors::text_sub(theme, theme.surface_1()).into())
.to_galaxyui_icon(blended_colors::text_sub(theme, theme.surface_1()).into())
.finish(),
)
.with_width(icon_size)
@@ -225,7 +225,7 @@ pub fn render_cloud_mode_error_screen(
// Error icon with fixed size constraints - using AlertTriangle icon
let error_icon = ConstrainedBox::new(
Icon::AlertTriangle
.to_warpui_icon(error_color.into())
.to_galaxyui_icon(error_color.into())
.finish(),
)
.with_width(ERROR_ICON_SIZE)
@@ -274,7 +274,7 @@ pub fn render_cloud_mode_error_screen(
.finish();
// Red bordered container with 10% opacity background
let error_background = warp_core::ui::color::coloru_with_opacity(error_color.into(), 10);
let error_background = galaxy_core::ui::color::coloru_with_opacity(error_color.into(), 10);
let error_container = Container::new(content)
.with_background(error_background)
@@ -317,7 +317,7 @@ pub fn render_cloud_mode_github_auth_required_screen(
let border_color = blended_colors::neutral_4(theme);
// Info icon with fixed size constraints
let auth_icon = ConstrainedBox::new(Icon::Info.to_warpui_icon(accent_color).finish())
let auth_icon = ConstrainedBox::new(Icon::Info.to_galaxyui_icon(accent_color).finish())
.with_width(ERROR_ICON_SIZE)
.with_height(ERROR_ICON_SIZE)
.finish();
@@ -364,7 +364,7 @@ pub fn render_cloud_mode_github_auth_required_screen(
.finish();
// Dark background (surface_2) with subtle border
let auth_background: warpui::elements::Fill = theme.surface_2().into();
let auth_background: galaxyui::elements::Fill = theme.surface_2().into();
let auth_container = Container::new(content)
.with_background(auth_background)
@@ -402,7 +402,7 @@ pub fn render_cloud_mode_cancelled_screen(appearance: &Appearance) -> Box<dyn El
// SlashCircle icon with fixed size constraints
let cancelled_icon = ConstrainedBox::new(
Icon::SlashCircle
.to_warpui_icon(title_color.into())
.to_galaxyui_icon(title_color.into())
.finish(),
)
.with_width(ERROR_ICON_SIZE)
@@ -438,7 +438,7 @@ pub fn render_cloud_mode_cancelled_screen(appearance: &Appearance) -> Box<dyn El
.finish();
// Dark background (surface_2) with subtle border
let cancelled_background: warpui::elements::Fill = theme.surface_2().into();
let cancelled_background: galaxyui::elements::Fill = theme.surface_2().into();
let cancelled_container = Container::new(content)
.with_background(cancelled_background)
app/src/terminal/view/ambient_agent/mod.rs
+3 -3
View File
@@ -24,7 +24,7 @@ pub use model_selector::{ModelSelector, ModelSelectorAction, ModelSelectorEvent}
pub use progress::{render_progress, ProgressProps, ProgressStep, ProgressStepState};
pub use progress_ui_state::AmbientAgentProgressUIState;
pub use tips::{get_cloud_mode_tips, CloudModeTip};
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewState};
use crate::ai::blocklist::BlocklistAIHistoryModel;
@@ -32,8 +32,8 @@ use crate::pane_group::TerminalViewResources;
use crate::terminal::shared_session;
use crate::terminal::TerminalManager;
use crate::terminal::TerminalView;
use warpui::geometry::vector::Vector2F;
use warpui::{AppContext, ModelHandle, SingletonEntity, ViewHandle, WindowId};
use galaxyui::geometry::vector::Vector2F;
use galaxyui::{AppContext, ModelHandle, SingletonEntity, ViewHandle, WindowId};
/// Creates a cloud mode terminal view and manager for ambient agent sessions.
///
app/src/terminal/view/ambient_agent/model.rs
+6 -6
View File
@@ -2,11 +2,11 @@ use std::time::Duration;
use instant::Instant;
use session_sharing_protocol::common::SessionId;
use warp_cli::agent::Harness;
use warp_core::features::FeatureFlag;
use warp_core::send_telemetry_from_ctx;
use warpui::r#async::{SpawnedFutureHandle, Timer};
use warpui::{Entity, EntityId, ModelContext, SingletonEntity};
use galaxy_cli::agent::Harness;
use galaxy_core::features::FeatureFlag;
use galaxy_core::send_telemetry_from_ctx;
use galaxyui::r#async::{SpawnedFutureHandle, Timer};
use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity};
use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
use crate::ai::agent::conversation::AIConversationId;
@@ -490,7 +490,7 @@ impl AmbientAgentViewModel {
ComputerUsePermission::resolve_cloud_agent_state(ctx);
let computer_use_enabled = Some(enabled);
let default_host = std::env::var("WARP_CLOUD_MODE_DEFAULT_HOST")
let default_host = std::env::var("GALAXY_CLOUD_MODE_DEFAULT_HOST")
.ok()
.filter(|s| !s.is_empty());
app/src/terminal/view/ambient_agent/model_selector.rs
+5 -5
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use pathfinder_geometry::vector::vec2f;
use warpui::{
use galaxyui::{
elements::{
Border, ChildAnchor, ChildView, Container, OffsetPositioning, ParentAnchor,
ParentElement as _, ParentOffsetBounds, Stack,
@@ -10,9 +10,9 @@ use warpui::{
ViewHandle,
};
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::Fill;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::Fill;
use crate::ai::blocklist::agent_view::agent_input_footer::AgentInputButtonTheme;
use crate::ai::llms::{LLMPreferences, LLMPreferencesEvent};
@@ -24,7 +24,7 @@ use crate::menu::{Event as MenuEvent, Menu, MenuItem, MenuItemFields, MenuVarian
use crate::terminal::input::{MenuPositioning, MenuPositioningProvider};
use crate::ui_components::icons::Icon;
use crate::view_components::action_button::{ActionButton, ButtonSize};
use warp_editor::editor::NavigationKey;
use galaxy_editor::editor::NavigationKey;
const ITEM_FONT_SIZE: f32 = 14.;
app/src/terminal/view/ambient_agent/progress.rs
+5 -5
View File
@@ -4,14 +4,14 @@ use std::borrow::Cow;
use std::time::Duration;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::Icon;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::Icon;
use galaxyui::elements::{
Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex,
MainAxisAlignment, MainAxisSize, OffsetPositioning, ParentElement, PositionedElementAnchor,
PositionedElementOffsetBounds, Radius, Rect, SavePosition, Stack, Text,
};
use warpui::{AppContext, Element, WindowId};
use galaxyui::{AppContext, Element, WindowId};
/// The state of a progress step.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -174,7 +174,7 @@ fn render_indicator(state: ProgressStepState, appearance: &Appearance) -> Box<dy
ProgressStepState::Completed => {
let check_icon = ConstrainedBox::new(
Icon::Check
.to_warpui_icon(theme.main_text_color(background))
.to_galaxyui_icon(theme.main_text_color(background))
.finish(),
)
.with_width(ICON_SIZE)
app/src/terminal/view/ambient_agent/progress_ui_state.rs
+4 -4
View File
@@ -1,8 +1,8 @@
//! UI state for the ambient agent progress/loading screen.
use warpui::elements::shimmering_text::ShimmeringTextStateHandle;
use warpui::elements::{MouseStateHandle, SelectionHandle};
use warpui::ModelHandle;
use galaxyui::elements::shimmering_text::ShimmeringTextStateHandle;
use galaxyui::elements::{MouseStateHandle, SelectionHandle};
use galaxyui::ModelHandle;
use crate::ai::agent_tips::AITipModel;
use crate::terminal::view::ambient_agent::model::AmbientAgentViewModel;
@@ -29,7 +29,7 @@ pub struct AmbientAgentProgressUIState {
impl AmbientAgentProgressUIState {
/// Creates a new ambient agent progress UI state with initialized handles.
pub fn new(ctx: &mut warpui::ModelContext<AmbientAgentViewModel>) -> Self {
pub fn new(ctx: &mut galaxyui::ModelContext<AmbientAgentViewModel>) -> Self {
let tip_model = ctx.add_model(|_ctx| {
use crate::terminal::view::ambient_agent;
AITipModel::new(ambient_agent::get_cloud_mode_tips())
app/src/terminal/view/ambient_agent/tips.rs
+2 -2
View File
@@ -1,8 +1,8 @@
//! Tips for cloud mode loading screen.
use crate::ai::agent_tips::AITip;
use warpui::keymap::Keystroke;
use warpui::AppContext;
use galaxyui::keymap::Keystroke;
use galaxyui::AppContext;
/// A cloud mode tip with text and optional link.
#[derive(Clone, Debug)]
app/src/terminal/view/ambient_agent/view_impl.rs
+8 -8
View File
@@ -2,14 +2,14 @@
use std::cell::Cell;
use std::rc::Rc;
use warp_cli::agent::Harness;
use warp_terminal::model::BlockId;
use galaxy_cli::agent::Harness;
use galaxy_terminal::model::BlockId;
use crate::ai::agent::conversation::{AIConversationId, ConversationStatus};
use crate::ai::AIRequestUsageModel;
use warp_core::features::FeatureFlag;
use warp_core::send_telemetry_from_ctx;
use warpui::prelude::{Empty, Vector2F};
use galaxy_core::features::FeatureFlag;
use galaxy_core::send_telemetry_from_ctx;
use galaxyui::prelude::{Empty, Vector2F};
use crate::ai::ambient_agents::telemetry::{CloudAgentTelemetryEvent, CloudModeEntryPoint};
use crate::ai::blocklist::{agent_view::AgentViewEntryOrigin, BlocklistAIHistoryModel};
@@ -22,9 +22,9 @@ use crate::terminal::view::TerminalView;
use crate::terminal::CLIAgent;
use crate::workspace::view::cloud_agent_capacity_modal::CloudAgentCapacityModalVariant;
use crate::workspaces::user_workspaces::UserWorkspaces;
use warp_core::ui::appearance::Appearance;
use warpui::elements::Align;
use warpui::{AppContext, Element, EntityId, SingletonEntity, ViewContext};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::Align;
use galaxyui::{AppContext, Element, EntityId, SingletonEntity, ViewContext};
use super::loading_screen::{
render_cloud_mode_cancelled_screen, render_cloud_mode_error_screen,
app/src/terminal/view/block_banner/mod.rs
+1 -1
View File
@@ -9,7 +9,7 @@
mod warpify;
pub use warpify::*;
use warpui::{
use galaxyui::{
elements::{
ConstrainedBox, Container, CornerRadius, Hoverable, MouseState, MouseStateHandle,
ParentElement, Radius, Stack,
app/src/terminal/view/block_banner/warpify.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use pathfinder_color::ColorU;
use warpui::{
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, CrossAxisAlignment, Flex, HighlightedHyperlink,
MouseStateHandle, ParentElement, Shrinkable,
app/src/terminal/view/block_onboarding/onboarding_agentic_suggestions_block.rs
+15 -15
View File
@@ -18,18 +18,18 @@ use markdown_parser::FormattedTextFragment;
use markdown_parser::FormattedTextLine;
use regex::Regex;
use serde::{Deserialize, Serialize};
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warpui::elements::CornerRadius;
use warpui::elements::CrossAxisAlignment;
use warpui::elements::FormattedTextElement;
use warpui::elements::Radius;
use warpui::keymap::Keystroke;
use warpui::ui_components::components::UiComponent;
use warpui::ui_components::components::UiComponentStyles;
use warpui::TypedActionView;
use warpui::WeakViewHandle;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::elements::CornerRadius;
use galaxyui::elements::CrossAxisAlignment;
use galaxyui::elements::FormattedTextElement;
use galaxyui::elements::Radius;
use galaxyui::keymap::Keystroke;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::ui_components::components::UiComponentStyles;
use galaxyui::TypedActionView;
use galaxyui::WeakViewHandle;
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, Flex, Hoverable, MainAxisAlignment, MainAxisSize,
MouseStateHandle, ParentElement, Text, Wrap,
@@ -444,7 +444,7 @@ impl OnboardingAgenticSuggestionsBlock {
self.agent_suggestions[index]
.0
.icon
.to_warpui_icon(main_text_color)
.to_galaxyui_icon(main_text_color)
.finish(),
)
.with_height(KEYBOARD_ICON_SIZE)
@@ -526,7 +526,7 @@ impl OnboardingAgenticSuggestionsBlock {
// Use a more muted background for disabled state
theme.surface_1()
} else {
warp_core::ui::theme::Fill::Solid(internal_colors::neutral_1(theme))
galaxy_core::ui::theme::Fill::Solid(internal_colors::neutral_1(theme))
};
let mut button_content =
@@ -638,7 +638,7 @@ impl OnboardingAgenticSuggestionsBlock {
Container::new(
ConstrainedBox::new(
UIIcon::Icon::Loading
.to_warpui_icon(ai_brand_color(appearance.theme()).into())
.to_galaxyui_icon(ai_brand_color(appearance.theme()).into())
.finish(),
)
.with_height(icon_size)
app/src/terminal/view/block_onboarding/onboarding_drive_sharing_block.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{
Border, Container, Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement,
Text,
@@ -118,7 +118,7 @@ impl View for OnboardingDriveSharingBlock {
TextAndIcon::new(
TextAndIconAlignment::IconFirst,
button_label,
Icon::Share.to_warpui_icon(appearance.theme().background()),
Icon::Share.to_galaxyui_icon(appearance.theme().background()),
MainAxisSize::Min,
MainAxisAlignment::SpaceEvenly,
vec2f(BUTTON_FONT_SIZE, BUTTON_FONT_SIZE),
app/src/terminal/view/block_onboarding/onboarding_prompt_block.rs
+2 -2
View File
@@ -12,7 +12,7 @@ use crate::terminal::view::block_onboarding::util;
use crate::terminal::SizeInfo;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use settings::Setting as _;
use warpui::{
use galaxyui::{
elements::{
Align, Border, Clipped, ConstrainedBox, Container, CornerRadius, Flex,
FormattedTextElement, HighlightedHyperlink, Hoverable, HyperlinkUrl, MainAxisAlignment,
@@ -108,7 +108,7 @@ impl OnboardingPromptBlock {
let mut confirm_button = appearance
.ui_builder()
.button(
warpui::ui_components::button::ButtonVariant::Accent,
galaxyui::ui_components::button::ButtonVariant::Accent,
self.mouse_state_handle_confirm.clone(),
)
.with_style(UiComponentStyles {
app/src/terminal/view/block_onboarding/util.rs
+7 -7
View File
@@ -2,11 +2,11 @@ use crate::appearance::Appearance;
use crate::editor::EditorView;
use crate::ui_components::icons::Icon;
use pathfinder_color::ColorU;
use warp_core::ui::theme::Fill;
use warpui::elements::{Flex, ParentElement};
use warpui::ui_components::components::Coords;
use warpui::ui_components::text_input::TextInput;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{Flex, ParentElement};
use galaxyui::ui_components::components::Coords;
use galaxyui::ui_components::text_input::TextInput;
use galaxyui::{
elements::{
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, MouseStateHandle, Radius,
Shrinkable,
@@ -19,7 +19,7 @@ use warpui::{
},
Action, AppContext, Element,
};
use warpui::{SingletonEntity, ViewHandle};
use galaxyui::{SingletonEntity, ViewHandle};
pub const INPUT_BOX_FONT_SIZE: f32 = 14.;
pub const TEAM_BLOCK_INITIAL_HEIGHT: f32 = 92.;
@@ -161,7 +161,7 @@ pub fn render_input_row<A: Action + Clone>(
} else {
ConstrainedBox::new(
Icon::Check
.to_warpui_icon(Fill::Solid(ColorU::new(11, 142, 71, 255)))
.to_galaxyui_icon(Fill::Solid(ColorU::new(11, 142, 71, 255)))
.finish(),
)
.with_width(24.)
app/src/terminal/view/bookmarks.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{Border, ConstrainedBox, Container, CornerRadius, Flex, ParentElement, Radius},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
app/src/terminal/view/docker_sandbox/mod.rs
+6 -6
View File
@@ -2,12 +2,12 @@
use std::sync::mpsc::SyncSender;
#[cfg(feature = "local_tty")]
use warpui::geometry::vector::Vector2F;
use galaxyui::geometry::vector::Vector2F;
#[cfg(feature = "local_tty")]
use warpui::ModelHandle;
use warpui::ViewContext;
use galaxyui::ModelHandle;
use galaxyui::ViewContext;
#[cfg(not(target_family = "wasm"))]
use warpui::{SingletonEntity, View, ViewHandle};
use galaxyui::{SingletonEntity, View, ViewHandle};
#[cfg(feature = "local_tty")]
use crate::pane_group::TerminalViewResources;
@@ -35,9 +35,9 @@ use crate::terminal::local_tty::docker_sandbox::DOCKER_SANDBOX_HOME_DIR;
#[cfg(feature = "remote_tty")]
use crate::terminal::remote_tty::TerminalManager as RemoteTtyTerminalManager;
#[cfg(not(target_family = "wasm"))]
use warp_cli::agent::Harness;
use galaxy_cli::agent::Harness;
#[cfg(not(target_family = "wasm"))]
use warpui::r#async::FutureExt;
use galaxyui::r#async::FutureExt;
use super::TerminalView;
app/src/terminal/view/init.rs
+9 -9
View File
@@ -31,11 +31,11 @@ use crate::{
terminal::TerminalView,
util::bindings::CustomAction,
};
use warp_core::context_flag::ContextFlag;
use warpui::keymap::ContextPredicate;
use warpui::keymap::{BindingDescription, PerPlatformKeystroke};
use warpui::platform::OperatingSystem;
use warpui::{
use galaxy_core::context_flag::ContextFlag;
use galaxyui::keymap::ContextPredicate;
use galaxyui::keymap::{BindingDescription, PerPlatformKeystroke};
use galaxyui::platform::OperatingSystem;
use galaxyui::{
keymap::{EditableBinding, FixedBinding},
units::IntoLines,
AppContext,
@@ -65,7 +65,7 @@ pub const ROOT_CLOUD_MODE_PANE_KEY: &str = "RootCloudModePane";
/// these into their own function to ensure we pay special attention to
/// these overlaps, and ensure only 1 action is taken.
fn init_overlapping_keybindings(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
let escape_key: &str = "escape";
let cmd_or_ctrl_enter: &str = "cmdorctrl-enter";
@@ -98,7 +98,7 @@ fn init_overlapping_keybindings(app: &mut AppContext) {
/// Register keybindings for [`TerminalView`] actions.
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_binding_validator::<TerminalView>(is_binding_pty_compliant);
@@ -199,7 +199,7 @@ pub fn init(app: &mut AppContext) {
// On the web, we get pastes from system paste events.
#[cfg(target_family = "wasm")]
FixedBinding::standard(
warpui::actions::StandardAction::Paste,
galaxyui::actions::StandardAction::Paste,
TerminalAction::Paste,
id!("Terminal") & !id!("IMEOpen"),
),
@@ -1106,7 +1106,7 @@ pub fn init(app: &mut AppContext) {
/// Registers bindings related to input modes.
fn register_input_mode_bindings(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
// A context predicate that matches when the input mode bindings are
// available for use. Disabled when a CLI agent session is active — the
app/src/terminal/view/init_environment/mod.rs
+2 -2
View File
@@ -10,11 +10,11 @@ use crate::ai::blocklist::inline_action::inline_action_header::{
use crate::ai::blocklist::inline_action::inline_action_icons::cancelled_icon;
use crate::ai::blocklist::inline_action::requested_action::RenderableAction;
use crate::appearance::Appearance;
use warpui::elements::{
use galaxyui::elements::{
ChildView, Container, CornerRadius, CrossAxisAlignment, Flex, MouseStateHandle, ParentElement,
Radius, Text,
};
use warpui::{
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
app/src/terminal/view/init_environment/mode_selector.rs
+10 -10
View File
@@ -2,18 +2,18 @@ use crate::appearance::Appearance;
use crate::ui_components::icons::Icon;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::color::blend::Blend;
use warp_core::ui::theme::color::internal_colors;
use warpui::elements::{
use galaxy_core::ui::color::blend::Blend;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss,
DropShadow, Element, Flex, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle,
ParentElement, Radius, Shrinkable, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::{FixedBinding, Keystroke};
use warpui::platform::Cursor;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::keymap::{FixedBinding, Keystroke};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext};
// Figma node 6583:23542
const MODAL_WIDTH: f32 = 441.;
@@ -73,7 +73,7 @@ pub struct EnvironmentSetupModeSelector {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings(vec![
FixedBinding::new(
@@ -227,7 +227,7 @@ impl EnvironmentSetupModeSelector {
(base_background, base_border)
};
let avatar_icon = ConstrainedBox::new(icon.to_warpui_icon(icon_color).finish())
let avatar_icon = ConstrainedBox::new(icon.to_galaxyui_icon(icon_color).finish())
.with_width(AVATAR_ICON_SIZE)
.with_height(AVATAR_ICON_SIZE)
.finish();
app/src/terminal/view/init_project/lsp_server_selector.rs
+1 -1
View File
@@ -7,7 +7,7 @@ use crate::ui_components::blended_colors;
use lsp::supported_servers::LSPServerType;
use std::path::PathBuf;
use warpui::{
use galaxyui::{
elements::{
Border, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Expanded,
Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Shrinkable,
app/src/terminal/view/init_project/mod.rs
+7 -7
View File
@@ -27,8 +27,8 @@ use lsp_server_selector::{create_lsp_server_selector, LSPServerInfo};
pub use model::{InitProjectModel, InitProjectModelEvent, InitStepKind};
use model::{InitStepData, InitStepStatus};
use std::path::{Path, PathBuf};
use warp_core::ui::theme::Fill;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxyui::{
elements::{
Border, ChildView, Container, CrossAxisAlignment, Empty, Flex, MouseStateHandle,
ParentElement, Text,
@@ -493,7 +493,7 @@ impl InitStepBlock {
/// Renders a success completion state with check icon.
fn render_success_completion(text: &str, app: &AppContext) -> Box<dyn Element> {
RenderableAction::new(text, app)
.with_icon(Icon::Check.to_warpui_icon(Fill::success()).finish())
.with_icon(Icon::Check.to_galaxyui_icon(Fill::success()).finish())
.with_content_item_spacing()
.render(app)
.finish()
@@ -502,7 +502,7 @@ impl InitStepBlock {
/// Renders a skipped/cancelled completion state with X icon.
fn render_skipped_completion(text: &str, app: &AppContext) -> Box<dyn Element> {
RenderableAction::new(text, app)
.with_icon(Icon::X.to_warpui_icon(Fill::error()).finish())
.with_icon(Icon::X.to_galaxyui_icon(Fill::error()).finish())
.with_content_item_spacing()
.render(app)
.finish()
@@ -669,7 +669,7 @@ impl InitStepBlock {
match indexing_result {
CodebaseIndexingResult::Accepted => {
RenderableAction::new("Codebase index started", app)
.with_icon(Icon::Check.to_warpui_icon(Fill::success()).finish())
.with_icon(Icon::Check.to_galaxyui_icon(Fill::success()).finish())
.with_action_button(
Appearance::as_ref(app)
.ui_builder()
@@ -925,7 +925,7 @@ impl InitStepBlock {
button_disabled, ..
} => {
let mut action = RenderableAction::new("Project rules configured", app)
.with_icon(Icon::Check.to_warpui_icon(Fill::success()).finish());
.with_icon(Icon::Check.to_galaxyui_icon(Fill::success()).finish());
if init_completed {
action = action.with_action_button(Self::regenerate_button(
&mouse_states.regenerate_button,
@@ -937,7 +937,7 @@ impl InitStepBlock {
}
ProjectScopedRulesResult::AlreadyExists { button_disabled } => {
let mut action = RenderableAction::new("Project rules already configured", app)
.with_icon(Icon::Check.to_warpui_icon(Fill::success()).finish());
.with_icon(Icon::Check.to_galaxyui_icon(Fill::success()).finish());
if init_completed {
action = action.with_action_button(Self::regenerate_button(
&mouse_states.regenerate_button,
app/src/terminal/view/init_project/model.rs
+2 -2
View File
@@ -6,7 +6,7 @@ use enum_iterator::Sequence;
use lsp::supported_servers::LSPServerType;
#[cfg(not(target_family = "wasm"))]
use repo_metadata::repositories::DetectedRepositories;
use warpui::{Entity, ModelContext, SingletonEntity as _};
use galaxyui::{Entity, ModelContext, SingletonEntity as _};
use crate::{
ai::persisted_workspace::PersistedWorkspace,
@@ -176,7 +176,7 @@ impl InitProjectModel {
}
/// Check if there are any steps that need user action
pub fn should_have_available_steps(path: &Path, ctx: &warpui::AppContext) -> bool {
pub fn should_have_available_steps(path: &Path, ctx: &galaxyui::AppContext) -> bool {
// Note that we consider auto-indexing setting to true to satisfy the codebase context step.
// This avoids the potential race condition with the banner showing just when we start auto-indexing.
let has_pending_codebase_context = UserWorkspaces::as_ref(ctx)
app/src/terminal/view/inline_banner/agent_mode_setup.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use std::path::PathBuf;
use warpui::{
use galaxyui::{
elements::{MouseStateHandle, Text},
Element,
};
app/src/terminal/view/inline_banner/alias_expansion.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{MouseStateHandle, Text},
Element,
};
app/src/terminal/view/inline_banner/anonymous_user_ai_sign_up.rs
+7 -7
View File
@@ -2,15 +2,15 @@ use crate::appearance::Appearance;
use crate::terminal::view::{InlineBannerId, TerminalAction};
use crate::ui_components::buttons::icon_button;
use crate::ui_components::icons::Icon as UiIcon;
use warpui::elements::{
use galaxyui::elements::{
Container, CornerRadius, CrossAxisAlignment, Flex, Icon, MainAxisAlignment, MainAxisSize,
MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
};
use warpui::ui_components::{
use galaxyui::ui_components::{
button::ButtonVariant,
components::{Coords, UiComponent, UiComponentStyles},
};
use warpui::Element;
use galaxyui::Element;
use super::{
INLINE_BANNER_BUTTON_HOVER_OPACITY, INLINE_BANNER_BUTTON_PADDING,
@@ -81,7 +81,7 @@ fn render_three_column_inline_banner(
let active_text_color = theme.active_ui_text_color().into_solid();
let content_text_color = theme.nonactive_ui_text_color().into_solid();
let hover_background_fill = warpui::elements::Fill::from(
let hover_background_fill = galaxyui::elements::Fill::from(
theme
.active_ui_text_color()
.with_opacity(INLINE_BANNER_BUTTON_HOVER_OPACITY),
@@ -122,7 +122,7 @@ fn render_three_column_inline_banner(
let icon_color = active_text_color;
let icon_column = Container::new(
warpui::elements::ConstrainedBox::new(
galaxyui::elements::ConstrainedBox::new(
Icon::new("bundled/svg/info.svg", icon_color).finish(),
)
.with_width(icon_width)
@@ -179,8 +179,8 @@ fn render_three_column_inline_banner(
let button_styles = UiComponentStyles {
font_color: Some(active_text_color),
font_size: Some(button_text_size),
font_weight: Some(warpui::fonts::Weight::Semibold),
border_color: Some(warpui::elements::Fill::Solid(content_text_color)),
font_weight: Some(galaxyui::fonts::Weight::Semibold),
border_color: Some(galaxyui::elements::Fill::Solid(content_text_color)),
border_width: Some(1.0),
border_radius: Some(CornerRadius::with_all(Radius::Pixels(
INLINE_BANNER_BUTTON_PADDING,
app/src/terminal/view/inline_banner/aws_bedrock_login.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{appearance::Appearance, terminal::view::TerminalAction};
@@ -62,7 +62,7 @@ pub fn render_aws_bedrock_login_banner(
});
// Use sub_text_color for description to differentiate from title
let description_text = warpui::elements::Text::new(
let description_text = galaxyui::elements::Text::new(
"Your Warp admin has enabled AWS Bedrock for your team.",
appearance.ui_font_family(),
appearance.monospace_font_size() - 2.,
app/src/terminal/view/inline_banner/aws_cli_not_installed.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{appearance::Appearance, terminal::view::TerminalAction};
@@ -65,7 +65,7 @@ pub fn render_aws_cli_not_installed_banner(
mouse_state_handle: state.dismiss_button_mouse_state.clone(),
});
let description_text = warpui::elements::Text::new(
let description_text = galaxyui::elements::Text::new(
"The AWS CLI is required to authenticate with your organization's AWS Bedrock. Install it to continue.",
appearance.ui_font_family(),
appearance.monospace_font_size() - 2.,
app/src/terminal/view/inline_banner/mod.rs
+4 -4
View File
@@ -34,8 +34,8 @@ pub use ssh::*;
pub use vim_mode::*;
use pathfinder_color::ColorU;
use warpui::elements::Clipped;
use warpui::{
use galaxyui::elements::Clipped;
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Icon,
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, SavePosition,
@@ -187,7 +187,7 @@ fn render_inline_block_list_banner(
let theme = appearance.theme();
let title_font_size = appearance.ui_font_size() + 1.;
let button_text_size = title_font_size;
let hover_background_fill = warpui::elements::Fill::from(
let hover_background_fill = galaxyui::elements::Fill::from(
theme
.active_ui_text_color()
.with_opacity(INLINE_BANNER_BUTTON_HOVER_OPACITY),
@@ -413,7 +413,7 @@ fn render_inline_banner_text_button(
font_color: Some(coloru_with_opacity(button_info.text_color, text_opacity)),
font_family_id: button_info.font.family,
font_weight: button_info.font.weight,
border_color: Some(warpui::elements::Fill::Solid(coloru_with_opacity(
border_color: Some(galaxyui::elements::Fill::Solid(coloru_with_opacity(
button_info.text_color,
text_opacity,
))),
app/src/terminal/view/inline_banner/notifications_discovery.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use serde::Serialize;
use warpui::{elements::MouseStateHandle, notification::RequestPermissionsOutcome, Element};
use galaxyui::{elements::MouseStateHandle, notification::RequestPermissionsOutcome, Element};
use crate::{
appearance::Appearance,
app/src/terminal/view/inline_banner/notifications_error.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use serde::Serialize;
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{
appearance::Appearance,
@@ -11,7 +11,7 @@ use super::{
InlineBannerContent, InlineBannerStyle, InlineBannerTextButton, InlineBannerTextButtonVariant,
};
use warpui::notification::NotificationSendError;
use galaxyui::notification::NotificationSendError;
#[derive(Clone, Copy, Debug, Serialize)]
pub enum NotificationsErrorBannerAction {
app/src/terminal/view/inline_banner/open_in_warp.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use std::sync::Arc;
use warpui::{elements::MouseStateHandle, fonts::Weight, Element, EntityId};
use galaxyui::{elements::MouseStateHandle, fonts::Weight, Element, EntityId};
use crate::{
appearance::Appearance,
app/src/terminal/view/inline_banner/passive_code_diff.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warpui::elements::{Border, ChildView, Container};
use warpui::{AppContext, Element, Entity, SingletonEntity, View, ViewHandle};
use galaxyui::elements::{Border, ChildView, Container};
use galaxyui::{AppContext, Element, Entity, SingletonEntity, View, ViewHandle};
use crate::ai::blocklist::inline_action::code_diff_view::CodeDiffView;
use crate::ai::blocklist::inline_action::inline_action_header::INLINE_ACTION_HORIZONTAL_PADDING;
app/src/terminal/view/inline_banner/prompt_suggestions.rs
+10 -10
View File
@@ -13,26 +13,26 @@ use crate::settings::InputSettings;
use crate::terminal::view::passive_suggestions::PromptSuggestionResolution;
use crate::util::bindings::keybinding_name_to_keystroke;
use pathfinder_geometry::vector::vec2f;
use warpui::elements::{
use galaxyui::elements::{
ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
Fill, Flex, HighlightedHyperlink, Hoverable, Icon, MainAxisAlignment, MainAxisSize,
OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius, Shrinkable, Stack,
Text,
};
use warpui::keymap::Keystroke;
use warpui::platform::Cursor;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{elements::MouseStateHandle, Element};
use warpui::{
use galaxyui::keymap::Keystroke;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{elements::MouseStateHandle, Element};
use galaxyui::{
AppContext, Entity, EventContext, ModelHandle, TypedActionView, ViewContext, ViewHandle,
};
use warpui::{SingletonEntity, View};
use galaxyui::{SingletonEntity, View};
use crate::terminal::view::{ContextMenuAction, InputType, PromptSuggestion};
use crate::ui_components::blended_colors;
use crate::{appearance::Appearance, terminal::view::TerminalAction};
use warp_core::channel::ChannelState;
use warp_core::ui::theme::color::internal_colors::{neutral_2, neutral_3};
use galaxy_core::channel::ChannelState;
use galaxy_core::ui::theme::color::internal_colors::{neutral_2, neutral_3};
use crate::ui_components::icons::Icon as WarpUIIcon;
@@ -412,7 +412,7 @@ impl View for PromptSuggestionsView {
0,
keybinding_name_to_keystroke(ACCEPT_PROMPT_SUGGESTION_KEYBINDING, app),
banner_state.accept_button_mouse_state.clone(),
Rc::new(move |ctx: &mut warpui::EventContext<'_>| {
Rc::new(move |ctx: &mut galaxyui::EventContext<'_>| {
ctx.dispatch_typed_action(TerminalAction::ResolvePromptSuggestion(
PromptSuggestionResolution::Accept {
interaction_source: InteractionSource::Button,
app/src/terminal/view/inline_banner/session_state.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use crate::settings::{AISettings, AISettingsChangedEvent};
use settings::Setting;
use warpui::{Entity, ModelContext, SingletonEntity};
use galaxyui::{Entity, ModelContext, SingletonEntity};
/// Tracks whether the BYO LLM auth banner (e.g., AWS Bedrock login) has been dismissed.
///
app/src/terminal/view/inline_banner/shared_sessions.rs
+1 -1
View File
@@ -1,6 +1,6 @@
//! The rendering logic for shared session banners.
use chrono::{DateTime, Datelike, Local};
use warpui::{
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, MainAxisSize,
ParentElement, Radius, Rect, Shrinkable, Text,
app/src/terminal/view/inline_banner/shell_process_terminated.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{elements::Text, Element};
use galaxyui::{elements::Text, Element};
use crate::appearance::Appearance;
app/src/terminal/view/inline_banner/ssh.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{appearance::Appearance, terminal::view::TerminalAction};
app/src/terminal/view/inline_banner/vim_mode.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{appearance::Appearance, terminal::view::TerminalAction};
app/src/terminal/view/link_detection.rs
+3 -3
View File
@@ -2,7 +2,7 @@ use std::ops::Deref;
use serde::{Serialize, Serializer};
use warpui::{platform::Cursor, ViewContext};
use galaxyui::{platform::Cursor, ViewContext};
use crate::{
send_telemetry_from_ctx,
@@ -27,8 +27,8 @@ cfg_if::cfg_if! {
util::openable_file_type::FileTarget,
};
use std::path::PathBuf;
use warp_util::path::CleanPathResult;
use warp_util::path::LineAndColumnArg;
use galaxy_util::path::CleanPathResult;
use galaxy_util::path::LineAndColumnArg;
}
}
app/src/terminal/view/load_ai_conversation.rs
+5 -5
View File
@@ -2,8 +2,8 @@ use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
use vec1::Vec1;
use warp_core::features::FeatureFlag;
use warpui::{EntityId, ViewContext};
use galaxy_core::features::FeatureFlag;
use galaxyui::{EntityId, ViewContext};
use super::blocklist_filter::exchanges_for_blocklist;
use crate::ai::blocklist::agent_view::{
@@ -62,10 +62,10 @@ use crate::{
},
},
};
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
use warp_multi_agent_api as api;
use warpui::units::IntoPixels;
use warpui::{ModelHandle, SingletonEntity};
use galaxyui::units::IntoPixels;
use galaxyui::{ModelHandle, SingletonEntity};
/// Describes restore-context setup state for directory reconciliation and hinting.
#[derive(Clone, Debug, PartialEq, Eq)]
app/src/terminal/view/open_in_warp.rs
+3 -3
View File
@@ -6,8 +6,8 @@ use std::{
use itertools::Itertools;
use lazy_static::lazy_static;
use warp_util::path::EscapeChar;
use warpui::{
use galaxy_util::path::EscapeChar;
use galaxyui::{
accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole},
SingletonEntity, ViewContext,
};
@@ -25,7 +25,7 @@ use crate::{
util::openable_file_type::{is_file_openable_in_warp, OpenableFileType},
};
use settings::Setting as _;
use warp_completer::{
use galaxy_completer::{
completer::TopLevelCommandCaseSensitivity,
parsers::{
classify_command,
app/src/terminal/view/open_in_warp_tests.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::path::Path;
use warp_completer::completer::TopLevelCommandCaseSensitivity;
use warp_util::path::EscapeChar;
use galaxy_completer::completer::TopLevelCommandCaseSensitivity;
use galaxy_util::path::EscapeChar;
use super::{check_openable_in_warp, OpenablePath};
use crate::util::openable_file_type::OpenableFileType;
app/src/terminal/view/pane_impl.rs
+16 -16
View File
@@ -33,19 +33,19 @@ use crate::ui_components::buttons::icon_button_with_color;
use crate::ui_components::icons;
use crate::workspace::tab_settings::TabSettings;
use settings::Setting as _;
use warp_core::context_flag::ContextFlag;
use warp_core::ui::Icon as WarpIcon;
use warpui::elements::{
use galaxy_core::context_flag::ContextFlag;
use galaxy_core::ui::Icon as WarpIcon;
use galaxyui::elements::{
ChildAnchor, ConstrainedBox, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize,
OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Shrinkable, Stack,
};
use warpui::prelude::{vec2f, ChildView, Container, Hoverable};
use warpui::text_layout::ClipConfig;
use warpui::ui_components::components::UiComponent;
use galaxyui::prelude::{vec2f, ChildView, Container, Hoverable};
use galaxyui::text_layout::ClipConfig;
use galaxyui::ui_components::components::UiComponent;
#[cfg(not(target_arch = "wasm32"))]
use warpui::ui_components::components::UiComponentStyles;
use warpui::WeakModelHandle;
use warpui::{AppContext, Element, ModelHandle, SingletonEntity, TypedActionView, ViewContext};
use galaxyui::ui_components::components::UiComponentStyles;
use galaxyui::WeakModelHandle;
use galaxyui::{AppContext, Element, ModelHandle, SingletonEntity, TypedActionView, ViewContext};
impl TerminalView {
/// Returns a reference to the focus handle if one has been set.
@@ -228,7 +228,7 @@ impl TerminalView {
/// Renders the back button for the pane header, or an empty element if the
/// back button should not be shown.
fn maybe_render_header_back_button(&self, app: &AppContext) -> Box<dyn Element> {
if !FeatureFlag::AgentView.is_enabled() || warpui::platform::is_mobile_device() {
if !FeatureFlag::AgentView.is_enabled() || galaxyui::platform::is_mobile_device() {
return Flex::row().finish();
}
@@ -304,7 +304,7 @@ impl TerminalView {
Some(
ConstrainedBox::new(
icons::Icon::Sharing
.to_warpui_icon(shared_session_indicator_color(appearance).into())
.to_galaxyui_icon(shared_session_indicator_color(appearance).into())
.finish(),
)
.with_height(appearance.ui_font_size())
@@ -772,7 +772,7 @@ impl TerminalView {
let Some(conversation) =
BlocklistAIHistoryModel::as_ref(app).conversation(&conversation_id)
else {
return warpui::elements::Empty::new().finish();
return galaxyui::elements::Empty::new().finish();
};
let appearance = Appearance::as_ref(app);
@@ -800,7 +800,7 @@ impl TerminalView {
} else {
WarpIcon::Oz
}
.to_warpui_icon(blended_colors::text_sub(theme, theme.background()).into())
.to_galaxyui_icon(blended_colors::text_sub(theme, theme.background()).into())
.finish(),
)
.with_height(appearance.ui_font_size())
@@ -828,7 +828,7 @@ impl TerminalView {
return Some(
ConstrainedBox::new(
icons::Icon::AlertTriangle
.to_warpui_icon(appearance.theme().ui_error_color().into())
.to_galaxyui_icon(appearance.theme().ui_error_color().into())
.finish(),
)
.with_height(font_size)
@@ -841,7 +841,7 @@ impl TerminalView {
if let Some(shell_indicator_type) = self.shell_indicator_type {
let shell_indicator_icon = shell_indicator_type
.to_icon()
.to_warpui_icon(
.to_galaxyui_icon(
blended_colors::text_sub(appearance.theme(), appearance.theme().background())
.into(),
)
@@ -871,7 +871,7 @@ impl TerminalView {
.clone(),
move |state| {
let mut stack = Stack::new().with_child(
ConstrainedBox::new(icons::Icon::OzCloud.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(icons::Icon::OzCloud.to_galaxyui_icon(icon_color).finish())
.with_height(font_size * 1.5)
.with_width(font_size * 1.5)
.finish(),
app/src/terminal/view/passive_suggestions.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::ViewContext;
use galaxyui::ViewContext;
use crate::{server::telemetry::InteractionSource, terminal::view::CodeDiffAction};
app/src/terminal/view/pending_user_query.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_core::features::FeatureFlag;
use warpui::{SingletonEntity, ViewContext};
use galaxy_core::features::FeatureFlag;
use galaxyui::{SingletonEntity, ViewContext};
use crate::{
ai::{
app/src/terminal/view/plugin_instructions_block.rs
+5 -5
View File
@@ -1,19 +1,19 @@
use std::iter;
use pathfinder_geometry::vector::vec2f;
use warpui::clipboard::ClipboardContent;
use warpui::elements::{
use galaxyui::clipboard::ClipboardContent;
use galaxyui::elements::{
Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
Empty, Expanded, Flex, HyperlinkLens, MainAxisAlignment, MainAxisSize, OffsetPositioning,
ParentAnchor, ParentElement, ParentOffsetBounds, Radius, Stack, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use warpui::elements::FormattedTextElement;
use galaxyui::elements::FormattedTextElement;
use crate::ai::blocklist::code_block::{
render_code_block_plain, CodeBlockOptions, CodeSnippetButtonHandles,
app/src/terminal/view/rich_content.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{prelude::ChildView, Element, EntityId, View, ViewContext, ViewHandle};
use galaxyui::{prelude::ChildView, Element, EntityId, View, ViewContext, ViewHandle};
use crate::{
ai::{
app/src/terminal/view/shared_session/adapter.rs
+3 -3
View File
@@ -21,9 +21,9 @@ use session_sharing_protocol::common::{ParticipantId, ParticipantList, Role, Ses
use session_sharing_protocol::sharer::SessionSourceType;
use std::collections::{HashMap, HashSet};
use std::time::Duration;
use warp_core::features::FeatureFlag;
use warpui::{elements::MouseStateHandle, ModelHandle, ViewContext, ViewHandle};
use warpui::{AppContext, Element};
use galaxy_core::features::FeatureFlag;
use galaxyui::{elements::MouseStateHandle, ModelHandle, ViewContext, ViewHandle};
use galaxyui::{AppContext, Element};
/// The kind of shared session this is.
pub enum Kind {
app/src/terminal/view/shared_session/conversation_ended_tombstone_view.rs
+11 -11
View File
@@ -14,20 +14,20 @@ use crate::view_components::action_button::{ActionButton, PrimaryTheme};
use crate::workspace::WorkspaceAction;
use std::path::Path;
#[cfg(not(target_family = "wasm"))]
use warp_cli::agent::Harness;
use warp_core::paths::home_relative_path;
use galaxy_cli::agent::Harness;
use galaxy_core::paths::home_relative_path;
#[cfg(not(target_family = "wasm"))]
use crate::ai::ambient_agents::AmbientAgentTask;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::icons::Icon;
use warp_core::ui::theme::{AnsiColorIdentifier, Fill};
use warpui::elements::{
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::icons::Icon;
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
use galaxyui::elements::{
Border, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty, Flex,
MainAxisSize, Padding, ParentElement, Radius, Shrinkable, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::{
AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle,
};
@@ -263,7 +263,7 @@ impl ConversationEndedTombstoneView {
ctx
);
ctx.clipboard()
.write(warpui::clipboard::ClipboardContent::plain_text(
.write(galaxyui::clipboard::ClipboardContent::plain_text(
branch.clone(),
));
}
@@ -349,7 +349,7 @@ impl ConversationEndedTombstoneView {
Fill::Solid(theme.ansi_fg_green())
};
let icon_element = Container::new(
ConstrainedBox::new(icon.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(icon_color).finish())
.with_height(14.)
.with_width(14.)
.finish(),
@@ -496,7 +496,7 @@ impl ConversationEndedTombstoneView {
#[cfg(target_family = "wasm")]
{
// Don't show on mobile devices - they can't use the desktop app
if !warpui::platform::wasm::is_mobile_device() {
if !galaxyui::platform::wasm::is_mobile_device() {
if let Some(ref open_in_warp_button) = self.open_in_warp_button {
row.add_child(ChildView::new(open_in_warp_button).finish());
has_button = true;
app/src/terminal/view/shared_session/conversation_ended_tombstone_view_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use chrono::{Duration, Utc};
use warp_cli::agent::Harness;
use galaxy_cli::agent::Harness;
use crate::ai::ambient_agents::task::{
AgentConfigSnapshot, HarnessConfig, RequestUsage, TaskCreatorInfo,
app/src/terminal/view/shared_session/sharer/inactivity_modal.rs
+8 -8
View File
@@ -2,16 +2,16 @@ use std::time::Duration;
use crate::modal::Modal;
use crate::ui_components::blended_colors;
use warp_core::ui::appearance::Appearance;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::{
ChildView, Container, CrossAxisAlignment, Flex, MouseStateHandle, ParentElement, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::platform::Cursor;
use warpui::r#async::Timer;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::platform::Cursor;
use galaxyui::r#async::Timer;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
app/src/terminal/view/shared_session/sharer/mod.rs
+1 -1
View File
@@ -2,7 +2,7 @@ pub mod inactivity_modal;
use inactivity_modal::InactivityModal;
use async_channel::Sender;
use warpui::{
use galaxyui::{
elements::MouseStateHandle, r#async::SpawnedFutureHandle, SingletonEntity, ViewContext,
ViewHandle,
};
app/src/terminal/view/shared_session/test_utils.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use session_sharing_protocol::common::{ParticipantId, ParticipantList, SessionId};
use session_sharing_protocol::sharer::SessionSourceType;
use warpui::platform::WindowStyle;
use warpui::{App, SingletonEntity, ViewHandle};
use galaxyui::platform::WindowStyle;
use galaxyui::{App, SingletonEntity, ViewHandle};
use crate::auth::UserUid;
use crate::editor::ReplicaId;
app/src/terminal/view/shared_session/view_impl.rs
+13 -13
View File
@@ -40,19 +40,19 @@ use session_sharing_protocol::common::{
use session_sharing_protocol::sharer::SessionSourceType;
use session_sharing_protocol::sharer::{RoleUpdateReason, SessionEndedReason};
use session_sharing_protocol::viewer::RoleUpdatedReason;
use warp_core::features::FeatureFlag;
use warpui::r#async::Timer;
use galaxy_core::features::FeatureFlag;
use galaxyui::r#async::Timer;
use settings::Setting as _;
use warp_core::semantic_selection::SemanticSelection;
use warp_core::ui::appearance::Appearance;
use warpui::clipboard::ClipboardContent;
use warpui::platform::Cursor;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::UiComponent;
use warpui::units::IntoLines;
use warpui::{Element, SingletonEntity};
use warpui::{ModelHandle, ViewContext};
use galaxy_core::semantic_selection::SemanticSelection;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::clipboard::ClipboardContent;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::units::IntoLines;
use galaxyui::{Element, SingletonEntity};
use galaxyui::{ModelHandle, ViewContext};
use crate::menu::Event as MenuEvent;
@@ -62,8 +62,8 @@ use crate::terminal::shared_session::participant_avatar_view::ParticipantAvatarV
use session_sharing_protocol::common::ParticipantList;
use session_sharing_protocol::common::ParticipantPresenceUpdate;
use warpui::elements::MouseStateHandle;
use warpui::AppContext;
use galaxyui::elements::MouseStateHandle;
use galaxyui::AppContext;
use super::adapter::{Adapter, Kind, Participant};
use super::sharer::inactivity_modal::InactivityModalEvent;
app/src/terminal/view/shared_session/view_impl_test.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use pathfinder_geometry::vector::vec2f;
use session_sharing_protocol::sharer::SessionSourceType;
use warpui::App;
use galaxyui::App;
use crate::context_chips::prompt_type::PromptType;
app/src/terminal/view/shared_session/viewer.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use crate::terminal::view::{TerminalAction, TerminalView};
use crate::ui_components::icons::Icon;
use session_sharing_protocol::common::{Role, WindowSize};
use warpui::{elements::MouseStateHandle, ViewContext, ViewHandle};
use galaxyui::{elements::MouseStateHandle, ViewContext, ViewHandle};
use super::adapter::Participant;
app/src/terminal/view/shell_terminated_banner.rs
+3 -3
View File
@@ -1,11 +1,11 @@
use std::{borrow::Cow, cell::RefCell};
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance,
builder::UiBuilder,
theme::{color::internal_colors, WarpTheme},
};
use warpui::{
use galaxyui::{
clipboard::ClipboardContent,
elements::*,
text_layout::ClipConfig,
@@ -152,7 +152,7 @@ impl TerminationType {
Container::new(
ConstrainedBox::new(
icon_type
.to_warpui_icon(appearance.theme().background())
.to_galaxyui_icon(appearance.theme().background())
.finish(),
)
.with_width(ICON_SIZE)
app/src/terminal/view/ssh_file_upload.rs
+5 -5
View File
@@ -4,9 +4,9 @@ use itertools::Itertools;
use markdown_parser::{
FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
};
use warp_core::command::ExitCode;
use warp_core::ui::{appearance::Appearance, color::blend::Blend as _};
use warpui::{
use galaxy_core::command::ExitCode;
use galaxy_core::ui::{appearance::Appearance, color::blend::Blend as _};
use galaxyui::{
elements::{
Border, Container, CornerRadius, CrossAxisAlignment, Flex, FormattedTextElement,
HighlightedHyperlink, MainAxisSize, MouseStateHandle, ParentElement, Radius,
@@ -91,7 +91,7 @@ impl TypedActionView for FileUpload {
&mut self,
_action: &Self::Action,
_ctx: &mut ViewContext<Self>,
) -> warpui::accessibility::ActionAccessibilityContent {
) -> galaxyui::accessibility::ActionAccessibilityContent {
Default::default()
}
}
@@ -101,7 +101,7 @@ impl View for FileUpload {
"SSH File Upload"
}
fn render(&self, app: &warpui::AppContext) -> Box<dyn warpui::Element> {
fn render(&self, app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
let appearance = Appearance::as_ref(app);
self.render_file_upload_element(&self.uploads, appearance)
}
app/src/terminal/view/ssh_remote_server_choice_view.rs
+2 -2
View File
@@ -17,8 +17,8 @@
//! Dismissing the block (on click of either option, or when the session is
//! deregistered) is the parent's responsibility.
use settings::Setting;
use warp_core::ui::theme::color::internal_colors;
use warpui::{
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::{
elements::{
Border, ChildView, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Text,
app/src/terminal/view/ssh_remote_server_failed_banner.rs
+4 -4
View File
@@ -1,8 +1,8 @@
//! Banner shown when the remote-server binary check, installation, or connection fails on the remote host.
//! We fall back to the existing Warpification behavior and display this banner so the user knows why advanced features are unavailable.
use warp_core::ui::theme::color::internal_colors;
use warpui::{
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::{
elements::{
ConstrainedBox, Container, CrossAxisAlignment, Flex, Hoverable, MainAxisAlignment,
MainAxisSize, MouseStateHandle, ParentElement, Shrinkable, Text,
@@ -60,7 +60,7 @@ impl View for SshRemoteServerFailedBanner {
// Alert-circle icon
let icon = Container::new(
ConstrainedBox::new(Icon::AlertCircle.to_warpui_icon(fg_color.into()).finish())
ConstrainedBox::new(Icon::AlertCircle.to_galaxyui_icon(fg_color.into()).finish())
.with_width(16.)
.with_height(16.)
.finish(),
@@ -93,7 +93,7 @@ impl View for SshRemoteServerFailedBanner {
// Close (X) button
let close_icon_color = muted_color;
let close = Hoverable::new(self.close_mouse_state.clone(), move |_| {
ConstrainedBox::new(Icon::X.to_warpui_icon(close_icon_color.into()).finish())
ConstrainedBox::new(Icon::X.to_galaxyui_icon(close_icon_color.into()).finish())
.with_width(16.)
.with_height(16.)
.finish()
app/src/terminal/view/tab_metadata.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use crate::context_chips::display_chip::GitLineChanges;
use crate::context_chips::{git_line_changes_from_chips, ContextChipKind};
use crate::terminal::TerminalView;
use warpui::AppContext;
use galaxyui::AppContext;
impl TerminalView {
fn prompt_chip_value(&self, chip_kind: &ContextChipKind, ctx: &AppContext) -> Option<String> {
@@ -20,7 +20,7 @@ impl TerminalView {
.active_block_session_id()
.and_then(|session_id| self.sessions.as_ref(ctx).get(session_id))
.and_then(|session| session.home_dir().map(str::to_owned));
Some(warp_util::path::user_friendly_path(&raw, home_dir.as_deref()).to_string())
Some(galaxy_util::path::user_friendly_path(&raw, home_dir.as_deref()).to_string())
}
pub fn terminal_title_from_shell(&self) -> String {
app/src/terminal/view/testing.rs
+3 -3
View File
@@ -1,5 +1,5 @@
//! Module for test-only convenience methods on `TerminalView`.
use warpui::ModelHandle;
use galaxyui::ModelHandle;
use crate::terminal::find::TerminalFindModel;
cfg_if::cfg_if! {
@@ -7,7 +7,7 @@ cfg_if::cfg_if! {
use std::sync::Arc;
use parking_lot::FairMutex;
use warpui::{ViewContext};
use galaxyui::{ViewContext};
use crate::{
ai::blocklist::SerializedBlockListItem, pane_group::TerminalViewResources,
@@ -33,7 +33,7 @@ impl TerminalView {
ctx: &mut ViewContext<Self>,
) -> Self {
use pathfinder_geometry::vector::vec2f;
use warpui::units::{IntoPixels as _, Pixels};
use galaxyui::units::{IntoPixels as _, Pixels};
use crate::{
server::server_api::ServerApiProvider,
app/src/terminal/view/tooltips.rs
+3 -3
View File
@@ -2,7 +2,7 @@
use pathfinder_geometry::vector::vec2f;
use warpui::{
use galaxyui::{
elements::{
ChildAnchor, Dismiss, MouseStateHandle, OffsetPositioning, PositionedElementAnchor,
PositionedElementOffsetBounds, Stack,
@@ -44,7 +44,7 @@ struct GridTooltipLink {
#[cfg(feature = "local_fs")]
fn open_in_warp_tooltip(
path: std::path::PathBuf,
line_and_column_num: Option<warp_util::path::LineAndColumnArg>,
line_and_column_num: Option<galaxy_util::path::LineAndColumnArg>,
detail_for_default: &mut Option<String>,
mouse_state: MouseStateHandle,
app: &AppContext,
@@ -54,7 +54,7 @@ fn open_in_warp_tooltip(
util::tooltips::should_show_open_in_warp_link,
};
use settings::Setting as _;
use warpui::SingletonEntity;
use galaxyui::SingletonEntity;
if !should_show_open_in_warp_link(&path, app) {
return None;
app/src/terminal/view/use_agent_footer/mod.rs
+5 -5
View File
@@ -12,7 +12,7 @@ use crate::terminal::cli_agent_sessions::{CLIAgentInputEntrypoint, CLIAgentSessi
use crate::terminal::shared_session::{SharedSessionActionSource, SharedSessionScrollbackType};
use base64::Engine;
use session_sharing_protocol::sharer::SessionSourceType;
use warpui::clipboard::{ClipboardContent, ImageData};
use galaxyui::clipboard::{ClipboardContent, ImageData};
mod warpify_footer;
pub use crate::terminal::CLIAgent;
@@ -21,14 +21,14 @@ use warpify_footer::{WarpifyFooterView, WarpifyFooterViewEvent};
use std::sync::{Arc, LazyLock};
use std::time::Duration;
use warpui::r#async::Timer;
use galaxyui::r#async::Timer;
use crate::code_review::diff_state::GitDeltaPreference;
use crate::code_review::telemetry_event::CodeReviewPaneEntrypoint;
use anyhow::anyhow;
use parking_lot::FairMutex;
use pathfinder_color::ColorU;
use warp_core::{
use galaxy_core::{
features::FeatureFlag,
report_error, send_telemetry_from_ctx,
settings::Setting,
@@ -41,7 +41,7 @@ use warp_core::{
},
};
use warpui::{
use galaxyui::{
elements::{
ChildView, Container, CrossAxisAlignment, Empty, Expanded, Flex, MainAxisSize,
ParentElement,
@@ -70,7 +70,7 @@ use crate::{
},
};
use warp_terminal::model::escape_sequences::{BRACKETED_PASTE_END, BRACKETED_PASTE_START};
use galaxy_terminal::model::escape_sequences::{BRACKETED_PASTE_END, BRACKETED_PASTE_START};
use super::{RichContentInsertionPosition, TerminalAction, TerminalView};
use crate::terminal::view::block_banner::WarpificationMode;
app/src/terminal/view/use_agent_footer/mod_test.rs
+2 -2
View File
@@ -1,8 +1,8 @@
use std::rc::Rc;
use session_sharing_protocol::sharer::SessionSourceType;
use warp_core::settings::Setting as _;
use warpui::{App, AppContext, SingletonEntity, ViewContext};
use galaxy_core::settings::Setting as _;
use galaxyui::{App, AppContext, SingletonEntity, ViewContext};
use crate::{
ai::{
app/src/terminal/view/use_agent_footer/warpify_footer.rs
+2 -2
View File
@@ -1,8 +1,8 @@
use std::sync::Arc;
use parking_lot::FairMutex;
use warpui::prelude::Empty;
use warpui::{
use galaxyui::prelude::Empty;
use galaxyui::{
elements::{
ChildView, Container, CrossAxisAlignment, Expanded, Flex, MainAxisSize, ParentElement,
},
app/src/terminal/view/zero_state_block.rs
+3 -3
View File
@@ -1,6 +1,6 @@
use settings::Setting;
use warp_core::{report_if_error, ui::Icon};
use warpui::{
use galaxy_core::{report_if_error, ui::Icon};
use galaxyui::{
elements::{
ChildAnchor, Container, CrossAxisAlignment, Flex, MainAxisSize, OffsetPositioning,
ParentAnchor, ParentElement, ParentOffsetBounds, Shrinkable, Stack, Text,
@@ -154,7 +154,7 @@ impl View for TerminalViewZeroStateBlock {
Container::new(
ConstrainedBox::new(
Icon::Warp
.to_warpui_icon(theme.main_text_color(theme.background()))
.to_galaxyui_icon(theme.main_text_color(theme.background()))
.finish(),
)
.with_height(title_font_size)