Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -3,11 +3,11 @@ use std::collections::{HashMap, HashSet};
|
||||
use anyhow::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use settings_value::SettingsValue;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
define_settings_group,
|
||||
settings::{RespectUserSyncSetting, Setting, SupportedPlatforms, SyncToCloud},
|
||||
};
|
||||
use warpui::{AppContext, ModelContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, ModelContext, SingletonEntity};
|
||||
|
||||
use crate::{
|
||||
cloud_object::{
|
||||
|
||||
@@ -26,7 +26,7 @@ fn test_set_aliases() {
|
||||
env_vars: None,
|
||||
};
|
||||
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_user_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -77,7 +77,7 @@ fn test_set_aliases_replacement() {
|
||||
env_vars: None,
|
||||
};
|
||||
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_user_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
@@ -128,7 +128,7 @@ fn test_remove_aliases() {
|
||||
env_vars: None,
|
||||
};
|
||||
|
||||
warpui::App::test((), |mut app| async move {
|
||||
galaxyui::App::test((), |mut app| async move {
|
||||
app.update(init_and_register_user_preferences);
|
||||
app.add_singleton_model(|_| SettingsManager::default());
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use itertools::Itertools;
|
||||
use warp_editor::editor::NavigationKey;
|
||||
use warpui::{
|
||||
use galaxy_editor::editor::NavigationKey;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ConstrainedBox, Container, DispatchEventResult, Element, Fill, Flex, ParentElement,
|
||||
ScrollStateHandle, Scrollable, ScrollableElement, ScrollbarWidth, Shrinkable, Text,
|
||||
@@ -29,17 +29,17 @@ use std::ops::Deref;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
use warp_core::ui::builder::UiBuilder;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::builder::UiBuilder;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use warp_workflows::workflows as global_workflows;
|
||||
use warpui::accessibility::{AccessibilityContent, WarpA11yRole};
|
||||
use warpui::color::ColorU;
|
||||
use warpui::elements::{
|
||||
use galaxyui::accessibility::{AccessibilityContent, WarpA11yRole};
|
||||
use galaxyui::color::ColorU;
|
||||
use galaxyui::elements::{
|
||||
Align, CrossAxisAlignment, EventHandler, Highlight, Hoverable, MainAxisSize, MouseStateHandle,
|
||||
};
|
||||
use warpui::keymap::FixedBinding;
|
||||
use warpui::text_layout::TextStyle;
|
||||
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
use galaxyui::keymap::FixedBinding;
|
||||
use galaxyui::text_layout::TextStyle;
|
||||
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
|
||||
use super::{workflow::Workflow, WorkflowSource};
|
||||
|
||||
@@ -54,7 +54,7 @@ const WORKFLOW_LIST_PADDING_MIDDLE: f32 = 5.;
|
||||
pub const WORKFLOW_SUBTEXT_FONT_SIZE: f32 = 14.0;
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings(vec![
|
||||
FixedBinding::new("up", WorkflowsViewAction::Up, id!("WorkflowsView")),
|
||||
|
||||
@@ -6,7 +6,7 @@ use serde::{
|
||||
use serde_yaml::Value;
|
||||
use strum::VariantNames as _;
|
||||
use strum_macros::{Display, EnumString, VariantNames};
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
use std::{collections::HashMap, fmt, result::Result, str::FromStr};
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::collections::HashMap;
|
||||
use std::ops::Range;
|
||||
|
||||
use warp_core::{features::FeatureFlag, settings::Setting};
|
||||
use warpui::{
|
||||
use galaxy_core::{features::FeatureFlag, settings::Setting};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
self, Align, Border, Clipped, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox,
|
||||
Container, CornerRadius, CrossAxisAlignment, DropShadow, Flex, Highlight, Icon,
|
||||
@@ -34,10 +34,10 @@ use crate::{
|
||||
use crate::{cloud_object::model::actions::ObjectActionType, terminal::view::TerminalAction};
|
||||
use crate::{terminal::input::InputAction, ui_components::buttons::icon_button};
|
||||
|
||||
use warpui::color::ColorU;
|
||||
use warpui::keymap::Keystroke;
|
||||
use warpui::text_layout::TextStyle;
|
||||
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
use galaxyui::color::ColorU;
|
||||
use galaxyui::keymap::Keystroke;
|
||||
use galaxyui::text_layout::TextStyle;
|
||||
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
|
||||
use super::{
|
||||
command_parser::{compute_workflow_display_data, WorkflowArgumentIndex, WorkflowDisplayData},
|
||||
@@ -262,7 +262,7 @@ impl WorkflowsMoreInfoView {
|
||||
icons::Icon::Rename,
|
||||
Some(label.to_owned()),
|
||||
self.button_mouse_states.edit_cloud_workflow.clone(),
|
||||
move |ctx: &mut warpui::EventContext<'_>, _, _| {
|
||||
move |ctx: &mut galaxyui::EventContext<'_>, _, _| {
|
||||
ctx.dispatch_typed_action(TerminalAction::OpenWorkflowModalWithCloudWorkflow(
|
||||
workflow.id,
|
||||
))
|
||||
@@ -422,7 +422,7 @@ impl WorkflowsMoreInfoView {
|
||||
Container::new(
|
||||
ConstrainedBox::new(
|
||||
icons::Icon::AlertCircle
|
||||
.to_warpui_icon(
|
||||
.to_galaxyui_icon(
|
||||
appearance
|
||||
.theme()
|
||||
.sub_text_color(appearance.theme().surface_2()),
|
||||
|
||||
@@ -4,11 +4,11 @@ use std::{
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use warp_util::path::ShellFamily;
|
||||
use galaxy_util::path::ShellFamily;
|
||||
use warp_workflows::workflows as global_workflows;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use warpui::platform::OperatingSystem;
|
||||
use warpui::{AppContext, Entity, ModelContext, SingletonEntity};
|
||||
use galaxyui::platform::OperatingSystem;
|
||||
use galaxyui::{AppContext, Entity, ModelContext, SingletonEntity};
|
||||
|
||||
#[cfg(feature = "local_fs")]
|
||||
use crate::user_config::load_workflows;
|
||||
@@ -184,7 +184,7 @@ pub(super) fn load_project_workflows(path: &Path) -> Vec<Workflow> {
|
||||
match git2::Repository::discover(path) {
|
||||
Ok(repository) => repository.workdir().map_or(Vec::new(), |workdir| {
|
||||
load_workflows(&workflows_dir(
|
||||
workdir.join(warp_core::paths::WARP_CONFIG_DIR),
|
||||
workdir.join(galaxy_core::paths::WARP_CONFIG_DIR),
|
||||
))
|
||||
}),
|
||||
Err(_) => Vec::new(),
|
||||
@@ -210,7 +210,7 @@ pub fn tail_command_for_shell(shell_family: ShellFamily, path: &PathBuf) -> Stri
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
pub fn prompt_chip_logging_workflow(shell_family: ShellFamily) -> Option<Workflow> {
|
||||
if !warp_core::channel::ChannelState::enable_debug_features() {
|
||||
if !galaxy_core::channel::ChannelState::enable_debug_features() {
|
||||
return None;
|
||||
}
|
||||
let log_file_path = crate::context_chips::logging::log_file_path().ok()?;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use std::sync::Arc;
|
||||
use warpui::App;
|
||||
use galaxyui::App;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ use crate::{
|
||||
PaneViewLocator, WindowId,
|
||||
};
|
||||
use std::collections::{hash_map::Entry, HashMap};
|
||||
use warpui::{Entity, EntityId, ModelContext, SingletonEntity};
|
||||
use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity};
|
||||
|
||||
pub struct WorkflowManager {
|
||||
panes_by_hashed_id: HashMap<String, WorkflowPaneData>,
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use warp_core::context_flag::ContextFlag;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxy_core::context_flag::ContextFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
pub mod categories;
|
||||
use anyhow::Result;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use warpui::App;
|
||||
use galaxyui::App;
|
||||
|
||||
use crate::server::ids::SyncId;
|
||||
|
||||
|
||||
@@ -82,9 +82,9 @@ use crate::{
|
||||
FeatureFlag, UserWorkspaces,
|
||||
};
|
||||
|
||||
use warp_core::{context_flag::ContextFlag, settings::Setting, ui::theme::AnsiColorIdentifier};
|
||||
use warp_editor::editor::NavigationKey;
|
||||
use warpui::{
|
||||
use galaxy_core::{context_flag::ContextFlag, settings::Setting, ui::theme::AnsiColorIdentifier};
|
||||
use galaxy_editor::editor::NavigationKey;
|
||||
use galaxyui::{
|
||||
clipboard::ClipboardContent,
|
||||
elements::{
|
||||
Align, Border, ChildAnchor, ChildView, Clipped, ClippedScrollStateHandle,
|
||||
@@ -120,7 +120,7 @@ pub mod env_var_selector;
|
||||
mod syntax_highlightable;
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::id;
|
||||
use galaxyui::keymap::macros::id;
|
||||
app.register_editable_bindings([EditableBinding::new(
|
||||
"workflowview:save",
|
||||
"Save workflow",
|
||||
@@ -2064,7 +2064,7 @@ impl WorkflowView {
|
||||
} else {
|
||||
Icon::Workflow
|
||||
}
|
||||
.to_warpui_icon(
|
||||
.to_galaxyui_icon(
|
||||
warp_drive_icon_color(
|
||||
appearance,
|
||||
if self.is_for_agent_mode {
|
||||
@@ -2219,7 +2219,7 @@ impl WorkflowView {
|
||||
let mut stack = Stack::new().with_child(
|
||||
ConstrainedBox::new(
|
||||
Icon::HelpCircle
|
||||
.to_warpui_icon(
|
||||
.to_galaxyui_icon(
|
||||
appearance
|
||||
.theme()
|
||||
.sub_text_color(appearance.theme().background()),
|
||||
@@ -2370,7 +2370,7 @@ impl WorkflowView {
|
||||
let text_and_icon = TextAndIcon::new(
|
||||
alignment,
|
||||
label,
|
||||
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(10., 10.),
|
||||
@@ -2843,7 +2843,7 @@ impl WorkflowView {
|
||||
.with_children([
|
||||
ConstrainedBox::new(
|
||||
Icon::Trash
|
||||
.to_warpui_icon(appearance.theme().foreground())
|
||||
.to_galaxyui_icon(appearance.theme().foreground())
|
||||
.finish(),
|
||||
)
|
||||
.with_width(16.)
|
||||
@@ -3059,7 +3059,7 @@ impl View for WorkflowView {
|
||||
SCROLLBAR_WIDTH,
|
||||
theme.nonactive_ui_detail().into(),
|
||||
theme.active_ui_detail().into(),
|
||||
warpui::elements::Fill::None,
|
||||
galaxyui::elements::Fill::None,
|
||||
)
|
||||
.finish(),
|
||||
);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warp_editor::editor::NavigationKey;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_editor::editor::NavigationKey;
|
||||
use galaxyui::{
|
||||
elements::ChildView,
|
||||
ui_components::components::{Coords, UiComponent, UiComponentStyles},
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
|
||||
@@ -2,14 +2,14 @@ use std::{cmp::Ordering, collections::HashMap};
|
||||
|
||||
use anyhow::Error;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
features::FeatureFlag,
|
||||
ui::{
|
||||
appearance::Appearance,
|
||||
theme::{color::internal_colors::neutral_4, Fill},
|
||||
},
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss, Flex, Hoverable,
|
||||
MainAxisAlignment, MainAxisSize, MouseState, MouseStateHandle, ParentElement, Radius,
|
||||
@@ -472,7 +472,7 @@ impl View for AliasBar {
|
||||
TextAndIcon::new(
|
||||
TextAndIconAlignment::IconFirst,
|
||||
"Add alias",
|
||||
Icon::Plus.to_warpui_icon(
|
||||
Icon::Plus.to_galaxyui_icon(
|
||||
appearance
|
||||
.theme()
|
||||
.main_text_color(appearance.theme().background()),
|
||||
|
||||
@@ -2,9 +2,9 @@ use std::cmp::Ordering;
|
||||
|
||||
use itertools::Itertools;
|
||||
use pathfinder_color::ColorU;
|
||||
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::{
|
||||
ChildView, ConstrainedBox, Container, CrossAxisAlignment, Fill, Flex, MainAxisAlignment,
|
||||
MainAxisSize, ParentElement, Shrinkable,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use itertools::Itertools as _;
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::ChildView, Element as _, Entity, SingletonEntity as _, TypedActionView, View,
|
||||
ViewAsRef, ViewContext, ViewHandle,
|
||||
};
|
||||
@@ -133,7 +133,7 @@ impl View for EnvVarSelector {
|
||||
"EnvVarSelector"
|
||||
}
|
||||
|
||||
fn render(&self, _app: &warpui::AppContext) -> Box<dyn warpui::Element> {
|
||||
fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
|
||||
ChildView::new(&self.dropdown).finish()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,12 +4,12 @@ use std::time::Duration;
|
||||
|
||||
use async_channel::Sender;
|
||||
use string_offset::ByteOffset;
|
||||
use warp_completer::completer::SuggestionTypeName;
|
||||
use warp_completer::signatures::CommandRegistry;
|
||||
use warp_core::ui::theme::AnsiColorIdentifier;
|
||||
use warpui::r#async::SpawnedFutureHandle;
|
||||
use warpui::ViewHandle;
|
||||
use warpui::{Entity, ModelContext, SingletonEntity};
|
||||
use galaxy_completer::completer::SuggestionTypeName;
|
||||
use galaxy_completer::signatures::CommandRegistry;
|
||||
use galaxy_core::ui::theme::AnsiColorIdentifier;
|
||||
use galaxyui::r#async::SpawnedFutureHandle;
|
||||
use galaxyui::ViewHandle;
|
||||
use galaxyui::{Entity, ModelContext, SingletonEntity};
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::completer::SessionAgnosticContext;
|
||||
|
||||
Reference in New Issue
Block a user