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/drive/cloud_action_confirmation_dialog.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{CornerRadius, Dismiss, MouseStateHandle, Radius},
fonts::Weight,
platform::Cursor,
app/src/drive/cloud_object_naming_dialog.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{
Border, Clipped, Container, CornerRadius, Dismiss, Empty, Flex, MainAxisSize,
MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
app/src/drive/cloud_object_styling.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use pathfinder_color::ColorU;
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance,
color::{contrast::MinimumAllowedContrast, ContrastingColor},
theme::Fill,
app/src/drive/drive_helpers.rs
+4 -4
View File
@@ -1,4 +1,4 @@
use warpui::{SingletonEntity, ViewContext};
use galaxyui::{SingletonEntity, ViewContext};
use crate::{
auth::{auth_manager::AuthManager, AuthStateProvider},
@@ -8,7 +8,7 @@ use crate::{
},
};
pub fn has_feature_gated_anonymous_user_reached_notebook_limit<V: warpui::View>(
pub fn has_feature_gated_anonymous_user_reached_notebook_limit<V: galaxyui::View>(
ctx: &mut ViewContext<V>,
) -> bool {
let count = CloudModel::handle(ctx).read(ctx, |model, ctx| {
@@ -31,7 +31,7 @@ pub fn has_feature_gated_anonymous_user_reached_notebook_limit<V: warpui::View>(
false
}
pub fn has_feature_gated_anonymous_user_reached_workflow_limit<V: warpui::View>(
pub fn has_feature_gated_anonymous_user_reached_workflow_limit<V: galaxyui::View>(
ctx: &mut ViewContext<V>,
) -> bool {
let count = CloudModel::handle(ctx).read(ctx, |model, ctx| {
@@ -54,7 +54,7 @@ pub fn has_feature_gated_anonymous_user_reached_workflow_limit<V: warpui::View>(
false
}
pub fn has_feature_gated_anonymous_user_reached_env_var_limit<V: warpui::View>(
pub fn has_feature_gated_anonymous_user_reached_env_var_limit<V: galaxyui::View>(
ctx: &mut ViewContext<V>,
) -> bool {
let count = CloudModel::handle(ctx).read(ctx, |model, ctx| {
app/src/drive/empty_trash_confirmation_dialog.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::MouseStateHandle,
fonts::Weight,
platform::Cursor,
app/src/drive/export.rs
+2 -2
View File
@@ -14,8 +14,8 @@ use aho_corasick::{AhoCorasick, MatchKind};
use anyhow::{anyhow, Context};
#[cfg(feature = "local_fs")]
use futures::AsyncWriteExt;
use warp_util::path::ShellFamily;
use warpui::{
use galaxy_util::path::ShellFamily;
use galaxyui::{
platform::{file_picker::FilePickerError, FilePickerConfiguration, OperatingSystem},
r#async::SpawnedFutureHandle,
AppContext, Entity, ModelContext, SingletonEntity, WindowId,
app/src/drive/export_tests.rs
+2 -2
View File
@@ -8,8 +8,8 @@ use std::{
use futures::channel::oneshot;
use parking_lot::Mutex;
use tempfile::TempDir;
use warp_util::path::ShellFamily;
use warpui::{AddSingletonModel, App, SingletonEntity, WindowId};
use galaxy_util::path::ShellFamily;
use galaxyui::{AddSingletonModel, App, SingletonEntity, WindowId};
use crate::{
cloud_object::{
app/src/drive/folders/mod.rs
+2 -2
View File
@@ -21,8 +21,8 @@ use crate::{
use anyhow::Result;
use async_trait::async_trait;
// Re-exported from warp_server_client.
pub use warp_server_client::ids::FolderId;
// Re-exported from galaxy_server_client.
pub use galaxy_server_client::ids::FolderId;
/// The model for a `CloudFolder`.
#[derive(Clone, Debug, PartialEq)]
app/src/drive/import/import_tests.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::env::current_dir;
use warp_core::ui::appearance::Appearance;
use warpui::App;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::App;
use crate::{
cloud_object::model::persistence::CloudModel,
@@ -37,6 +37,6 @@ fn test_expand_directories() {
.join("integration");
// Open a folder and verify we could expand it into the correct folder tree structure.
assert_eq!(warpui::r#async::block_on(expand_dirs([directory].into_iter().collect())).debug_print(), "(integration(tests(INTEGRATION_TESTING, data(test, test_launch_config, test_theme, test_theme_with_name, test_workflow))))");
assert_eq!(galaxyui::r#async::block_on(expand_dirs([directory].into_iter().collect())).debug_print(), "(integration(tests(INTEGRATION_TESTING, data(test, test_launch_config, test_theme, test_theme_with_name, test_workflow))))");
});
}
app/src/drive/import/modal.rs
+2 -2
View File
@@ -6,8 +6,8 @@ use crate::{
workspaces::user_workspaces::UserWorkspaces,
};
use pathfinder_geometry::vector::vec2f;
use warp_core::ui::theme::Fill;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxyui::{
elements::{
Align, Border, ChildAnchor, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox,
Container, CornerRadius, CrossAxisAlignment, Flex, Highlight, MouseStateHandle,
app/src/drive/import/modal_body.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use futures_util::stream::AbortHandle;
use pathfinder_geometry::vector::vec2f;
use std::path::PathBuf;
use warpui::{
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex,
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius,
@@ -394,7 +394,7 @@ impl ImportModalBody {
TextAndIcon::new(
TextAndIconAlignment::TextFirst,
"Choose files...".to_string(),
Icon::Import.to_warpui_icon(
Icon::Import.to_galaxyui_icon(
appearance
.theme()
.main_text_color(appearance.theme().accent_button_color()),
app/src/drive/import/nodes.rs
+8 -8
View File
@@ -15,7 +15,7 @@ use std::{
ops::{Add, AddAssign, SubAssign},
path::{Path, PathBuf},
};
use warpui::{
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
MouseStateHandle, ParentElement, Radius, Shrinkable,
@@ -331,7 +331,7 @@ impl FolderNode {
override_color.unwrap_or(warp_drive_icon_color(appearance, DriveObjectType::Folder));
let icon = ConstrainedBox::new(
Icon::Folder
.to_warpui_icon(Fill::Solid(icon_color))
.to_galaxyui_icon(Fill::Solid(icon_color))
.finish(),
)
.with_height(IMPORT_FONT_SIZE)
@@ -459,24 +459,24 @@ impl UploadStatus {
) -> Box<dyn Element> {
let status_icon_element = match &self {
UploadStatus::SavedLocally if !sync_queue_dequeueing => Icon::Laptop
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.sub_text_color(appearance.theme().surface_1()),
)
.finish(),
UploadStatus::Loading | UploadStatus::SavedLocally => Icon::Refresh
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.sub_text_color(appearance.theme().surface_1()),
)
.finish(),
UploadStatus::Loaded(_) => 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(),
UploadStatus::Error(_) => Icon::AlertTriangle
.to_warpui_icon(Fill::Solid(appearance.theme().ui_error_color()))
.to_galaxyui_icon(Fill::Solid(appearance.theme().ui_error_color()))
.finish(),
};
@@ -553,12 +553,12 @@ impl FileNode {
let icon_element = match &self.file_type {
FileType::Workflow => Icon::Workflow
.to_warpui_icon(Fill::Solid(override_color.unwrap_or(
.to_galaxyui_icon(Fill::Solid(override_color.unwrap_or(
warp_drive_icon_color(appearance, DriveObjectType::Workflow),
)))
.finish(),
FileType::Notebook => Icon::Notebook
.to_warpui_icon(Fill::Solid(override_color.unwrap_or(
.to_galaxyui_icon(Fill::Solid(override_color.unwrap_or(
warp_drive_icon_color(
appearance,
DriveObjectType::Notebook {
app/src/drive/import/queue.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use warpui::{Entity, ModelContext, SingletonEntity};
use galaxyui::{Entity, ModelContext, SingletonEntity};
use crate::{
cloud_object::{model::persistence::CloudModel, CloudObjectEventEntrypoint, Owner},
app/src/drive/index.rs
+28 -28
View File
@@ -81,8 +81,8 @@ use pathfinder_color::ColorU;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use std::{any::Any, collections::HashMap, sync::Arc};
use url::Url;
use warp_core::{context_flag::ContextFlag, settings::Setting, ui::theme::color::internal_colors};
use warpui::{
use galaxy_core::{context_flag::ContextFlag, settings::Setting, ui::theme::color::internal_colors};
use galaxyui::{
clipboard::ClipboardContent,
elements::{
Align, AnchorPair, Border, ChildAnchor, ChildView, ClippedScrollStateHandle,
@@ -575,7 +575,7 @@ pub struct DriveIndex {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings(vec![
FixedBinding::new("up", DriveIndexAction::FocusPreviousItem, id!("DriveIndex")),
@@ -1314,7 +1314,7 @@ impl DriveIndex {
let icon = Container::new(
ConstrainedBox::new(
Icon::CreateTeam
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.main_text_color(appearance.theme().surface_1()),
@@ -1461,7 +1461,7 @@ impl DriveIndex {
if let Some(focused_index) = self.focused_index {
if Some(&WarpDriveItemId::Space(space)) == self.ordered_items.get(focused_index) {
container = container.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_4(
galaxy_core::ui::theme::color::internal_colors::fg_overlay_4(
appearance.theme(),
),
);
@@ -1476,7 +1476,7 @@ impl DriveIndex {
// If the item is hovered, set a hover background that matches the hover state of warp drive items.
if mouse_state.is_hovered() && !is_focused || section_state.menu_open {
container = container.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_2(
galaxy_core::ui::theme::color::internal_colors::fg_overlay_2(
appearance.theme(),
),
);
@@ -1570,7 +1570,7 @@ impl DriveIndex {
font_color: Some(empty_trash_default_font_color),
font_size: Some(14.),
font_family_id: Some(appearance.ui_font_family()),
font_weight: Some(warpui::fonts::Weight::Semibold),
font_weight: Some(galaxyui::fonts::Weight::Semibold),
padding: Some(Coords::uniform(6.)),
border_radius: Some(CornerRadius::with_all(Radius::Pixels(6.))),
..Default::default()
@@ -1664,7 +1664,7 @@ impl DriveIndex {
if let Some(focused_index) = self.focused_index {
if Some(&WarpDriveItemId::Space(space)) == self.ordered_items.get(focused_index) {
container = container.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_4(
galaxy_core::ui::theme::color::internal_colors::fg_overlay_4(
appearance.theme(),
),
);
@@ -1679,7 +1679,7 @@ impl DriveIndex {
// If the item is hovered, set a hover background that matches the hover state of warp drive items.
if mouse_state.is_hovered() && !is_focused || section_state.menu_open {
container = container.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_2(
galaxy_core::ui::theme::color::internal_colors::fg_overlay_2(
appearance.theme(),
),
);
@@ -1801,7 +1801,7 @@ impl DriveIndex {
fn render_trash_row(&self, appearance: &Appearance, _: &AppContext) -> Box<dyn Element> {
let font_color = self.font_color_based_on_focused_state(appearance, WarpDriveItemId::Trash);
let icon = Container::new(
ConstrainedBox::new(Icon::Trash.to_warpui_icon(font_color.into()).finish())
ConstrainedBox::new(Icon::Trash.to_galaxyui_icon(font_color.into()).finish())
.with_width(SECTION_HEADER_FONT_SIZE)
.with_height(SECTION_HEADER_FONT_SIZE)
.finish(),
@@ -1850,7 +1850,7 @@ impl DriveIndex {
if let Some(focused_index) = self.focused_index {
if Some(&WarpDriveItemId::Trash) == self.ordered_items.get(focused_index) {
container = container.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_4(appearance.theme()),
galaxy_core::ui::theme::color::internal_colors::fg_overlay_4(appearance.theme()),
);
is_focused = true;
}
@@ -1863,7 +1863,7 @@ impl DriveIndex {
if mouse_state.is_hovered() && !is_focused {
container
.with_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_2(
galaxy_core::ui::theme::color::internal_colors::fg_overlay_2(
appearance.theme(),
),
)
@@ -2042,7 +2042,7 @@ impl DriveIndex {
appearance: &Appearance,
) -> Box<dyn Element> {
let rendered_icon = ConstrainedBox::new(
icon.to_warpui_icon(appearance.theme().nonactive_ui_text_color())
icon.to_galaxyui_icon(appearance.theme().nonactive_ui_text_color())
.finish(),
)
.with_width(ITEM_FONT_SIZE)
@@ -2384,7 +2384,7 @@ impl DriveIndex {
Container::new(
ConstrainedBox::new(
Icon::CloudOffline
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.sub_text_color(appearance.theme().surface_2()),
@@ -2600,7 +2600,7 @@ impl DriveIndex {
Container::new(
ConstrainedBox::new(
Icon::Info
.to_warpui_icon(appearance.theme().nonactive_ui_text_color())
.to_galaxyui_icon(appearance.theme().nonactive_ui_text_color())
.finish(),
)
.with_height(15.)
@@ -2913,7 +2913,7 @@ impl DriveIndex {
section: DriveIndexSection,
is_collapsed: bool,
appearance: &Appearance,
) -> Box<dyn warpui::Element> {
) -> Box<dyn galaxyui::Element> {
let icon = if is_collapsed {
Icon::ListCollapsed
} else {
@@ -2937,7 +2937,7 @@ impl DriveIndex {
// This icon should render the same as other WarpDrive icons but with no click or hover states.
Container::new(
ConstrainedBox::new(icon.to_warpui_icon(icon_color).finish())
ConstrainedBox::new(icon.to_galaxyui_icon(icon_color).finish())
.with_width(SECTION_HEADER_FONT_SIZE)
.with_height(SECTION_HEADER_FONT_SIZE)
.finish(),
@@ -2946,13 +2946,13 @@ impl DriveIndex {
.finish()
}
fn render_warp_drive_loading_icon(&self, appearance: &Appearance) -> Box<dyn warpui::Element> {
fn render_warp_drive_loading_icon(&self, appearance: &Appearance) -> Box<dyn galaxyui::Element> {
// Use same padding as icon_button (4px) to center the icon within ICON_DIMENSIONS
let icon_button_padding = (ICON_DIMENSIONS - LOADING_ICON_WIDTH) / 2.;
let loading_icon = Container::new(
ConstrainedBox::new(
Icon::Refresh
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.sub_text_color(appearance.theme().surface_1()),
@@ -2995,7 +2995,7 @@ impl DriveIndex {
hoverable.finish()
}
fn render_sorting_button(&self, appearance: &Appearance) -> Box<dyn warpui::Element> {
fn render_sorting_button(&self, appearance: &Appearance) -> Box<dyn galaxyui::Element> {
let mut button = icon_button_with_context_menu(
Icon::Sort,
move |ctx, _, _| ctx.dispatch_typed_action(DriveIndexAction::ToggleSortingMenu),
@@ -3033,7 +3033,7 @@ impl DriveIndex {
hoverable.finish()
}
fn render_retry_button(&self, appearance: &Appearance) -> Box<dyn warpui::Element> {
fn render_retry_button(&self, appearance: &Appearance) -> Box<dyn galaxyui::Element> {
let ui_builder = appearance.ui_builder().clone();
icon_button(
@@ -3061,7 +3061,7 @@ impl DriveIndex {
space: Space,
state: &DriveIndexSectionState,
app: &AppContext,
) -> Box<dyn warpui::Element> {
) -> Box<dyn galaxyui::Element> {
let mut button;
// Set color contrast correctly when focused
if self.focused_index.is_some()
@@ -3139,7 +3139,7 @@ impl DriveIndex {
appearance: &Appearance,
state: &DriveIndexSectionState,
space: Space,
) -> Box<dyn warpui::Element> {
) -> Box<dyn galaxyui::Element> {
let mut button = icon_button(
appearance,
Icon::AddTeammates,
@@ -3940,7 +3940,7 @@ impl DriveIndex {
|_| {
ConstrainedBox::new(
Icon::X
.to_warpui_icon(appearance.theme().main_text_color(background_color))
.to_galaxyui_icon(appearance.theme().main_text_color(background_color))
.finish(),
)
.with_width(12.)
@@ -3961,7 +3961,7 @@ impl DriveIndex {
Text::new_inline("Warp Drive".to_string(), appearance.ui_font_family(), 14.)
.with_color(theme.main_text_color(background_color).into())
.with_style(Properties {
weight: warpui::fonts::Weight::Bold,
weight: galaxyui::fonts::Weight::Bold,
..Default::default()
})
.finish(),
@@ -4694,7 +4694,7 @@ impl DriveIndex {
.into_item(),
);
}
if !warpui::platform::is_mobile_device()
if !galaxyui::platform::is_mobile_device()
&& !ContextFlag::HideOpenOnDesktopButton.is_enabled()
&& *UserAppInstallDetectionSettings::as_ref(app)
.user_app_installation_detected
@@ -5075,7 +5075,7 @@ impl View for DriveIndex {
}
}
fn keymap_context(&self, _ctx: &AppContext) -> warpui::keymap::Context {
fn keymap_context(&self, _ctx: &AppContext) -> galaxyui::keymap::Context {
let mut context = Self::default_keymap_context();
// Disable WD Vim keybindings when a dialog is open
@@ -5088,7 +5088,7 @@ impl View for DriveIndex {
context
}
fn render(&self, app: &AppContext) -> Box<dyn warpui::Element> {
fn render(&self, app: &AppContext) -> Box<dyn galaxyui::Element> {
let appearance = Appearance::as_ref(app);
let workspaces = UserWorkspaces::as_ref(app);
app/src/drive/index_test.rs
+4 -4
View File
@@ -1,6 +1,6 @@
use warp_core::ui::appearance::Appearance;
use warp_server_client::cloud_object::ServerPermissions;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_server_client::cloud_object::ServerPermissions;
use galaxyui::{
platform::WindowStyle, AddSingletonModel, App, SingletonEntity, TypedActionView, ViewHandle,
};
@@ -103,7 +103,7 @@ fn create_notebook(app: &mut App) -> SyncId {
fn set_object_in_error(app: &mut App, cloud_object_type_and_id: &CloudObjectTypeAndId) {
CloudModel::handle(app).update(
app,
|cloud_model, _ctx: &mut warpui::ModelContext<'_, CloudModel>| {
|cloud_model, _ctx: &mut galaxyui::ModelContext<'_, CloudModel>| {
if let Some(object) = cloud_model.get_mut_by_uid(&cloud_object_type_and_id.uid()) {
object.set_pending_content_changes_status(CloudObjectSyncStatus::Errored);
}
app/src/drive/items/ai_fact.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{Container, Flex, MouseStateHandle, ParentElement},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
app/src/drive/items/ai_fact_collection.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, AppContext, Element};
use galaxyui::{elements::MouseStateHandle, AppContext, Element};
use crate::{
appearance::Appearance,
app/src/drive/items/env_var_collection.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use itertools::Itertools;
use warp_core::context_flag::ContextFlag;
use warpui::{
use galaxy_core::context_flag::ContextFlag;
use galaxyui::{
elements::{Clipped, Container, Flex, MouseStateHandle, ParentElement},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
app/src/drive/items/folder.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use warp_core::features::FeatureFlag;
use warpui::{elements::MouseStateHandle, AppContext, Element};
use galaxy_core::features::FeatureFlag;
use galaxyui::{elements::MouseStateHandle, AppContext, Element};
use crate::{
appearance::Appearance,
@@ -52,7 +52,7 @@ impl WarpDriveItem for WarpDriveFolder {
Icon::from(DriveObjectType::Folder)
};
Some(icon.to_warpui_icon(icon_fill).finish())
Some(icon.to_galaxyui_icon(icon_fill).finish())
}
fn secondary_icon(&self, _color: Option<Fill>) -> Option<Box<dyn Element>> {
app/src/drive/items/item.rs
+6 -6
View File
@@ -1,5 +1,5 @@
use pathfinder_geometry::{rect::RectF, vector::Vector2F};
use warpui::{
use galaxyui::{
elements::{
AcceptedByDropTarget, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius,
CrossAxisAlignment, Draggable, DraggableState, DropShadow, Empty, Flex, Hoverable,
@@ -110,7 +110,7 @@ impl WarpDriveItemStyles {
.set_font_size(ITEM_FONT_SIZE)
.set_font_color(theme.foreground().into())
.set_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_4(theme).into(),
galaxy_core::ui::theme::color::internal_colors::fg_overlay_4(theme).into(),
)
.set_border_color(theme.accent().into()),
hovered: UiComponentStyles::default()
@@ -118,7 +118,7 @@ impl WarpDriveItemStyles {
.set_font_size(ITEM_FONT_SIZE)
.set_font_color(blended_colors::text_main(theme, background))
.set_background(
warp_core::ui::theme::color::internal_colors::fg_overlay_2(theme).into(),
galaxy_core::ui::theme::color::internal_colors::fg_overlay_2(theme).into(),
),
}
}
@@ -461,7 +461,7 @@ impl<'a> WarpDriveRow<'a> {
let text_color = appearance.theme().sub_text_color(background);
let icon = Container::new(
ConstrainedBox::new(Icon::Users.to_warpui_icon(text_color).finish())
ConstrainedBox::new(Icon::Users.to_galaxyui_icon(text_color).finish())
.with_height(15.)
.with_width(15.)
.finish(),
@@ -509,7 +509,7 @@ impl<'a> WarpDriveRow<'a> {
Container::new(
ConstrainedBox::new(
Icon::Clock
.to_warpui_icon(
.to_galaxyui_icon(
appearance
.theme()
.sub_text_color(appearance.theme().surface_2()),
@@ -587,7 +587,7 @@ impl<'a> WarpDriveRow<'a> {
});
Container::new(
ConstrainedBox::new(chevron_icon.to_warpui_icon(icon_color.into()).finish())
ConstrainedBox::new(chevron_icon.to_galaxyui_icon(icon_color.into()).finish())
.with_width(16.)
.with_height(16.)
.finish(),
app/src/drive/items/mcp_server.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use crate::{
drive::{index::DriveIndexAction, CloudObjectTypeAndId, DriveObjectType},
themes::theme::Fill,
};
use warpui::{elements::MouseStateHandle, AppContext, Element};
use galaxyui::{elements::MouseStateHandle, AppContext, Element};
#[derive(Clone)]
pub struct WarpDriveMCPServer {
app/src/drive/items/mcp_server_collection.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, AppContext, Element};
use galaxyui::{elements::MouseStateHandle, AppContext, Element};
use crate::{
appearance::Appearance,
app/src/drive/items/mod.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, AppContext, Element};
use galaxyui::{elements::MouseStateHandle, AppContext, Element};
use crate::{
appearance::Appearance,
@@ -44,7 +44,7 @@ pub trait WarpDriveItem {
fn icon(&self, appearance: &Appearance, color: Option<Fill>) -> Option<Box<dyn Element>> {
let object_type = self.object_type()?;
let icon_fill = color.unwrap_or(warp_drive_icon_color(appearance, object_type).into());
Some(Icon::from(object_type).to_warpui_icon(icon_fill).finish())
Some(Icon::from(object_type).to_galaxyui_icon(icon_fill).finish())
}
/// If implemented, returns a string that summarizes the primary action history. For example, "Run 2 times in the last week"
app/src/drive/items/notebook.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::{
use galaxyui::{
elements::{Flex, MouseStateHandle, ParentElement},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
app/src/drive/items/space.rs
+2 -2
View File
@@ -1,4 +1,4 @@
use warpui::{elements::MouseStateHandle, Element};
use galaxyui::{elements::MouseStateHandle, Element};
use crate::{
appearance::Appearance,
@@ -63,7 +63,7 @@ impl WarpDriveItem for WarpDriveSpace {
Box::new(self.clone())
}
fn action_summary(&self, _app: &warpui::AppContext) -> Option<String> {
fn action_summary(&self, _app: &galaxyui::AppContext) -> Option<String> {
None
}
}
app/src/drive/items/workflow.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use warp_core::context_flag::ContextFlag;
use warpui::{
use galaxy_core::context_flag::ContextFlag;
use galaxyui::{
elements::{Container, Flex, MouseStateHandle, ParentElement},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
@@ -71,7 +71,7 @@ impl WarpDriveItem for WarpDriveWorkflow {
fn preview(&self, appearance: &Appearance) -> Option<Box<dyn Element>> {
let mut modal =
Flex::column().with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Stretch);
Flex::column().with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Stretch);
let mut text = Flex::column()
.with_child(Container::new(self.render_workflow_name(appearance)).finish());
app/src/drive/mod.rs
+2 -2
View File
@@ -18,8 +18,8 @@ use std::{cmp::Ordering, fmt};
pub use index::DriveIndexVariant;
pub use panel::{DrivePanel, DrivePanelEvent};
use serde::{Deserialize, Serialize};
use warp_core::user_preferences::GetUserPreferences as _;
use warpui::AppContext;
use galaxy_core::user_preferences::GetUserPreferences as _;
use galaxyui::AppContext;
use crate::{
cloud_object::{
app/src/drive/panel.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use futures::Future;
use warpui::{
use galaxyui::{
elements::{Align, Flex, Hoverable, MouseStateHandle, ParentElement, SavePosition, Shrinkable},
presenter::ChildView,
windowing::{StateEvent, WindowManager},
@@ -683,7 +683,7 @@ impl View for DrivePanel {
}
}
fn render(&self, _app: &warpui::AppContext) -> Box<dyn warpui::Element> {
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
let body = Hoverable::new(
self.mouse_state_handles.focus_panel_mouse_state.clone(),
|_| {
@@ -705,7 +705,7 @@ impl View for DrivePanel {
let mut col = Flex::column();
col.add_child(Shrinkable::new(1., body).finish());
col.with_main_axis_size(warpui::elements::MainAxisSize::Max)
col.with_main_axis_size(galaxyui::elements::MainAxisSize::Max)
.finish()
}
}
app/src/drive/panel_test.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_core::ui::appearance::Appearance;
use warpui::{platform::WindowStyle, App};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{platform::WindowStyle, App};
use crate::{
ai::blocklist::BlocklistAIHistoryModel,
app/src/drive/settings.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use settings::{
macros::define_settings_group, RespectUserSyncSetting, SupportedPlatforms, SyncToCloud,
};
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
use super::DriveSortOrder;
@@ -40,8 +40,8 @@ impl WarpDriveSettings {
/// Returns whether Warp Drive should be considered enabled.
/// Returns `false` when the user is anonymous or fully logged out,
/// regardless of the user setting.
pub fn is_warp_drive_enabled(app: &warpui::AppContext) -> bool {
use warpui::SingletonEntity as _;
pub fn is_warp_drive_enabled(app: &galaxyui::AppContext) -> bool {
use galaxyui::SingletonEntity as _;
let is_anonymous_or_logged_out = FeatureFlag::SkipFirebaseAnonymousUser.is_enabled()
&& crate::auth::AuthStateProvider::as_ref(app)
.get()
app/src/drive/sharing/dialog/inheritance.rs
+2 -2
View File
@@ -1,7 +1,7 @@
//! Support for displaying inherited ACLs.
use warp_core::ui::appearance::Appearance;
use warpui::{
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{
elements::{CrossAxisAlignment, Flex, MouseStateHandle, ParentElement as _},
ui_components::components::UiComponent as _,
AppContext, Element, SingletonEntity as _,
app/src/drive/sharing/dialog/mod.rs
+12 -12
View File
@@ -36,21 +36,21 @@ use inheritance::{InheritanceDetails, InheritanceState};
use itertools::Itertools;
use pathfinder_geometry::vector::vec2f;
use session_sharing_protocol::common::{Guest, PendingGuest, SessionId, TeamAclData};
use warp_core::ui::appearance::Appearance;
use warp_editor::editor::NavigationKey;
use warpui::elements::{
use galaxy_core::ui::appearance::Appearance;
use galaxy_editor::editor::NavigationKey;
use galaxyui::elements::{
Align, ChildAnchor, ChildView, Fill, Highlight, MainAxisSize, MouseStateHandle,
OffsetPositioning, ParentAnchor, PositionedElementAnchor, PositionedElementOffsetBounds,
SavePosition, ScrollStateHandle, Scrollable, ScrollableElement, ScrollbarWidth, Shrinkable,
Stack, UniformList, UniformListState,
};
use warpui::fonts::{Properties, Weight};
use warpui::platform::Cursor;
use warpui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
use warpui::ui_components::components::Coords;
use warpui::FocusContext;
use warpui::WeakViewHandle;
use warpui::{
use galaxyui::fonts::{Properties, Weight};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
use galaxyui::ui_components::components::Coords;
use galaxyui::FocusContext;
use galaxyui::WeakViewHandle;
use galaxyui::{
clipboard::ClipboardContent,
elements::{
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss, Empty, Flex,
@@ -198,7 +198,7 @@ pub enum SharingDialogAction {
}
pub fn init(app: &mut AppContext) {
use warpui::keymap::macros::*;
use galaxyui::keymap::macros::*;
app.register_fixed_bindings([FixedBinding::new(
"escape",
@@ -2425,7 +2425,7 @@ impl SharingDialog {
TextAndIcon::new(
TextAndIconAlignment::IconFirst,
"Copy link",
Icon::Link.to_warpui_icon(copy_button_foreground),
Icon::Link.to_galaxyui_icon(copy_button_foreground),
MainAxisSize::Min,
MainAxisAlignment::SpaceBetween,
vec2f(12., 12.),
app/src/drive/sharing/mod.rs
+4 -4
View File
@@ -2,8 +2,8 @@ use std::borrow::Cow;
use chrono::{DateTime, Local};
use session_sharing_protocol::common::SessionId;
use warp_core::{channel::ChannelState, ui::appearance::Appearance};
use warpui::{
use galaxy_core::{channel::ChannelState, ui::appearance::Appearance};
use galaxyui::{
color::ColorU,
ui_components::components::{UiComponent, UiComponentStyles},
AppContext, SingletonEntity, WeakViewHandle,
@@ -24,8 +24,8 @@ use crate::{
pub mod dialog;
mod style;
// Re-export types from warp_server_client.
pub use warp_server_client::drive::sharing::{
// Re-export types from galaxy_server_client.
pub use galaxy_server_client::drive::sharing::{
LinkSharingSubjectType, SharingAccessLevel, Subject, TeamKind, UserKind,
};
app/src/drive/sharing/style.rs
+2 -2
View File
@@ -1,10 +1,10 @@
use std::borrow::Cow;
use warp_core::ui::{
use galaxy_core::ui::{
appearance::Appearance,
theme::{color::internal_colors, Fill},
};
use warpui::{
use galaxyui::{
color::ColorU,
elements::{CornerRadius, Radius},
fonts::Weight,
app/src/drive/workflows/ai_assist.rs
+2 -2
View File
@@ -1,9 +1,9 @@
use itertools::Itertools;
use serde::{Deserialize, Serialize};
use warp_graphql::mutations::generate_metadata_for_command::{
use galaxy_graphql::mutations::generate_metadata_for_command::{
GenerateMetadataForCommandFailureType, GenerateMetadataForCommandSuccess,
};
use warpui::{SingletonEntity, ViewContext};
use galaxyui::{SingletonEntity, ViewContext};
use crate::{
ai::AIRequestUsageModel,
app/src/drive/workflows/arguments_test.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::{fmt::Debug, iter::zip};
use crate::workflows::workflow::Argument;
use warpui::App;
use galaxyui::App;
use super::ArgumentsState;
app/src/drive/workflows/enum_creation_dialog.rs
+5 -5
View File
@@ -2,9 +2,9 @@ use std::rc::Rc;
use strum::IntoEnumIterator;
use strum_macros::{EnumIter, IntoStaticStr};
use warp_core::{features::FeatureFlag, ui::appearance::Appearance};
use warp_editor::editor::NavigationKey;
use warpui::{
use galaxy_core::{features::FeatureFlag, ui::appearance::Appearance};
use galaxy_editor::editor::NavigationKey;
use galaxyui::{
elements::{
Border, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container,
CornerRadius, CrossAxisAlignment, Empty, Fill, Flex, MainAxisAlignment, MainAxisSize,
@@ -597,7 +597,7 @@ impl EnumCreationDialog {
.with_centered_text_label(label_text.to_owned())
.with_style(UiComponentStyles {
font_size: Some(BUTTON_FONT_SIZE),
font_weight: Some(warpui::fonts::Weight::Normal),
font_weight: Some(galaxyui::fonts::Weight::Normal),
..Default::default()
});
@@ -608,7 +608,7 @@ impl EnumCreationDialog {
button
.build()
.on_click(move |ctx, _, _| ctx.dispatch_typed_action(action.clone()))
.with_cursor(warpui::platform::Cursor::PointingHand)
.with_cursor(galaxyui::platform::Cursor::PointingHand)
.finish()
}
app/src/drive/workflows/modal.rs
+7 -7
View File
@@ -5,11 +5,11 @@ use std::{cmp::Ordering, sync::Arc};
use itertools::Itertools;
use pathfinder_geometry::vector::vec2f;
use string_offset::CharOffset;
use warp_core::ui::theme::Fill;
use warp_editor::editor::NavigationKey;
use warpui::elements::Clipped;
use warpui::FocusContext;
use warpui::{
use galaxy_core::ui::theme::Fill;
use galaxy_editor::editor::NavigationKey;
use galaxyui::elements::Clipped;
use galaxyui::FocusContext;
use galaxyui::{
clipboard::ClipboardContent,
elements::{
Align, Border, ChildAnchor, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox,
@@ -1412,7 +1412,7 @@ impl WorkflowModal {
let workflow_icon = Container::new(
ConstrainedBox::new(
Icon::from(DriveObjectType::Workflow)
.to_warpui_icon(
.to_galaxyui_icon(
warp_drive_icon_color(appearance, DriveObjectType::Workflow).into(),
)
.finish(),
@@ -1710,7 +1710,7 @@ impl WorkflowModal {
let text_and_icon = TextAndIcon::new(
TextAndIconAlignment::TextFirst,
label.to_string(),
icon.to_warpui_icon(appearance.theme().active_ui_text_color()),
icon.to_galaxyui_icon(appearance.theme().active_ui_text_color()),
MainAxisSize::Min,
MainAxisAlignment::Center,
vec2f(16., 16.),
app/src/drive/workflows/modal_test.rs
+2 -2
View File
@@ -1,5 +1,5 @@
use warp_core::ui::appearance::Appearance;
use warpui::{platform::WindowStyle, App, SingletonEntity, ViewHandle};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::{platform::WindowStyle, App, SingletonEntity, ViewHandle};
use std::sync::Arc;
app/src/drive/workflows/workflow_arg_selector.rs
+7 -7
View File
@@ -1,9 +1,9 @@
use itertools::Itertools;
use std::{collections::HashMap, rc::Rc};
use strum::IntoEnumIterator;
use warp_core::ui::{appearance::Appearance, theme::Fill};
use warp_editor::editor::NavigationKey;
use warpui::{
use galaxy_core::ui::{appearance::Appearance, theme::Fill};
use galaxy_editor::editor::NavigationKey;
use galaxyui::{
elements::{
Align, Border, ChildAnchor, ChildView, ClippedScrollStateHandle, ClippedScrollable,
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss, Empty, EventHandler,
@@ -33,9 +33,9 @@ use crate::{
workflows::workflow::ArgumentType,
};
use warpui::platform::Cursor;
use galaxyui::platform::Cursor;
use warpui::{
use galaxyui::{
elements::{ParentAnchor, ParentOffsetBounds},
fonts::FamilyId,
};
@@ -610,7 +610,7 @@ impl WorkflowArgSelector {
fn render_search_icon(&self, appearance: &Appearance) -> Box<dyn Element> {
ConstrainedBox::new(
icons::Icon::SearchSmall
.to_warpui_icon(appearance.theme().active_ui_text_color())
.to_galaxyui_icon(appearance.theme().active_ui_text_color())
.finish(),
)
.with_width(12.)
@@ -865,7 +865,7 @@ impl WorkflowArgSelector {
ScrollbarWidth::Auto,
theme.disabled_text_color(theme.background()).into(),
theme.main_text_color(theme.background()).into(),
warpui::elements::Fill::None,
galaxyui::elements::Fill::None,
)
.finish(),
)
app/src/drive/workflows/workflow_arg_type_helpers.rs
+12 -12
View File
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use warpui::{AppContext, SingletonEntity, ViewHandle};
use galaxyui::{AppContext, SingletonEntity, ViewHandle};
use crate::{
cloud_object::{model::persistence::CloudModel, CloudObjectEventEntrypoint, Owner},
@@ -36,10 +36,10 @@ impl ArgumentTypeEditor for super::modal::ArgumentEditorRow {
/// Get all workflow enums in the space, filtering to only show the shared ones
pub fn load_workflow_enums_with_owner<V>(
owner: Owner,
ctx: &mut warpui::ViewContext<V>,
ctx: &mut galaxyui::ViewContext<V>,
) -> HashMap<SyncId, WorkflowEnumData>
where
V: warpui::View,
V: galaxyui::View,
{
let cloud_model = CloudModel::as_ref(ctx);
cloud_model
@@ -65,7 +65,7 @@ pub fn load_argument_into_selector(
selector: &mut WorkflowArgSelector,
argument: &Argument,
all_workflow_enums: &mut HashMap<SyncId, WorkflowEnumData>,
ctx: &mut warpui::ViewContext<WorkflowArgSelector>,
ctx: &mut galaxyui::ViewContext<WorkflowArgSelector>,
) {
let selected_type = argument.arg_type.clone().into();
selector.set_selected_type(selected_type, ctx);
@@ -153,9 +153,9 @@ pub fn extract_typed_argument_from_selector(
pub fn save_enum<V>(
enum_data: &WorkflowEnumData,
owner: Option<Owner>,
ctx: &mut warpui::ViewContext<V>,
ctx: &mut galaxyui::ViewContext<V>,
) where
V: warpui::View,
V: galaxyui::View,
{
let Some(variants) = enum_data.new_data.clone() else {
return;
@@ -203,10 +203,10 @@ pub fn create_enum<V, T>(
all_workflow_enums: &mut HashMap<SyncId, WorkflowEnumData>,
arguments_rows: &[T],
pending_argument_editor_row: &mut Option<ArgumentEditorRowIndex>,
ctx: &mut warpui::ViewContext<V>,
ctx: &mut galaxyui::ViewContext<V>,
) where
T: ArgumentTypeEditor,
V: warpui::View,
V: galaxyui::View,
{
let enum_id = enum_data.id;
let enum_name = enum_data.name.clone();
@@ -244,10 +244,10 @@ pub fn edit_enum<V, T>(
all_workflow_enums: &mut HashMap<SyncId, WorkflowEnumData>,
arguments_rows: &[T],
pending_argument_editor_row: &mut Option<ArgumentEditorRowIndex>,
ctx: &mut warpui::ViewContext<V>,
ctx: &mut galaxyui::ViewContext<V>,
) where
T: ArgumentTypeEditor,
V: warpui::View,
V: galaxyui::View,
{
let enum_id = enum_data.id;
let enum_name = &enum_data.name;
@@ -291,10 +291,10 @@ pub fn load_enum<V>(
id: &SyncId,
all_workflow_enums: &HashMap<SyncId, WorkflowEnumData>,
enum_creation_dialog: &ViewHandle<EnumCreationDialog>,
ctx: &mut warpui::ViewContext<V>,
ctx: &mut galaxyui::ViewContext<V>,
) -> bool
where
V: warpui::View,
V: galaxyui::View,
{
match all_workflow_enums.get(id) {
// If we have local variants for this enum, pass them in