Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

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
+2 -2
View File
@@ -3,11 +3,11 @@ use async_recursion::async_recursion;
use async_trait::async_trait;
use serde::Deserialize;
use std::{env, io::ErrorKind, path::PathBuf};
use warp_core::ui::{
use galaxy_core::ui::{
color::hex_color::coloru_from_hex_string,
theme::{AnsiColor, AnsiColors, TerminalColors, WarpTheme},
};
use warpui::fonts::FontInfo;
use galaxyui::fonts::FontInfo;
use super::config::{
calculate_accent_color, Config, ConfigError, ImportableSetting, ParseableConfig, SettingType,
@@ -1,6 +1,6 @@
use async_io::block_on;
use virtual_fs::{Stub, VirtualFS};
use warp_core::ui::{color::hex_color::coloru_from_hex_string, theme::AnsiColor};
use galaxy_core::ui::{color::hex_color::coloru_from_hex_string, theme::AnsiColor};
use crate::settings::import::config::{ParseableConfig, ThemeType};
+2 -2
View File
@@ -3,14 +3,14 @@ use std::{path::PathBuf, sync::Arc};
use pathfinder_color::ColorU;
use serde::Serialize;
use strum_macros::EnumIter;
use warp_core::ui::{
use galaxy_core::ui::{
color::hex_color::HexColorError as UiHexColorError,
theme::{AnsiColors, WarpTheme},
};
use async_trait::async_trait;
use thiserror::Error;
use warpui::{fonts::FontInfo, keymap::Keystroke, DisplayIdx};
use galaxyui::{fonts::FontInfo, keymap::Keystroke, DisplayIdx};
use crate::{
interval_timer::IntervalTimer,
+2 -2
View File
@@ -6,8 +6,8 @@ use itertools::Itertools;
use palette::Srgba;
use pathfinder_color::ColorU;
use plist::{Dictionary, Value};
use warp_core::ui::theme::{AnsiColors, TerminalColors, WarpTheme};
use warpui::{
use galaxy_core::ui::theme::{AnsiColors, TerminalColors, WarpTheme};
use galaxyui::{
fonts::FontInfo, keymap::Keystroke, platform::mac::utils::unicode_char_to_key, DisplayIdx,
};
@@ -2,8 +2,8 @@ use async_io::block_on;
use pathfinder_color::ColorU;
use plist::{Dictionary, Value};
use virtual_fs::{Stub, VirtualFS};
use warp_core::ui::theme::{Fill, WarpTheme};
use warpui::{fonts::FontInfo, keymap::Keystroke};
use galaxy_core::ui::theme::{Fill, WarpTheme};
use galaxyui::{fonts::FontInfo, keymap::Keystroke};
use crate::settings::import::{
config::{GlobalHotkey, HotkeyError, ImportedFont, ParseableConfig, ThemeType},
+5 -5
View File
@@ -7,10 +7,10 @@ use crate::{send_telemetry_from_ctx, TelemetryEvent};
use serde::Serialize;
use strum::IntoEnumIterator;
use strum_macros::{EnumDiscriminants, EnumIter};
use warp_core::features::FeatureFlag;
use warpui::Entity;
use warpui::ModelContext;
use warpui::SingletonEntity;
use galaxy_core::features::FeatureFlag;
use galaxyui::Entity;
use galaxyui::ModelContext;
use galaxyui::SingletonEntity;
#[cfg(target_os = "macos")]
use super::config::HotkeyError;
@@ -50,7 +50,7 @@ impl ImportedConfigModel {
use strum::IntoEnumIterator;
self.started = true;
let loaded_system_fonts = warpui::fonts::Cache::handle(ctx)
let loaded_system_fonts = galaxyui::fonts::Cache::handle(ctx)
.update(ctx, |font_cache, ctx| font_cache.all_system_fonts(ctx));
ctx.spawn(loaded_system_fonts, |_, fonts, ctx| {
let fonts = fonts
+19 -19
View File
@@ -1,7 +1,7 @@
use itertools::Itertools;
use warp_core::{settings::Setting, ui::appearance::Appearance};
use galaxy_core::{settings::Setting, ui::appearance::Appearance};
use warpui::{
use galaxyui::{
elements::{
Border, Container, CornerRadius, Flex, Hoverable, MainAxisAlignment, MainAxisSize,
MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
@@ -17,7 +17,7 @@ use warpui::{
ViewContext,
};
use warpui::ui_components::radio_buttons::RadioButtonStateHandle;
use galaxyui::ui_components::radio_buttons::RadioButtonStateHandle;
use crate::{
report_if_error, send_telemetry_from_ctx,
@@ -217,7 +217,7 @@ impl SettingsImportView {
&self,
appearance: &Appearance,
name: impl Into<std::borrow::Cow<'static, str>>,
) -> Box<dyn warpui::Element> {
) -> Box<dyn galaxyui::Element> {
let theme = appearance.theme();
let font_color = theme.disabled_text_color(theme.background());
let font_family = appearance.monospace_font_family();
@@ -237,8 +237,8 @@ impl SettingsImportView {
fn render_import_button(
&self,
appearance: &Appearance,
app: &warpui::AppContext,
) -> Box<dyn warpui::Element> {
app: &galaxyui::AppContext,
) -> Box<dyn galaxyui::Element> {
let model = ImportedConfigModel::as_ref(app);
let button = if self
.radio_button_state
@@ -282,7 +282,7 @@ impl SettingsImportView {
.finish()
}
fn render_reset_button(&self, appearance: &Appearance) -> Box<dyn warpui::Element> {
fn render_reset_button(&self, appearance: &Appearance) -> Box<dyn galaxyui::Element> {
appearance
.ui_builder()
.button(ButtonVariant::Secondary, self.skip_button_handle.clone())
@@ -311,8 +311,8 @@ impl SettingsImportView {
appearance: &Appearance,
setting: &ToggleableSetting,
idx: usize,
app: &warpui::AppContext,
) -> Box<dyn warpui::Element> {
app: &galaxyui::AppContext,
) -> Box<dyn galaxyui::Element> {
let theme = appearance.theme();
let font_family = appearance.monospace_font_family();
let font_color = blended_colors::text_sub(theme, theme.background());
@@ -343,7 +343,7 @@ impl SettingsImportView {
)
.with_child(Shrinkable::new(1.0, description.finish()).finish())
.with_main_axis_size(MainAxisSize::Max)
.with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Center)
.with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Center)
.finish(),
)
.finish()
@@ -356,8 +356,8 @@ impl SettingsImportView {
is_selected: bool,
hovered: bool,
idx: usize,
app: &warpui::AppContext,
) -> Box<dyn warpui::Element> {
app: &galaxyui::AppContext,
) -> Box<dyn galaxyui::Element> {
let theme = appearance.theme();
let font_family = appearance.monospace_font_family();
let font_color = theme.main_text_color(theme.background());
@@ -389,7 +389,7 @@ impl SettingsImportView {
}
let config_name_flex = Flex::row()
.with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Center)
.with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Center)
.with_children(config_name_text_elements)
.finish();
@@ -461,7 +461,7 @@ impl SettingsImportView {
.with_opacity(appearance.theme().settings_import_config_hover_opacity());
let preference_flex = Flex::row()
.with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Center)
.with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Center)
.with_children(preference_text_elements)
.finish();
Container::new(
@@ -473,7 +473,7 @@ impl SettingsImportView {
.with_child(Shrinkable::new(3.0, config_name_flex).finish())
.with_child(Shrinkable::new(1.0, preference_flex).finish())
.with_cross_axis_alignment(
warpui::elements::CrossAxisAlignment::Center,
galaxyui::elements::CrossAxisAlignment::Center,
)
.with_main_axis_size(MainAxisSize::Max)
.with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
@@ -516,7 +516,7 @@ impl SettingsImportView {
appearance: &Appearance,
settings: &[ToggleableSetting],
idx: usize,
app: &warpui::AppContext,
app: &galaxyui::AppContext,
) -> Box<dyn Element> {
let mut iter = settings.iter();
let mut column_holder = Flex::row().with_main_axis_size(MainAxisSize::Max);
@@ -747,7 +747,7 @@ impl SettingsImportView {
}
fn set_theme(
ctx: &mut warpui::ViewContext<Self>,
ctx: &mut galaxyui::ViewContext<Self>,
theme_type: ThemeType,
terminal_name: &String,
) {
@@ -861,7 +861,7 @@ impl SettingsImportView {
);
}
pub(crate) fn interrupt_block(&mut self, ctx: &mut warpui::ViewContext<Self>) {
pub(crate) fn interrupt_block(&mut self, ctx: &mut galaxyui::ViewContext<Self>) {
self.state = State::Completed { imported_idx: None };
ctx.notify();
}
@@ -907,7 +907,7 @@ impl View for SettingsImportView {
"SettingsImportView"
}
fn render(&self, app: &warpui::AppContext) -> Box<dyn warpui::Element> {
fn render(&self, app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
let appearance = Appearance::as_ref(app);
let font_family = appearance.monospace_font_family();
let font_size = appearance.monospace_font_size();