Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -8,7 +8,7 @@ use crate::terminal::TerminalView;
|
||||
use crate::workspace::ActiveSession;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use itertools::Itertools;
|
||||
use warpui::{AppContext, Entity, SingletonEntity};
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 20;
|
||||
const ZERO_STATE_BASE_SCORE: i64 = 1000;
|
||||
|
||||
@@ -12,8 +12,8 @@ use crate::test_util::terminal::{
|
||||
use crate::workspace::ActiveSession;
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warp_core::command::ExitCode;
|
||||
use warpui::{App, SingletonEntity};
|
||||
use galaxy_core::command::ExitCode;
|
||||
use galaxyui::{App, SingletonEntity};
|
||||
|
||||
/// Helper to create a `BlockSearchItem` with the given parameters.
|
||||
fn make_block_search_item(
|
||||
|
||||
@@ -7,15 +7,15 @@ use crate::terminal::model::block::BlockId;
|
||||
use crate::util::truncation::truncate_from_end;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use warpui::elements::Highlight;
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{
|
||||
use galaxyui::elements::Highlight;
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{
|
||||
elements::{ConstrainedBox, Container, CrossAxisAlignment, Flex, Icon, ParentElement, Text},
|
||||
AppContext, Element, SingletonEntity,
|
||||
};
|
||||
|
||||
use chrono::{DateTime, Local};
|
||||
use warp_core::command::ExitCode;
|
||||
use galaxy_core::command::ExitCode;
|
||||
|
||||
/// Calculate how long ago a timestamp was
|
||||
fn time_ago_string(timestamp: Option<&DateTime<Local>>) -> String {
|
||||
|
||||
@@ -23,9 +23,9 @@ use std::collections::HashSet;
|
||||
use std::path::PathBuf;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use std::time::Duration;
|
||||
use warpui::AppContext;
|
||||
use galaxyui::AppContext;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use warpui::ModelSpawner;
|
||||
use galaxyui::ModelSpawner;
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use crate::ai::outline::{OutlineStatus, RepoOutlines, RepoOutlinesEvent};
|
||||
@@ -36,7 +36,7 @@ use repo_metadata::repositories::DetectedRepositories;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use std::path::Path;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use warpui::SingletonEntity;
|
||||
use galaxyui::SingletonEntity;
|
||||
|
||||
const MAX_RESULTS: usize = 200;
|
||||
|
||||
@@ -71,13 +71,13 @@ pub struct CodeSymbolCache {
|
||||
spawner: ModelSpawner<Self>,
|
||||
}
|
||||
|
||||
impl warpui::Entity for CodeSymbolCache {
|
||||
impl galaxyui::Entity for CodeSymbolCache {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
impl CodeSymbolCache {
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
pub fn new(ctx: &mut warpui::ModelContext<Self>) -> Self {
|
||||
pub fn new(ctx: &mut galaxyui::ModelContext<Self>) -> Self {
|
||||
let spawner = ctx.spawner();
|
||||
let cache = Self {
|
||||
symbol_cache: RefCell::new(HashMap::new()),
|
||||
|
||||
@@ -8,9 +8,9 @@ use crate::ai::outline::{OutlineStatus, RepoOutlines};
|
||||
use crate::workspace::ActiveSession;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use std::path::Path;
|
||||
use warpui::AppContext;
|
||||
use galaxyui::AppContext;
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use warpui::SingletonEntity;
|
||||
use galaxyui::SingletonEntity;
|
||||
|
||||
/// Checks if the code symbols (outline) are currently being indexed for the active directory.
|
||||
/// Returns true if the outline is in a pending state, false otherwise.
|
||||
|
||||
@@ -5,11 +5,11 @@ use crate::search::item::{IconLocation, SearchItem};
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
// Import CodeSymbol from the data_source module
|
||||
use super::data_source::CodeSymbol;
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use crate::terminal::History;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use std::collections::HashSet;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 50;
|
||||
|
||||
@@ -118,6 +118,6 @@ impl SyncDataSource for CommandDataSource {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for CommandDataSource {
|
||||
impl galaxyui::Entity for CommandDataSource {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{ConstrainedBox, Container, Icon, Text},
|
||||
AppContext, Element, SingletonEntity,
|
||||
};
|
||||
@@ -53,9 +53,9 @@ impl SearchItem for CommandSearchItem {
|
||||
)
|
||||
.with_color(highlight_state.main_text_fill(appearance).into_solid())
|
||||
.with_single_highlight(
|
||||
warpui::elements::Highlight::new()
|
||||
galaxyui::elements::Highlight::new()
|
||||
.with_properties(
|
||||
warpui::fonts::Properties::default().weight(warpui::fonts::Weight::Bold),
|
||||
galaxyui::fonts::Properties::default().weight(galaxyui::fonts::Weight::Bold),
|
||||
)
|
||||
.with_foreground_color(highlight_state.main_text_fill(appearance).into_solid()),
|
||||
self.match_result.matched_indices.clone(),
|
||||
|
||||
@@ -7,7 +7,7 @@ use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use std::collections::HashSet;
|
||||
use warpui::{AppContext, Entity, SingletonEntity};
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 50;
|
||||
/// Minimum fuzzy match score to include a conversation in filtered results.
|
||||
|
||||
@@ -9,11 +9,11 @@ use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use crate::util::time_format::format_approx_duration_from_now_utc;
|
||||
use crate::util::truncation::truncate_from_end;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
const MAX_TITLE_LENGTH: usize = 45;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ use crate::code_review::diff_state::DiffMode;
|
||||
use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
|
||||
use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use warpui::AppContext;
|
||||
use galaxyui::AppContext;
|
||||
|
||||
const UNCOMMITTED_CHANGES_NAME: &str = "uncommitted changes";
|
||||
const MAIN_BRANCH_CHANGES_NAME: &str = "changes vs. main branch";
|
||||
@@ -53,6 +53,6 @@ impl SyncDataSource for DiffSetDataSource {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for DiffSetDataSource {
|
||||
impl galaxyui::Entity for DiffSetDataSource {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@ use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use ordered_float::OrderedFloat;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct DiffSetSearchItem {
|
||||
|
||||
@@ -16,7 +16,7 @@ use std::collections::HashMap;
|
||||
use std::collections::HashSet;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 200;
|
||||
|
||||
|
||||
@@ -17,11 +17,11 @@ use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
use tempfile::tempdir;
|
||||
use warpui::platform::WindowStyle;
|
||||
use warpui::r#async::block_on;
|
||||
use warpui::windowing::WindowManager;
|
||||
use warpui::SingletonEntity;
|
||||
use warpui::{elements::Empty, App, AppContext, Element, Entity, TypedActionView, View};
|
||||
use galaxyui::platform::WindowStyle;
|
||||
use galaxyui::r#async::block_on;
|
||||
use galaxyui::windowing::WindowManager;
|
||||
use galaxyui::SingletonEntity;
|
||||
use galaxyui::{elements::Empty, App, AppContext, Element, Entity, TypedActionView, View};
|
||||
struct TestView;
|
||||
|
||||
impl Entity for TestView {
|
||||
|
||||
@@ -8,8 +8,8 @@ use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
|
||||
use crate::search::ai_context_menu::styles;
|
||||
use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use warpui::elements::{ConstrainedBox, Container, Icon};
|
||||
use warpui::{AppContext, Element};
|
||||
use galaxyui::elements::{ConstrainedBox, Container, Icon};
|
||||
use galaxyui::{AppContext, Element};
|
||||
|
||||
use crate::search::files::icon::icon_from_file_path;
|
||||
use crate::ui_components::render_file_search_row::{render_file_search_row, FileSearchRowOptions};
|
||||
|
||||
@@ -7,7 +7,7 @@ use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use crate::workspaces::user_workspaces::UserWorkspaces;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 50;
|
||||
/// Base score for zero-state results. Each item gets an additional bonus based on
|
||||
@@ -152,6 +152,6 @@ impl SyncDataSource for NotebookDataSource {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for NotebookDataSource {
|
||||
impl galaxyui::Entity for NotebookDataSource {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ mod tests {
|
||||
|
||||
use chrono::{Duration, Utc};
|
||||
use settings::manager::SettingsManager;
|
||||
use warpui::{App, SingletonEntity};
|
||||
use galaxyui::{App, SingletonEntity};
|
||||
|
||||
use crate::auth::AuthStateProvider;
|
||||
use crate::cloud_object::model::persistence::CloudModel;
|
||||
|
||||
@@ -8,11 +8,11 @@ use crate::search::ai_context_menu::styles;
|
||||
use crate::search::ai_context_menu::{mixer::AIContextMenuSearchableAction, safe_truncate};
|
||||
use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
const MAX_COMBINED_LENGTH: usize = 55;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
|
||||
use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warpui::{AppContext, Entity, SingletonEntity};
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 50;
|
||||
const ZERO_STATE_BASE_SCORE: i64 = 1000;
|
||||
|
||||
@@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||
|
||||
use chrono::{Duration, Utc};
|
||||
use settings::manager::SettingsManager;
|
||||
use warpui::{App, SingletonEntity};
|
||||
use galaxyui::{App, SingletonEntity};
|
||||
|
||||
use crate::ai::facts::{AIFact, AIMemory, CloudAIFactModel};
|
||||
use crate::auth::AuthStateProvider;
|
||||
|
||||
@@ -8,11 +8,11 @@ use crate::search::ai_context_menu::styles;
|
||||
use crate::search::ai_context_menu::{mixer::AIContextMenuSearchableAction, safe_truncate};
|
||||
use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
const MAX_COMBINED_LENGTH: usize = 55;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use std::path::PathBuf;
|
||||
use warpui::{AppContext, Entity, SingletonEntity};
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
use crate::workspace::ActiveSession;
|
||||
|
||||
@@ -7,12 +7,12 @@ use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
|
||||
use crate::search::ai_context_menu::styles;
|
||||
use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use warp_core::ui::icons::Icon;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, ParentElement, Shrinkable, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
const MAX_DESCRIPTION_LEN: usize = 60;
|
||||
|
||||
@@ -36,11 +36,11 @@ impl SearchItem for SkillSearchItem {
|
||||
let icon_color = highlight_state.icon_fill(appearance).into_solid();
|
||||
|
||||
let icon_element = if let Some(override_icon) = self.icon_override {
|
||||
override_icon.to_warpui_icon(icon_color.into()).finish()
|
||||
override_icon.to_galaxyui_icon(icon_color.into()).finish()
|
||||
} else {
|
||||
self.provider
|
||||
.icon()
|
||||
.to_warpui_icon(self.provider.icon_fill(icon_color.into()))
|
||||
.to_galaxyui_icon(self.provider.icon_fill(icon_color.into()))
|
||||
.finish()
|
||||
};
|
||||
|
||||
|
||||
@@ -39,30 +39,30 @@ use settings::Setting as _;
|
||||
use std::collections::HashSet;
|
||||
use std::ops::Range;
|
||||
use std::time::Duration;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warpui::elements::ConstrainedBox;
|
||||
use warpui::elements::CrossAxisAlignment;
|
||||
use warpui::elements::Empty;
|
||||
use warpui::elements::Fill;
|
||||
use warpui::elements::Hoverable;
|
||||
use warpui::elements::MouseStateHandle;
|
||||
use warpui::elements::ScrollStateHandle;
|
||||
use warpui::elements::Scrollable;
|
||||
use warpui::elements::ScrollableElement;
|
||||
use warpui::elements::ScrollbarWidth;
|
||||
use warpui::elements::UniformList;
|
||||
use warpui::elements::UniformListState;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::elements::ConstrainedBox;
|
||||
use galaxyui::elements::CrossAxisAlignment;
|
||||
use galaxyui::elements::Empty;
|
||||
use galaxyui::elements::Fill;
|
||||
use galaxyui::elements::Hoverable;
|
||||
use galaxyui::elements::MouseStateHandle;
|
||||
use galaxyui::elements::ScrollStateHandle;
|
||||
use galaxyui::elements::Scrollable;
|
||||
use galaxyui::elements::ScrollableElement;
|
||||
use galaxyui::elements::ScrollbarWidth;
|
||||
use galaxyui::elements::UniformList;
|
||||
use galaxyui::elements::UniformListState;
|
||||
use galaxyui::elements::{
|
||||
AnchorPair, Border, ChildView, Container, CornerRadius, Dismiss, Flex, Icon, OffsetPositioning,
|
||||
OffsetType, ParentElement, PositionedElementOffsetBounds, PositioningAxis, Radius,
|
||||
SavePosition, Shrinkable, Stack, Text, XAxisAnchor, YAxisAnchor,
|
||||
};
|
||||
|
||||
use warpui::platform::Cursor;
|
||||
use warpui::windowing::WindowManager;
|
||||
use warpui::SingletonEntity;
|
||||
use warpui::View;
|
||||
use warpui::{
|
||||
use galaxyui::platform::Cursor;
|
||||
use galaxyui::windowing::WindowManager;
|
||||
use galaxyui::SingletonEntity;
|
||||
use galaxyui::View;
|
||||
use galaxyui::{
|
||||
AppContext, Element, Entity, ModelHandle, TypedActionView, ViewContext, ViewHandle,
|
||||
WeakViewHandle,
|
||||
};
|
||||
|
||||
@@ -6,7 +6,7 @@ use crate::search::data_source::{Query, QueryResult};
|
||||
use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
|
||||
use crate::workspaces::user_workspaces::UserWorkspaces;
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
const MAX_RESULTS: usize = 50;
|
||||
/// Base score for zero-state results. Each item gets an additional bonus based on
|
||||
@@ -125,6 +125,6 @@ impl SyncDataSource for WorkflowDataSource {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for WorkflowDataSource {
|
||||
impl galaxyui::Entity for WorkflowDataSource {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
@@ -8,11 +8,11 @@ use crate::search::ai_context_menu::styles;
|
||||
use crate::search::ai_context_menu::{mixer::AIContextMenuSearchableAction, safe_truncate};
|
||||
use crate::search::item::SearchItem;
|
||||
use crate::search::result_renderer::ItemHighlightState;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::{AppContext, Element, SingletonEntity};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::{AppContext, Element, SingletonEntity};
|
||||
|
||||
const MAX_COMBINED_LENGTH: usize = 55;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user