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/workspace/view/build_plan_migration_modal.rs
+10 -10
View File
@@ -11,20 +11,20 @@ use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use settings::Setting as _;
use thousands::Separable;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warp_graphql::billing::{AddonCreditsOption, StripeSubscriptionPlan};
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxy_graphql::billing::{AddonCreditsOption, StripeSubscriptionPlan};
use galaxyui::elements::{
Align, Border, CacheOption, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DropShadow, Flex, FormattedTextElement, HighlightedHyperlink, Image,
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, Shrinkable, Stack,
};
use warpui::fonts::{FamilyId, Weight};
use warpui::platform::Cursor;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{
use galaxyui::fonts::{FamilyId, Weight};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
@@ -282,7 +282,7 @@ impl BuildPlanMigrationModal {
ChildView::new(&self.reload_denominations_dropdown).finish()
} else {
// Match dropdown height to prevent layout shift (dropdown is typically ~28-32px)
ConstrainedBox::new(warpui::elements::Empty::new().finish())
ConstrainedBox::new(galaxyui::elements::Empty::new().finish())
.with_width(DROPDOWN_WIDTH)
.with_height(28.)
.finish()
app/src/workspace/view/cloud_agent_capacity_modal/mod.rs
+12 -12
View File
@@ -9,21 +9,21 @@ use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use thousands::Separable;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warp_graphql::billing::StripeSubscriptionPlan;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxy_graphql::billing::StripeSubscriptionPlan;
use galaxyui::elements::{
Align, CacheOption, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
DropShadow, Expanded, Flex, FormattedTextElement, HighlightedHyperlink, Image,
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, Stack,
};
use warpui::fonts::Weight;
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use galaxyui::fonts::Weight;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use crate::send_telemetry_from_ctx;
use crate::TelemetryEvent;
@@ -43,7 +43,7 @@ pub enum CloudAgentCapacityModalVariant {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([FixedBinding::new(
"escape",
@@ -243,7 +243,7 @@ impl CloudAgentCapacityModal {
Container::new(
ConstrainedBox::new(
Icon::CheckCircleBroken
.to_warpui_icon(Fill::Solid(theme.ansi_fg_green()))
.to_galaxyui_icon(Fill::Solid(theme.ansi_fg_green()))
.finish(),
)
.with_width(14.)
app/src/workspace/view/codex_modal.rs
+9 -9
View File
@@ -4,19 +4,19 @@ use crate::view_components::action_button::{ActionButton, ActionButtonTheme};
use asset_macro::bundled_or_fetched_asset;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
Align, Border, CacheOption, ChildAnchor, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DropShadow, Flex, FormattedTextElement, Image, MainAxisAlignment,
MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
ParentOffsetBounds, Radius, Stack, Text,
};
use warpui::fonts::Weight;
use warpui::keymap::FixedBinding;
use warpui::presenter::ChildView;
use warpui::ui_components::components::UiComponent;
use warpui::{
use galaxyui::fonts::Weight;
use galaxyui::keymap::FixedBinding;
use galaxyui::presenter::ChildView;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
@@ -48,7 +48,7 @@ const LEFT_PANEL_WIDTH: f32 = 330.;
const RIGHT_PANEL_WIDTH: f32 = 325.;
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([FixedBinding::new(
"escape",
app/src/workspace/view/conversation_list/item.rs
+11 -11
View File
@@ -11,21 +11,21 @@ use crate::util::time_format::format_approx_duration_from_now_utc;
use crate::util::truncation::truncate_from_end;
use crate::workspace::view::conversation_list::view::ConversationListViewAction;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::color::internal_colors;
use warp_util::path::user_friendly_path;
use warpui::elements::{
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_util::path::user_friendly_path;
use galaxyui::elements::{
AnchorPair, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DispatchEventResult, Element, EventHandler, Flex, Highlight, Hoverable,
MainAxisAlignment, MainAxisSize, MouseInBehavior, MouseStateHandle, OffsetPositioning,
OffsetType, ParentAnchor, ParentElement, ParentOffsetBounds, PositionedElementOffsetBounds,
PositioningAxis, Radius, SavePosition, Shrinkable, Stack, Text, XAxisAnchor, YAxisAnchor,
};
use warpui::fonts::{Properties, Weight};
use warpui::platform::Cursor;
use warpui::text_layout::TextStyle;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{AppContext, SingletonEntity, ViewHandle};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::platform::Cursor;
use galaxyui::text_layout::TextStyle;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{AppContext, SingletonEntity, ViewHandle};
/// Maximum length for tooltip text before truncation
const MAX_TOOLTIP_LENGTH: usize = 80;
@@ -98,7 +98,7 @@ pub fn render_static_item(props: StaticItemProps<'_>, app: &AppContext) -> Box<d
let icon_color = theme.main_text_color(theme.background());
let icon = Container::new(
ConstrainedBox::new(Icon::Plus.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(Icon::Plus.to_galaxyui_icon(icon_color).finish())
.with_width(appearance.ui_font_size())
.with_height(appearance.ui_font_size())
.finish(),
@@ -198,7 +198,7 @@ pub fn render_item(props: ItemProps<'_>, app: &AppContext) -> Box<dyn Element> {
let icon_element: Box<dyn Element> = if conversation.is_ambient_agent_conversation() {
ConstrainedBox::new(
Icon::Cloud
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish(),
)
.with_width(status_element_size)
app/src/workspace/view/conversation_list/view.rs
+14 -14
View File
@@ -29,25 +29,25 @@ use crate::workspace::view::conversation_list::item::{
};
use crate::workspace::ToastStack;
use crate::workspace::WorkspaceAction;
use warp_core::features::FeatureFlag;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::Icon;
use galaxy_core::features::FeatureFlag;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::Icon;
use super::view_model::{ConversationEntry, ConversationListViewModel};
use warp_editor::editor::NavigationKey;
use warpui::elements::{
use galaxy_editor::editor::NavigationKey;
use galaxyui::elements::{
Border, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, Element, Fill, Flex, FormattedTextElement, Hoverable, MainAxisAlignment,
MainAxisSize, MouseStateHandle, OffsetPositioning, Padding, ParentAnchor, ParentElement,
ParentOffsetBounds, Radius, SavePosition, ScrollStateHandle, Scrollable, ScrollableElement,
ScrollbarWidth, Shrinkable, Stack, Text, UniformList, UniformListState,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::macros::*;
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::text_layout::TextAlignment;
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::keymap::macros::*;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::text_layout::TextAlignment;
use galaxyui::{
AppContext, BlurContext, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
ViewContext, ViewHandle, WindowId,
};
@@ -649,7 +649,7 @@ fn render_zero_state(
let chat_icon = ConstrainedBox::new(
Icon::ChatDashed
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish(),
)
.with_width(24.)
@@ -693,7 +693,7 @@ fn render_zero_state(
.with_child(
ConstrainedBox::new(
Icon::Plus
.to_warpui_icon(theme.main_text_color(theme.background()))
.to_galaxyui_icon(theme.main_text_color(theme.background()))
.finish(),
)
.with_width(14.)
@@ -776,7 +776,7 @@ fn render_section_header(
};
let chevron = ConstrainedBox::new(
chevron_icon
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish(),
)
.with_width(12.)
app/src/workspace/view/conversation_list/view_model.rs
+1 -1
View File
@@ -5,7 +5,7 @@ use crate::ai::agent_conversations_model::{
StatusFilter,
};
use fuzzy_match::match_indices_case_insensitive;
use warpui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
pub struct ConversationListViewModelEvent;
app/src/workspace/view/crash_recovery.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_cli::RecoveryMechanism;
use warpui::{AppContext, SingletonEntity as _, ViewContext};
use galaxy_cli::RecoveryMechanism;
use galaxyui::{AppContext, SingletonEntity as _, ViewContext};
use crate::crash_recovery::CrashRecovery;
app/src/workspace/view/free_tier_limit_hit_modal.rs
+15 -15
View File
@@ -10,22 +10,22 @@ use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use thousands::Separable;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::{Fill, WarpTheme};
use warp_graphql::billing::{PlanPricing, StripeSubscriptionPlan};
use warpui::elements::{
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::{Fill, WarpTheme};
use galaxy_graphql::billing::{PlanPricing, StripeSubscriptionPlan};
use galaxyui::elements::{
Align, Border, CacheOption, ChildAnchor, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DropShadow, Flex, FormattedTextElement, HighlightedHyperlink, Image,
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, Stack,
};
use warpui::fonts::Weight;
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use galaxyui::fonts::Weight;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
const BUTTON_DIAMETER: f32 = 20.;
const MODAL_HEIGHT: f32 = 440.;
@@ -33,7 +33,7 @@ const LEFT_PANEL_WIDTH: f32 = 360.;
const RIGHT_PANEL_WIDTH: f32 = 360.;
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([FixedBinding::new(
"escape",
@@ -108,7 +108,7 @@ impl FreeTierLimitHitModal {
Container::new(
ConstrainedBox::new(
Icon::CheckCircleBroken
.to_warpui_icon(Fill::Solid(theme.ansi_fg_green()))
.to_galaxyui_icon(Fill::Solid(theme.ansi_fg_green()))
.finish(),
)
.with_width(14.)
@@ -240,7 +240,7 @@ impl FreeTierLimitHitModal {
Container::new(
ConstrainedBox::new(
Icon::CheckCircleBroken
.to_warpui_icon(Fill::Solid(theme.ansi_fg_green()))
.to_galaxyui_icon(Fill::Solid(theme.ansi_fg_green()))
.finish(),
)
.with_width(14.)
@@ -283,7 +283,7 @@ impl FreeTierLimitHitModal {
Container::new(
ConstrainedBox::new(
Icon::CheckCircleBroken
.to_warpui_icon(Fill::Solid(theme.ansi_fg_green()))
.to_galaxyui_icon(Fill::Solid(theme.ansi_fg_green()))
.finish(),
)
.with_width(14.)
app/src/workspace/view/global_search/model.rs
+8 -8
View File
@@ -7,9 +7,9 @@ use num_traits::SaturatingSub;
use regex::escape;
use std::path::PathBuf;
use string_offset::ByteOffset;
use warp_ripgrep::search::{Match as RipgrepMatch, Submatch};
use warpui::r#async::SpawnedFutureHandle;
use warpui::{Entity, ModelContext, ModelSpawner};
use galaxy_ripgrep::search::{Match as RipgrepMatch, Submatch};
use galaxyui::r#async::SpawnedFutureHandle;
use galaxyui::{Entity, ModelContext, ModelSpawner};
const START_BATCH_AFTER_COUNT: usize = 50;
const MAX_BATCH_SIZE: usize = 512;
@@ -85,7 +85,7 @@ impl GlobalSearch {
let handle = ctx.spawn(
async move {
Self::run_warp_ripgrep_cli(
Self::run_galaxy_ripgrep_cli(
search_id,
effective_pattern,
roots,
@@ -103,7 +103,7 @@ impl GlobalSearch {
});
}
Err(err) => {
log::error!("GlobalSearch: warp_ripgrep CLI search failed or aborted: {err}");
log::error!("GlobalSearch: galaxy_ripgrep CLI search failed or aborted: {err}");
ctx.emit(GlobalSearchEvent::Failed {
search_id,
error: "Global search failed.".to_string(),
@@ -115,7 +115,7 @@ impl GlobalSearch {
self.search_handle = Some(handle);
}
async fn run_warp_ripgrep_cli(
async fn run_galaxy_ripgrep_cli(
search_id: u32,
pattern: String,
roots: Vec<PathBuf>,
@@ -125,12 +125,12 @@ impl GlobalSearch {
) -> Result<usize> {
let roots_display: Vec<_> = roots.iter().map(|r| r.display().to_string()).collect();
log::info!(
"GlobalSearch: starting warp_ripgrep CLI search with pattern={pattern}, roots={:?}",
"GlobalSearch: starting galaxy_ripgrep CLI search with pattern={pattern}, roots={:?}",
roots_display
);
let stream =
warp_ripgrep::search::search_streaming(&[pattern], &roots, ignore_case, multiline)?;
galaxy_ripgrep::search::search_streaming(&[pattern], &roots, ignore_case, multiline)?;
futures::pin_mut!(stream);
let mut total_match_count: usize = 0;
app/src/workspace/view/global_search/model_wasm.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use std::path::PathBuf;
use crate::workspace::view::global_search::view::GlobalSearchEvent;
use crate::workspace::view::global_search::SearchConfig;
use warpui::{Entity, ModelContext};
use galaxyui::{Entity, ModelContext};
pub struct GlobalSearch {}
app/src/workspace/view/global_search/view.rs
+26 -26
View File
@@ -10,8 +10,8 @@ use crate::coding_panel_enablement_state::CodingPanelEnablementState;
use async_channel::Sender;
use pathfinder_geometry::vector::vec2f;
use string_offset::{ByteOffset, CharCounter};
use warp_editor::editor::NavigationKey;
use warp_ripgrep::search::{Match as RipgrepMatch, Submatch};
use galaxy_editor::editor::NavigationKey;
use galaxy_ripgrep::search::{Match as RipgrepMatch, Submatch};
use crate::code::icon_from_file_path;
use crate::debounce::debounce;
@@ -28,12 +28,12 @@ use crate::view_components::action_button::{ActionButton, ButtonSize, NakedTheme
use crate::workspace::view::global_search::model::GlobalSearch;
use crate::workspace::view::global_search::SearchConfig;
use crate::TelemetryEvent;
use warp_core::send_telemetry_from_ctx;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
use warp_core::ui::Icon;
use warpui::elements::{
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
use galaxy_core::ui::Icon;
use galaxyui::elements::{
Border, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DispatchEventResult, Empty, EventHandler, Fill, Flex, FormattedTextElement,
Highlight, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning,
@@ -41,13 +41,13 @@ use warpui::elements::{
Scrollable, ScrollableElement, ScrollbarWidth, Shrinkable, Stack, Text, UniformList,
UniformListState,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::text_layout::{TextAlignment, TextStyle};
use warpui::ui_components::components::{UiComponent as _, UiComponentStyles};
use warpui::ui_components::text::Span;
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::text_layout::{TextAlignment, TextStyle};
use galaxyui::ui_components::components::{UiComponent as _, UiComponentStyles};
use galaxyui::ui_components::text::Span;
use galaxyui::{
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle, WeakViewHandle,
};
@@ -598,7 +598,7 @@ impl GlobalSearchView {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([
FixedBinding::new(
@@ -984,7 +984,7 @@ impl GlobalSearchView {
// Ancestor-dedup search roots so we don't search the same file twice
// when terminal directories are nested (e.g. `~/code` + `~/code/a`).
// Shared with `FileTreeView` for consistency.
self.search_roots = warp_util::path::group_roots_by_common_ancestor(&roots).roots;
self.search_roots = galaxy_util::path::group_roots_by_common_ancestor(&roots).roots;
self.root_directories = roots;
}
@@ -1074,7 +1074,7 @@ impl GlobalSearchView {
directory_path: &Path,
matched_path: &MatchedPath,
appearance: &Appearance,
theme: &warp_core::ui::theme::WarpTheme,
theme: &galaxy_core::ui::theme::WarpTheme,
app: &AppContext,
) -> Box<dyn Element> {
let is_selected = self.is_row_at_index_selected(index);
@@ -1105,7 +1105,7 @@ impl GlobalSearchView {
let icon_size = 16.0;
let chevron_color = item_highlight_state.text_and_icon_color(appearance);
let chevron_icon = chevron_icon_enum
.to_warpui_icon(ThemeFill::from(chevron_color))
.to_galaxyui_icon(ThemeFill::from(chevron_color))
.finish();
let chevron_icon = ConstrainedBox::new(chevron_icon)
.with_width(icon_size)
@@ -1157,7 +1157,7 @@ impl GlobalSearchView {
let icon_color = list_highlight_state.text_and_icon_color(appearance);
let file_icon = match icon_from_file_path {
ImageOrIcon::Icon(icon) => {
icon.to_warpui_icon(ThemeFill::from(icon_color)).finish()
icon.to_galaxyui_icon(ThemeFill::from(icon_color)).finish()
}
ImageOrIcon::Image(image) => image,
};
@@ -1249,7 +1249,7 @@ impl GlobalSearchView {
matched: &Match,
match_index: usize,
appearance: &Appearance,
theme: &warp_core::ui::theme::WarpTheme,
theme: &galaxy_core::ui::theme::WarpTheme,
) -> Box<dyn Element> {
let is_selected = self.is_row_at_index_selected(index);
let line_number = matched.line_number;
@@ -1853,7 +1853,7 @@ impl GlobalSearchView {
index: usize,
dir_entry: &DirectoryEntry,
appearance: &Appearance,
theme: &warp_core::ui::theme::WarpTheme,
theme: &galaxy_core::ui::theme::WarpTheme,
) -> Box<dyn Element> {
let is_selected = self.is_row_at_index_selected(index);
let mouse_state = dir_entry.mouse_state.clone();
@@ -1883,7 +1883,7 @@ impl GlobalSearchView {
let icon_size = 16.0;
let chevron_color = list_highlight_state.text_and_icon_color(appearance);
let chevron_icon = chevron_icon_enum
.to_warpui_icon(ThemeFill::from(chevron_color))
.to_galaxyui_icon(ThemeFill::from(chevron_color))
.finish();
let chevron_icon = ConstrainedBox::new(chevron_icon)
.with_width(icon_size)
@@ -1894,7 +1894,7 @@ impl GlobalSearchView {
// Folder icon
let icon_color = list_highlight_state.text_and_icon_color(appearance);
let folder_icon = Icon::Folder
.to_warpui_icon(ThemeFill::from(icon_color))
.to_galaxyui_icon(ThemeFill::from(icon_color))
.finish();
let folder_icon_element = Container::new(
ConstrainedBox::new(folder_icon)
@@ -2108,7 +2108,7 @@ impl View for GlobalSearchView {
if self.capped_matches {
let alert_icon = ConstrainedBox::new(
Icon::AlertTriangle
.to_warpui_icon(ThemeFill::Solid(
.to_galaxyui_icon(ThemeFill::Solid(
theme.terminal_colors().normal.yellow.into(),
))
.finish(),
@@ -2184,7 +2184,7 @@ impl GlobalSearchView {
.with_child(
Container::new(
ConstrainedBox::new(
icon.to_warpui_icon(ThemeFill::Solid(internal_colors::neutral_6(theme)))
icon.to_galaxyui_icon(ThemeFill::Solid(internal_colors::neutral_6(theme)))
.finish(),
)
.with_width(24.)
app/src/workspace/view/launch_modal/cta_button.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use super::Slide;
use crate::server::telemetry::TelemetryEvent;
use std::rc::Rc;
use warpui::ViewContext;
use galaxyui::ViewContext;
/// A callback function for custom CTA button actions.
type CustomCallback<S> = Rc<dyn Fn(&mut ViewContext<super::LaunchModal<S>>)>;
app/src/workspace/view/launch_modal/mod.rs
+12 -12
View File
@@ -13,27 +13,27 @@ use crate::workspace::view::launch_modal::cta_button::{CTAButton, CTAButtonActio
use markdown_parser::{parse_markdown, FormattedText, FormattedTextLine};
use pathfinder_color::ColorU;
use std::collections::HashMap;
use warp_core::ui::appearance::Appearance;
use warp_core::ui::theme::Fill;
use warpui::assets::asset_cache::AssetSource;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::theme::Fill;
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::elements::{
Align, Border, CacheOption, ChildAnchor, Clipped, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, DropShadow, Empty, Expanded, Flex, FormattedTextElement,
HighlightedHyperlink, Hoverable, HyperlinkLens, Image, MainAxisAlignment, MainAxisSize,
MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius,
Shrinkable, SizeConstraintCondition, SizeConstraintSwitch, Stack,
};
use warpui::fonts::Weight;
use warpui::keymap::FixedBinding;
use warpui::platform::Cursor;
use warpui::presenter::ChildView;
use warpui::ui_components::components::UiComponent;
use warpui::{
use galaxyui::fonts::Weight;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::Cursor;
use galaxyui::presenter::ChildView;
use galaxyui::ui_components::components::UiComponent;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
pub fn init<S: Slide>(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([
FixedBinding::new("escape", LaunchModalAction::<S>::Close, id!("LaunchModal")),
@@ -371,7 +371,7 @@ impl<S: Slide> LaunchModal<S> {
.with_child(
Container::new(
ConstrainedBox::new(
icon.to_warpui_icon(Fill::Solid(
icon.to_galaxyui_icon(Fill::Solid(
blended_colors::text_main(
theme,
blended_colors::neutral_2(theme),
app/src/workspace/view/launch_modal/oz_launch.rs
+5 -5
View File
@@ -8,9 +8,9 @@ use crate::workspaces::user_workspaces::UserWorkspaces;
use crate::workspaces::workspace::{AdminEnablementSetting, UgcCollectionEnablementSetting};
use asset_macro::bundled_or_fetched_asset;
use markdown_parser::{FormattedTextFragment, FormattedTextLine};
use warp_core::send_telemetry_from_ctx;
use warpui::assets::asset_cache::AssetSource;
use warpui::{AppContext, SingletonEntity};
use galaxy_core::send_telemetry_from_ctx;
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::{AppContext, SingletonEntity};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum OzLaunchSlide {
@@ -188,7 +188,7 @@ impl Slide for OzLaunchSlide {
) && !matches!(ugc_setting, UgcCollectionEnablementSetting::Enable)
}
fn on_close(&self, ctx: &mut warpui::ViewContext<super::LaunchModal<Self>>) {
fn on_close(&self, ctx: &mut galaxyui::ViewContext<super::LaunchModal<Self>>) {
ctx.dispatch_typed_action(&WorkspaceAction::StartAgentOnboardingTutorial(
OnboardingTutorial::NoProject {
intention: OnboardingIntention::AgentDrivenDevelopment,
@@ -197,6 +197,6 @@ impl Slide for OzLaunchSlide {
}
}
pub fn init(app: &mut warpui::AppContext) {
pub fn init(app: &mut galaxyui::AppContext) {
super::init::<OzLaunchSlide>(app);
}
app/src/workspace/view/left_panel.rs
+12 -12
View File
@@ -1,10 +1,10 @@
use std::collections::HashSet;
use std::path::PathBuf;
use warp_core::ui::theme::color::internal_colors;
use warp_core::{send_telemetry_from_ctx, ui::Icon};
use warp_util::path::LineAndColumnArg;
use warpui::{
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::{send_telemetry_from_ctx, ui::Icon};
use galaxy_util::path::LineAndColumnArg;
use galaxyui::{
elements::{
resizable_state_handle, ChildView, ConstrainedBox, Container, CrossAxisAlignment,
DragBarSide, Element, Empty, Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle,
@@ -91,7 +91,7 @@ pub enum LeftPanelEvent {
ShowDeleteConfirmationDialog {
conversation_id: AIConversationId,
conversation_title: String,
terminal_view_id: Option<warpui::EntityId>,
terminal_view_id: Option<galaxyui::EntityId>,
},
}
@@ -107,7 +107,7 @@ pub enum ToolPanelView {
/// `active_view_state::set`, which handles necessary side effects.
mod active_view_state {
use super::ToolPanelView;
use warpui::ViewContext;
use galaxyui::ViewContext;
pub struct ActiveViewState(ToolPanelView);
@@ -144,9 +144,9 @@ mod active_view_state {
}
pub struct ToolbeltButtonConfig {
pub icon: warp_core::ui::Icon,
pub icon: galaxy_core::ui::Icon,
/// Optional icon to use when the given toolbelt option is in an active state.
pub active_icon: Option<warp_core::ui::Icon>,
pub active_icon: Option<galaxy_core::ui::Icon>,
pub tooltip_text: String,
pub action: LeftPanelAction,
/// Whether the button should be rendered with an "active" state.
@@ -445,7 +445,7 @@ impl LeftPanelView {
fn get_or_create_global_search_view_for_pane_group(
&mut self,
pane_group_id: warpui::EntityId,
pane_group_id: galaxyui::EntityId,
ctx: &mut ViewContext<Self>,
) -> ViewHandle<GlobalSearchView> {
if let Some(view) = self
@@ -471,7 +471,7 @@ impl LeftPanelView {
fn get_or_create_file_tree_view_for_pane_group(
&mut self,
pane_group_id: warpui::EntityId,
pane_group_id: galaxyui::EntityId,
ctx: &mut ViewContext<Self>,
) -> ViewHandle<FileTreeView> {
if let Some(view) = self
@@ -988,7 +988,7 @@ impl LeftPanelView {
fn deactivate_file_tree_view_for_pane_group(
&self,
pane_group_id: warpui::EntityId,
pane_group_id: galaxyui::EntityId,
ctx: &mut ViewContext<Self>,
) {
if let Some(view) = self
@@ -1182,7 +1182,7 @@ impl View for LeftPanelView {
})
.finish();
if warpui::platform::is_mobile_device() {
if galaxyui::platform::is_mobile_device() {
return panel_content;
}
app/src/workspace/view/onboarding.rs
+1 -1
View File
@@ -10,7 +10,7 @@ use onboarding::{ProjectOnboardingSettings, SelectedSettings};
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::Arc;
use warpui::{SingletonEntity as _, ViewContext};
use galaxyui::{SingletonEntity as _, ViewContext};
/// Configuration for starting the agent onboarding tutorial.
#[derive(Debug, Clone)]
app/src/workspace/view/openwarp_launch_modal/view.rs
+9 -9
View File
@@ -3,17 +3,17 @@ use markdown_parser::{
};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::{phenomenon::PhenomenonStyle, Fill};
use warpui::assets::asset_cache::AssetSource;
use warpui::elements::{
use galaxy_core::ui::theme::{phenomenon::PhenomenonStyle, Fill};
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::elements::{
Align, CacheOption, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, Expanded, Flex, FormattedTextElement, HighlightedHyperlink, Image,
MainAxisSize, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius,
Stack, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::FixedBinding;
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::keymap::FixedBinding;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
@@ -69,7 +69,7 @@ const FEATURE_ITEMS: &[FeatureItem] = &[
];
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([FixedBinding::new(
"escape",
@@ -295,7 +295,7 @@ impl OpenWarpLaunchModal {
fn render_feature_row(item: &FeatureItem, appearance: &Appearance) -> Box<dyn Element> {
let icon_el = ConstrainedBox::new(
item.icon
.to_warpui_icon(Fill::Solid(
.to_galaxyui_icon(Fill::Solid(
PhenomenonStyle::modal_feature_description_text(),
))
.finish(),
@@ -370,7 +370,7 @@ impl View for OpenWarpLaunchModal {
"OpenWarpLaunchModal"
}
fn on_focus(&mut self, _focus_ctx: &warpui::FocusContext, ctx: &mut ViewContext<Self>) {
fn on_focus(&mut self, _focus_ctx: &galaxyui::FocusContext, ctx: &mut ViewContext<Self>) {
ctx.focus_self();
}
app/src/workspace/view/right_panel.rs
+12 -12
View File
@@ -36,13 +36,13 @@ use std::{
path::{Path, PathBuf},
sync::Arc,
};
use warp_core::features::FeatureFlag;
use warp_core::ui::Icon;
use warp_util::path::LineAndColumnArg;
use warpui::elements::{ChildAnchor, Empty, PositionedElementAnchor};
use warpui::keymap::EditableBinding;
use warpui::EntityId;
use warpui::{
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::Icon;
use galaxy_util::path::LineAndColumnArg;
use galaxyui::elements::{ChildAnchor, Empty, PositionedElementAnchor};
use galaxyui::keymap::EditableBinding;
use galaxyui::EntityId;
use galaxyui::{
elements::{
resizable_state_handle, Container, DragBarSide, Element, MainAxisSize, MouseStateHandle,
Resizable, ResizableStateHandle,
@@ -50,7 +50,7 @@ use warpui::{
AppContext, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle, WeakViewHandle,
};
use warpui::{
use galaxyui::{
elements::{
ChildView, Clipped, ConstrainedBox, CrossAxisAlignment, Flex, MainAxisAlignment,
ParentElement, Shrinkable, Text,
@@ -156,7 +156,7 @@ impl CodeReviewState {
dropdown.set_font_color(font_color, ctx);
dropdown.set_font_size(ui_font_size, ctx);
dropdown.set_vertical_margin(0., ctx);
dropdown.set_top_bar_height(warp_core::ui::icons::ICON_DIMENSIONS, ctx);
dropdown.set_top_bar_height(galaxy_core::ui::icons::ICON_DIMENSIONS, ctx);
dropdown.set_padding(HEADER_BUTTON_PADDING, ctx);
dropdown
}),
@@ -345,7 +345,7 @@ pub struct RightPanelView {
impl RightPanelView {
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_editable_bindings([EditableBinding::new(
"workspace:toggle_maximize_code_review_panel",
@@ -838,8 +838,8 @@ impl RightPanelView {
#[cfg_attr(not(feature = "local_fs"), allow(dead_code))]
fn render_maximize_pane_button(&self) -> Box<dyn Element> {
ConstrainedBox::new(ChildView::new(&self.maximize_button).finish())
.with_height(warp_core::ui::icons::ICON_DIMENSIONS)
.with_width(warp_core::ui::icons::ICON_DIMENSIONS)
.with_height(galaxy_core::ui::icons::ICON_DIMENSIONS)
.with_width(galaxy_core::ui::icons::ICON_DIMENSIONS)
.finish()
}
app/src/workspace/view/startup_directory.rs
+2 -2
View File
@@ -7,8 +7,8 @@ use crate::terminal::available_shells::AvailableShells;
use crate::terminal::session_settings::{NewSessionSource, SessionSettings};
use crate::terminal::ShellLaunchData;
use std::path::PathBuf;
use warpui::SingletonEntity;
use warpui::{AppContext, ViewContext, WindowId};
use galaxyui::SingletonEntity;
use galaxyui::{AppContext, ViewContext, WindowId};
impl Workspace {
/// Helper function to compute the initial directory for a new session
app/src/workspace/view/vertical_tabs.rs
+41 -41
View File
@@ -56,15 +56,15 @@ use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use settings::Setting as _;
use std::path::{Path, PathBuf};
use warp_core::context_flag::ContextFlag;
use warp_core::telemetry::TelemetryEvent as _;
use warp_core::ui::color::blend::Blend;
use warp_core::ui::color::coloru_with_opacity;
use warp_core::ui::theme::color::internal_colors;
use warp_core::ui::theme::{AnsiColorIdentifier, Fill as WarpThemeFill, WarpTheme};
use warp_core::ui::Icon as WarpIcon;
use warpui::elements::DispatchEventResult;
use warpui::elements::{
use galaxy_core::context_flag::ContextFlag;
use galaxy_core::telemetry::TelemetryEvent as _;
use galaxy_core::ui::color::blend::Blend;
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill as WarpThemeFill, WarpTheme};
use galaxy_core::ui::Icon as WarpIcon;
use galaxyui::elements::DispatchEventResult;
use galaxyui::elements::{
resizable_state_handle, Border, ChildAnchor, Clipped, ClippedScrollStateHandle,
ClippedScrollable, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DragAxis,
DragBarSide, Draggable, DropShadow, DropTarget, Element, Empty, EventHandler, Expanded,
@@ -73,13 +73,13 @@ use warpui::elements::{
PositionedElementOffsetBounds, Radius, Resizable, ResizableStateHandle, SavePosition,
ScrollTarget, ScrollToPositionMode, ScrollbarWidth, Shrinkable, Stack, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::platform::Cursor;
use warpui::prelude::{Align, MainAxisAlignment};
use warpui::text_layout::ClipConfig;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::ui_components::text_input::TextInput;
use warpui::{AppContext, EntityId, SingletonEntity, ViewHandle, WindowId};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::platform::Cursor;
use galaxyui::prelude::{Align, MainAxisAlignment};
use galaxyui::text_layout::ClipConfig;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::ui_components::text_input::TextInput;
use galaxyui::{AppContext, EntityId, SingletonEntity, ViewHandle, WindowId};
const PANEL_WIDTH: f32 = 248.;
const MIN_PANEL_WIDTH: f32 = 200.;
@@ -1166,7 +1166,7 @@ fn render_control_bar(
let theme = appearance.theme();
let sub_text = theme.sub_text_color(theme.background());
let search_icon = ConstrainedBox::new(WarpIcon::Search.to_warpui_icon(sub_text).finish())
let search_icon = ConstrainedBox::new(WarpIcon::Search.to_galaxyui_icon(sub_text).finish())
.with_width(SEARCH_ICON_SIZE)
.with_height(SEARCH_ICON_SIZE)
.finish();
@@ -1228,7 +1228,7 @@ fn render_detail_kind_badge_icon(
.and_then(|session| session.agent.brand_color())
.map(WarpThemeFill::Solid)
.unwrap_or_else(|| theme.accent());
return icon.to_warpui_icon(color).finish();
return icon.to_galaxyui_icon(color).finish();
}
let icon = if terminal_view.is_ambient_agent_session(app) {
@@ -1246,10 +1246,10 @@ fn render_detail_kind_badge_icon(
WarpIcon::Terminal => disabled_text,
_ => sub_text,
};
icon.to_warpui_icon(color).finish()
icon.to_galaxyui_icon(color).finish()
}
TypedPane::Code(_) => icon_from_file_path(&props.title, appearance)
.unwrap_or_else(|| WarpIcon::Code2.to_warpui_icon(sub_text).finish()),
.unwrap_or_else(|| WarpIcon::Code2.to_galaxyui_icon(sub_text).finish()),
typed => {
let fill = typed
.warp_drive_object_type()
@@ -1257,7 +1257,7 @@ fn render_detail_kind_badge_icon(
WarpThemeFill::Solid(warp_drive_icon_color(appearance, object_type))
})
.unwrap_or(sub_text);
typed.icon().to_warpui_icon(fill).finish()
typed.icon().to_galaxyui_icon(fill).finish()
}
}
}
@@ -1277,7 +1277,7 @@ fn render_settings_button(
move |hover_state| {
let icon = ConstrainedBox::new(
WarpIcon::Settings
.to_warpui_icon(if is_popup_open { main_text } else { sub_text })
.to_galaxyui_icon(if is_popup_open { main_text } else { sub_text })
.finish(),
)
.with_width(16.)
@@ -2090,7 +2090,7 @@ fn render_group_action_buttons(
let kebab_button = Hoverable::new(kebab_mouse_state, move |button_state| {
let mut container = Container::new(
ConstrainedBox::new(WarpIcon::DotsVertical.to_warpui_icon(meta_color).finish())
ConstrainedBox::new(WarpIcon::DotsVertical.to_galaxyui_icon(meta_color).finish())
.with_width(GROUP_ACTION_BUTTON_ICON_SIZE)
.with_height(GROUP_ACTION_BUTTON_ICON_SIZE)
.finish(),
@@ -2113,7 +2113,7 @@ fn render_group_action_buttons(
let close_button = Hoverable::new(close_mouse_state, move |button_state| {
let mut container = Container::new(
ConstrainedBox::new(WarpIcon::X.to_warpui_icon(meta_color).finish())
ConstrainedBox::new(WarpIcon::X.to_galaxyui_icon(meta_color).finish())
.with_width(GROUP_ACTION_BUTTON_ICON_SIZE)
.with_height(GROUP_ACTION_BUTTON_ICON_SIZE)
.finish(),
@@ -2344,7 +2344,7 @@ const INDICATOR_DOT_SIZE: f32 = 8.;
fn render_title_indicator(theme: &WarpTheme) -> Box<dyn Element> {
ConstrainedBox::new(
WarpIcon::CircleFilled
.to_warpui_icon(theme.accent())
.to_galaxyui_icon(theme.accent())
.finish(),
)
.with_width(INDICATOR_DOT_SIZE)
@@ -2594,7 +2594,7 @@ fn pane_display_title_and_subtitle(
.unwrap_or_default();
let home_dir = dirs::home_dir();
let home_str = home_dir.as_ref().and_then(|path| path.to_str());
let parent = warp_util::path::user_friendly_path(&parent_raw, home_str).to_string();
let parent = galaxy_util::path::user_friendly_path(&parent_raw, home_str).to_string();
(filename, parent)
} else {
(
@@ -3341,7 +3341,7 @@ fn render_git_branch_text(
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_spacing(2.)
.with_child(
ConstrainedBox::new(UiIcon::GitBranch.to_warpui_icon(text_color).finish())
ConstrainedBox::new(UiIcon::GitBranch.to_galaxyui_icon(text_color).finish())
.with_width(font_size - 2.)
.with_height(font_size - 2.)
.finish(),
@@ -3634,7 +3634,7 @@ fn render_summary_pane_kind_icon_circle(
WarpIcon::Oz
};
(
icon.to_warpui_icon(oz_icon_fill(theme)).finish(),
icon.to_galaxyui_icon(oz_icon_fill(theme)).finish(),
theme.background().into(),
)
}
@@ -3643,12 +3643,12 @@ fn render_summary_pane_kind_icon_circle(
let icon_element = agent
.icon()
.map(|icon| {
icon.to_warpui_icon(WarpThemeFill::Solid(icon_color))
icon.to_galaxyui_icon(WarpThemeFill::Solid(icon_color))
.finish()
})
.unwrap_or_else(|| {
WarpIcon::Terminal
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish()
});
(
@@ -3664,7 +3664,7 @@ fn render_summary_pane_kind_icon_circle(
SummaryPaneKind::Code { title } => (
icon_from_file_path(&title, appearance).unwrap_or_else(|| {
WarpIcon::Code2
.to_warpui_icon(theme.sub_text_color(theme.background()))
.to_galaxyui_icon(theme.sub_text_color(theme.background()))
.finish()
}),
internal_colors::fg_overlay_2(theme).into(),
@@ -3683,7 +3683,7 @@ fn render_summary_pane_kind_icon_circle(
| SummaryPaneKind::Other => {
let (icon, icon_color) = summary_pane_kind_icon(kind, appearance);
(
icon.to_warpui_icon(icon_color).finish(),
icon.to_galaxyui_icon(icon_color).finish(),
internal_colors::fg_overlay_2(theme).into(),
)
}
@@ -3871,7 +3871,7 @@ fn render_terminal_primary_line(
.with_child(
ConstrainedBox::new(
UiIcon::AlertTriangle
.to_warpui_icon(error_color.into())
.to_galaxyui_icon(error_color.into())
.finish(),
)
.with_width(BADGE_ICON_SIZE)
@@ -4154,7 +4154,7 @@ fn render_pull_request_badge_content(label: &str, appearance: &Appearance) -> Bo
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_spacing(4.)
.with_child(
ConstrainedBox::new(UiIcon::Github.to_warpui_icon(main_text_color).finish())
ConstrainedBox::new(UiIcon::Github.to_galaxyui_icon(main_text_color).finish())
.with_width(BADGE_ICON_SIZE)
.with_height(BADGE_ICON_SIZE)
.finish(),
@@ -4716,7 +4716,7 @@ fn render_compact_subtitle_option(
let main_text = theme.main_text_color(theme.background());
Hoverable::new(mouse_state, move |hover_state| {
let check_icon: Box<dyn Element> = if is_selected {
ConstrainedBox::new(WarpIcon::Check.to_warpui_icon(main_text).finish())
ConstrainedBox::new(WarpIcon::Check.to_galaxyui_icon(main_text).finish())
.with_width(ICON_SIZE)
.with_height(ICON_SIZE)
.finish()
@@ -4769,7 +4769,7 @@ fn render_tab_item_mode_option(
let main_text = theme.main_text_color(theme.background());
Hoverable::new(mouse_state, move |hover_state| {
let check_icon: Box<dyn Element> = if is_selected {
ConstrainedBox::new(WarpIcon::Check.to_warpui_icon(main_text).finish())
ConstrainedBox::new(WarpIcon::Check.to_galaxyui_icon(main_text).finish())
.with_width(ICON_SIZE)
.with_height(ICON_SIZE)
.finish()
@@ -4822,7 +4822,7 @@ fn render_primary_info_option(
let main_text = theme.main_text_color(theme.background());
Hoverable::new(mouse_state, move |hover_state| {
let check_icon: Box<dyn Element> = if is_selected {
ConstrainedBox::new(WarpIcon::Check.to_warpui_icon(main_text).finish())
ConstrainedBox::new(WarpIcon::Check.to_galaxyui_icon(main_text).finish())
.with_width(ICON_SIZE)
.with_height(ICON_SIZE)
.finish()
@@ -4889,7 +4889,7 @@ fn render_show_toggle_option(
Hoverable::new(mouse_state, move |hover_state| {
let check_icon: Box<dyn Element> = if is_enabled {
ConstrainedBox::new(WarpIcon::Check.to_warpui_icon(main_text).finish())
ConstrainedBox::new(WarpIcon::Check.to_galaxyui_icon(main_text).finish())
.with_width(ICON_SIZE)
.with_height(ICON_SIZE)
.finish()
@@ -4912,7 +4912,7 @@ fn render_show_toggle_option(
{
let builder = ui_builder.clone();
let info_icon = Hoverable::new(info_ms, move |info_hover| {
let icon = ConstrainedBox::new(UiIcon::Info.to_warpui_icon(info_color).finish())
let icon = ConstrainedBox::new(UiIcon::Info.to_galaxyui_icon(info_color).finish())
.with_width(INFO_ICON_SIZE)
.with_height(INFO_ICON_SIZE)
.finish();
@@ -4977,7 +4977,7 @@ fn render_popup_segment(
Container::new(
Align::new(
ConstrainedBox::new(icon.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(icon_color).finish())
.with_width(COMPACT_ICON_SIZE)
.with_height(COMPACT_ICON_SIZE)
.finish(),
@@ -5244,7 +5244,7 @@ fn render_detail_status_pill(
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_spacing(4.)
.with_child(
ConstrainedBox::new(icon.to_warpui_icon(WarpThemeFill::Solid(color)).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(WarpThemeFill::Solid(color)).finish())
.with_width(12.)
.with_height(12.)
.finish(),
app/src/workspace/view/vertical_tabs/telemetry.rs
+4 -4
View File
@@ -1,7 +1,7 @@
use serde_json::{json, Value};
use strum_macros::{EnumDiscriminants, EnumIter};
use warp_core::features::FeatureFlag;
use warp_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use galaxy_core::features::FeatureFlag;
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use crate::workspace::tab_settings::{
VerticalTabsCompactSubtitle, VerticalTabsDisplayGranularity, VerticalTabsPrimaryInfo,
@@ -133,7 +133,7 @@ impl TelemetryEvent for VerticalTabsTelemetryEvent {
}
fn event_descs() -> impl Iterator<Item = Box<dyn TelemetryEventDesc>> {
warp_core::telemetry::enum_events::<Self>()
galaxy_core::telemetry::enum_events::<Self>()
}
}
@@ -165,4 +165,4 @@ impl TelemetryEventDesc for VerticalTabsTelemetryEventDiscriminants {
}
}
warp_core::register_telemetry_event!(VerticalTabsTelemetryEvent);
galaxy_core::register_telemetry_event!(VerticalTabsTelemetryEvent);
app/src/workspace/view/vertical_tabs_tests.rs
+2 -2
View File
@@ -7,8 +7,8 @@ use crate::workspace::tab_settings::VerticalTabsDisplayGranularity;
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::Vector2F;
use std::path::PathBuf;
use warpui::elements::PositionedElementOffsetBounds;
use warpui::EntityId;
use galaxyui::elements::PositionedElementOffsetBounds;
use galaxyui::EntityId;
use super::{
branch_label_display, coalesce_summary_branch_entries, code_detail_kind_label,
app/src/workspace/view/wasm_view.rs
+3 -3
View File
@@ -1,9 +1,9 @@
//! WASM-only view functions for the Workspace.
use warpui::elements::{ChildView, Element};
use warpui::{AppContext, SingletonEntity, ViewContext, ViewHandle};
use galaxyui::elements::{ChildView, Element};
use galaxyui::{AppContext, SingletonEntity, ViewContext, ViewHandle};
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
use crate::uri::browser_url_handler::parse_current_url;