Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -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))))");
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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()),
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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},
|
||||
|
||||
Reference in New Issue
Block a user