Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -11,11 +11,11 @@ use crate::telemetry::OnboardingEvent;
|
||||
use ai::LLMId;
|
||||
use instant::Instant;
|
||||
use std::time::Duration;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warpui::assets::asset_cache::AssetSource;
|
||||
use warpui::image_cache::ImageType;
|
||||
use warpui::windowing::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxyui::assets::asset_cache::AssetSource;
|
||||
use galaxyui::image_cache::ImageType;
|
||||
use galaxyui::windowing::{
|
||||
state::{ApplicationStage, StateEvent},
|
||||
WindowManager,
|
||||
};
|
||||
@@ -24,9 +24,9 @@ const APP_BECAME_ACTIVE_DEBOUNCE: Duration = Duration::from_secs(15);
|
||||
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::ui::{appearance::Appearance, theme::WarpTheme};
|
||||
use warpui::elements::Rect;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::WarpTheme};
|
||||
use galaxyui::elements::Rect;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
CacheOption, ChildAnchor, Container, Empty, Image, OffsetPositioning, ParentAnchor,
|
||||
ParentElement, ParentOffsetBounds, Shrinkable, Stack,
|
||||
@@ -339,7 +339,7 @@ impl AgentOnboardingView {
|
||||
/// Eagerly loads all onboarding slide images into the asset cache
|
||||
/// so they display instantly when the user navigates between slides.
|
||||
fn preload_onboarding_images(ctx: &mut ViewContext<Self>) {
|
||||
let asset_cache = warpui::assets::asset_cache::AssetCache::as_ref(ctx);
|
||||
let asset_cache = galaxyui::assets::asset_cache::AssetCache::as_ref(ctx);
|
||||
// Preload the shared background image used on all right panels.
|
||||
asset_cache.load_asset::<ImageType>(AssetSource::Bundled {
|
||||
path: crate::slides::layout::ONBOARDING_BG_PATH,
|
||||
|
||||
@@ -9,12 +9,12 @@ use onboarding::{
|
||||
use pathfinder_color::ColorU;
|
||||
use rust_embed::RustEmbed;
|
||||
use std::borrow::Cow;
|
||||
use warp_core::ui::icons::Icon;
|
||||
use warp_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, Image, TerminalColors};
|
||||
use warp_core::ui::{appearance::Appearance, theme::WarpTheme};
|
||||
use warpui::assets::asset_cache::AssetSource;
|
||||
use warpui::platform;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
use galaxy_core::ui::theme::{AnsiColor, AnsiColors, Details, Fill, Image, TerminalColors};
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::WarpTheme};
|
||||
use galaxyui::assets::asset_cache::AssetSource;
|
||||
use galaxyui::platform;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Container, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize, ParentElement,
|
||||
},
|
||||
@@ -41,7 +41,7 @@ impl AssetProvider for Assets {
|
||||
|
||||
fn main() -> Result<()> {
|
||||
// Initialize logging for the onboarding binary.
|
||||
warp_logging::init(warp_logging::LogConfig {
|
||||
galaxy_logging::init(galaxy_logging::LogConfig {
|
||||
is_cli: false,
|
||||
log_destination: None,
|
||||
})?;
|
||||
@@ -266,7 +266,7 @@ impl View for OnboardingMainView {
|
||||
}
|
||||
}
|
||||
|
||||
fn on_focus(&mut self, focus_ctx: &warpui::FocusContext, ctx: &mut ViewContext<Self>) {
|
||||
fn on_focus(&mut self, focus_ctx: &galaxyui::FocusContext, ctx: &mut ViewContext<Self>) {
|
||||
if let OnboardingMainState::Onboarding(view) = &self.state {
|
||||
if focus_ctx.is_self_focused() {
|
||||
ctx.focus(view);
|
||||
|
||||
@@ -4,6 +4,6 @@ mod view;
|
||||
pub use model::{FinalState, OnboardingQuery};
|
||||
pub use view::{OnboardingCalloutView, OnboardingCalloutViewEvent, OnboardingKeybindings};
|
||||
|
||||
pub fn init(app: &mut warpui::AppContext) {
|
||||
pub fn init(app: &mut galaxyui::AppContext) {
|
||||
view::init(app);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::telemetry::OnboardingEvent;
|
||||
use crate::OnboardingIntention;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warpui::{Entity, ModelContext};
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxyui::{Entity, ModelContext};
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum FinalState {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use ui_components::Component;
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{
|
||||
elements::Empty,
|
||||
keymap::{macros::*, FixedBinding, Keystroke},
|
||||
AppContext, Element, Entity, EventContext, ModelHandle, SingletonEntity, TypedActionView, View,
|
||||
|
||||
@@ -5,12 +5,12 @@ use pathfinder_geometry::vector::vec2f;
|
||||
use ui_components::{
|
||||
button, button::Button as ButtonComponent, Component, MouseEventHandler, Options as _,
|
||||
};
|
||||
use warp_core::ui::{
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance,
|
||||
color::{coloru_with_opacity, contrast::relative_luminance},
|
||||
theme::{phenomenon::PhenomenonStyle, Fill},
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow, Flex,
|
||||
MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Rect,
|
||||
|
||||
@@ -76,7 +76,7 @@ pub use model::{OnboardingAuthState, SelectedSettings, UICustomizationSettings};
|
||||
pub use slides::ProjectOnboardingSettings;
|
||||
pub use telemetry::OnboardingEvent;
|
||||
|
||||
pub fn init(app: &mut warpui::AppContext) {
|
||||
pub fn init(app: &mut galaxyui::AppContext) {
|
||||
agent_onboarding_view::init(app);
|
||||
callout::init(app);
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ use crate::slides::{
|
||||
use crate::telemetry::OnboardingEvent;
|
||||
use crate::OnboardingIntention;
|
||||
use ai::LLMId;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warpui::{Entity, ModelContext};
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxyui::{Entity, ModelContext};
|
||||
|
||||
/// UI customization settings chosen during the "Customize your UI" onboarding slide.
|
||||
#[derive(Clone, Debug)]
|
||||
@@ -78,7 +78,7 @@ pub enum SelectedSettings {
|
||||
|
||||
impl SelectedSettings {
|
||||
pub fn is_ai_enabled(&self) -> bool {
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
match self {
|
||||
SelectedSettings::AgentDrivenDevelopment { agent_settings, .. } => {
|
||||
!agent_settings.disable_oz
|
||||
@@ -197,7 +197,7 @@ impl OnboardingStateModel {
|
||||
}
|
||||
|
||||
pub(crate) fn settings(&self) -> SelectedSettings {
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
let ui_customization = if FeatureFlag::OpenWarpNewSettingsModes.is_enabled() {
|
||||
Some(self.ui_customization.clone())
|
||||
} else {
|
||||
@@ -551,7 +551,7 @@ impl OnboardingStateModel {
|
||||
default_model_id: LLMId,
|
||||
ctx: &mut ModelContext<Self>,
|
||||
) {
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
|
||||
// If the user is past the agent slide, don't change the agent model from underneath them.
|
||||
// When the new settings modes flag is on, ThemePicker comes after the agent slides
|
||||
@@ -663,7 +663,7 @@ impl OnboardingStateModel {
|
||||
}
|
||||
|
||||
pub(crate) fn back(&mut self, ctx: &mut ModelContext<Self>) {
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
let theme_picker_last = FeatureFlag::OpenWarpNewSettingsModes.is_enabled();
|
||||
|
||||
let prev = if theme_picker_last {
|
||||
@@ -698,7 +698,7 @@ impl OnboardingStateModel {
|
||||
}
|
||||
|
||||
pub(crate) fn next(&mut self, ctx: &mut ModelContext<Self>) {
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
let theme_picker_last = FeatureFlag::OpenWarpNewSettingsModes.is_enabled();
|
||||
|
||||
let is_last_step = if theme_picker_last {
|
||||
|
||||
@@ -2,18 +2,18 @@ use super::two_line_button::{render_two_line_button, TwoLineButtonSpec};
|
||||
use crate::model::{OnboardingAuthState, OnboardingStateEvent, OnboardingStateModel};
|
||||
use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::telemetry::OnboardingEvent;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
|
||||
use super::OnboardingSlide;
|
||||
use crate::visuals::agent_visual;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::ui::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance,
|
||||
theme::{color::internal_colors, Fill},
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
AnchorPair, Border, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container,
|
||||
CornerRadius, CrossAxisAlignment, Dismiss, Empty, Flex, FormattedTextElement, Hoverable,
|
||||
@@ -35,7 +35,7 @@ use warpui::{
|
||||
use ai::LLMId;
|
||||
use pathfinder_color::ColorU;
|
||||
use ui_components::button::State as ButtonState;
|
||||
use warp_core::ui::icons::Icon;
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
|
||||
/// high-contrast "inverted" fill (foreground color)
|
||||
struct UpgradeButtonTheme;
|
||||
@@ -45,8 +45,8 @@ impl button::Theme for UpgradeButtonTheme {
|
||||
&self,
|
||||
button_state: ButtonState,
|
||||
appearance: &Appearance,
|
||||
) -> Option<warp_core::ui::theme::Fill> {
|
||||
use warp_core::ui::color::blend::Blend;
|
||||
) -> Option<galaxy_core::ui::theme::Fill> {
|
||||
use galaxy_core::ui::color::blend::Blend;
|
||||
let theme = appearance.theme();
|
||||
let base = theme.foreground();
|
||||
match button_state {
|
||||
@@ -60,7 +60,7 @@ impl button::Theme for UpgradeButtonTheme {
|
||||
|
||||
fn text_color(
|
||||
&self,
|
||||
background: Option<warp_core::ui::theme::Fill>,
|
||||
background: Option<galaxy_core::ui::theme::Fill>,
|
||||
appearance: &Appearance,
|
||||
) -> ColorU {
|
||||
let bg = background
|
||||
@@ -152,7 +152,7 @@ pub enum AgentSlideEvent {
|
||||
}
|
||||
|
||||
pub struct AgentSlide {
|
||||
onboarding_state: warpui::ModelHandle<OnboardingStateModel>,
|
||||
onboarding_state: galaxyui::ModelHandle<OnboardingStateModel>,
|
||||
|
||||
/// Mouse state handles for each model row.
|
||||
model_mouse_states: Vec<MouseStateHandle>,
|
||||
@@ -201,7 +201,7 @@ fn sorted_models(models: &[OnboardingModelInfo]) -> Vec<OnboardingModelInfo> {
|
||||
|
||||
impl AgentSlide {
|
||||
pub(crate) fn new(
|
||||
onboarding_state: warpui::ModelHandle<OnboardingStateModel>,
|
||||
onboarding_state: galaxyui::ModelHandle<OnboardingStateModel>,
|
||||
ctx: &mut ViewContext<Self>,
|
||||
) -> Self {
|
||||
let model_count = onboarding_state.as_ref(ctx).models().len();
|
||||
@@ -234,7 +234,7 @@ impl AgentSlide {
|
||||
me.show_plan_activated_toast = true;
|
||||
// Auto-dismiss after the configured duration.
|
||||
let _ = ctx.spawn(
|
||||
warpui::r#async::Timer::after(PLAN_ACTIVATED_TOAST_DURATION),
|
||||
galaxyui::r#async::Timer::after(PLAN_ACTIVATED_TOAST_DURATION),
|
||||
|me: &mut Self, _, ctx| {
|
||||
if me.show_plan_activated_toast {
|
||||
me.show_plan_activated_toast = false;
|
||||
@@ -541,7 +541,7 @@ impl AgentSlide {
|
||||
let title_row: Box<dyn Element> = if let Some(icon) = icon {
|
||||
const ICON_SIZE: f32 = 14.;
|
||||
let icon_el =
|
||||
ConstrainedBox::new(Box::new(icon.to_warpui_icon(title_color.into())))
|
||||
ConstrainedBox::new(Box::new(icon.to_galaxyui_icon(title_color.into())))
|
||||
.with_width(ICON_SIZE)
|
||||
.with_height(ICON_SIZE)
|
||||
.finish();
|
||||
@@ -720,7 +720,7 @@ impl AgentSlide {
|
||||
.finish();
|
||||
|
||||
const ICON_SIZE: f32 = 14.;
|
||||
let icon_el = ConstrainedBox::new(Box::new(icon.to_warpui_icon(title_color.into())))
|
||||
let icon_el = ConstrainedBox::new(Box::new(icon.to_galaxyui_icon(title_color.into())))
|
||||
.with_width(ICON_SIZE)
|
||||
.with_height(ICON_SIZE)
|
||||
.finish();
|
||||
@@ -1003,7 +1003,7 @@ impl AgentSlide {
|
||||
);
|
||||
|
||||
let step_index = 2;
|
||||
let step_count = if warp_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled()
|
||||
let step_count = if galaxy_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled()
|
||||
{
|
||||
5
|
||||
} else {
|
||||
@@ -1165,7 +1165,7 @@ impl AgentSlide {
|
||||
};
|
||||
|
||||
let icon = ConstrainedBox::new(Box::new(
|
||||
Icon::AlertCircle.to_warpui_icon(Fill::Solid(text_color)),
|
||||
Icon::AlertCircle.to_galaxyui_icon(Fill::Solid(text_color)),
|
||||
))
|
||||
.with_width(ICON_SIZE)
|
||||
.with_height(ICON_SIZE)
|
||||
@@ -1263,7 +1263,7 @@ impl AgentSlide {
|
||||
let ui_builder = appearance.ui_builder();
|
||||
|
||||
let check_icon = ConstrainedBox::new(Box::new(
|
||||
Icon::CheckSkinny.to_warpui_icon(Fill::Solid(text_color)),
|
||||
Icon::CheckSkinny.to_galaxyui_icon(Fill::Solid(text_color)),
|
||||
))
|
||||
.with_width(ICON_SIZE)
|
||||
.with_height(ICON_SIZE)
|
||||
@@ -1362,7 +1362,7 @@ impl View for AgentSlide {
|
||||
let mut stack = Stack::new();
|
||||
stack.add_child(slide);
|
||||
stack.add_child(
|
||||
warpui::elements::Align::new(bottom_overlay)
|
||||
galaxyui::elements::Align::new(bottom_overlay)
|
||||
.bottom_center()
|
||||
.finish(),
|
||||
);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::slides::progress_dots;
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, Container, CrossAxisAlignment, Empty, Flex, MainAxisSize, ParentElement, Shrinkable,
|
||||
},
|
||||
|
||||
@@ -5,10 +5,10 @@ use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::visuals::{intention_terminal_visual, intention_visual};
|
||||
use crate::OnboardingIntention;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use warpui::prelude::Align;
|
||||
use warpui::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use galaxyui::prelude::Align;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ClippedScrollStateHandle, Container, CrossAxisAlignment, Flex, FormattedTextElement,
|
||||
MainAxisSize, MouseStateHandle, ParentElement,
|
||||
|
||||
@@ -4,11 +4,11 @@ use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::telemetry::OnboardingEvent;
|
||||
use crate::OnboardingIntention;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warp_core::ui::theme::Fill;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use warpui::prelude::Align;
|
||||
use warpui::{
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use galaxyui::prelude::Align;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ClippedScrollStateHandle, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, DropShadow, Flex, FormattedTextElement, Hoverable, MainAxisAlignment,
|
||||
@@ -162,7 +162,7 @@ impl FreeUserNoAiSlide {
|
||||
&self,
|
||||
appearance: &Appearance,
|
||||
text: String,
|
||||
text_color: warpui::color::ColorU,
|
||||
text_color: galaxyui::color::ColorU,
|
||||
border_color: Fill,
|
||||
) -> Box<dyn Element> {
|
||||
let label = appearance
|
||||
@@ -232,7 +232,7 @@ impl FreeUserNoAiSlide {
|
||||
);
|
||||
|
||||
Hoverable::new(mouse_state, move |_| {
|
||||
let icon_el = ConstrainedBox::new(icon.to_warpui_icon(text_fill).finish())
|
||||
let icon_el = ConstrainedBox::new(icon.to_galaxyui_icon(text_fill).finish())
|
||||
.with_width(20.)
|
||||
.with_height(20.)
|
||||
.finish();
|
||||
@@ -415,15 +415,15 @@ impl FreeUserNoAiSlide {
|
||||
.with_main_axis_alignment(MainAxisAlignment::Center)
|
||||
.with_cross_axis_alignment(CrossAxisAlignment::Center)
|
||||
.with_child(
|
||||
warpui::elements::Text::new_inline(
|
||||
galaxyui::elements::Text::new_inline(
|
||||
"Subscribe",
|
||||
appearance.ui_font_family(),
|
||||
14.,
|
||||
)
|
||||
.with_color(fg_color)
|
||||
.with_style(warpui::fonts::Properties {
|
||||
.with_style(galaxyui::fonts::Properties {
|
||||
weight: Weight::Semibold,
|
||||
style: warpui::fonts::Style::Normal,
|
||||
style: galaxyui::fonts::Style::Normal,
|
||||
})
|
||||
.with_selectable(false)
|
||||
.finish(),
|
||||
|
||||
@@ -4,11 +4,11 @@ use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::visuals::{intention_terminal_visual, intention_visual};
|
||||
use crate::{OnboardingIntention, AI_FEATURES};
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::ui::theme::Fill;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use warpui::prelude::Align;
|
||||
use warpui::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use galaxyui::prelude::Align;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ClippedScrollStateHandle, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, Flex, FormattedTextElement, Hoverable, MainAxisAlignment, MainAxisSize,
|
||||
@@ -73,7 +73,7 @@ impl IntentionSlide {
|
||||
let theme = appearance.theme();
|
||||
|
||||
let logo_fill = internal_colors::fg_overlay_4(theme);
|
||||
let logo = ConstrainedBox::new(Icon::WarpLogoLight.to_warpui_icon(logo_fill).finish())
|
||||
let logo = ConstrainedBox::new(Icon::WarpLogoLight.to_galaxyui_icon(logo_fill).finish())
|
||||
.with_width(64.)
|
||||
.with_height(64.)
|
||||
.finish();
|
||||
@@ -216,7 +216,7 @@ impl IntentionSlide {
|
||||
.iter()
|
||||
.enumerate()
|
||||
{
|
||||
let el = ConstrainedBox::new(icon.to_warpui_icon(icon_fill).finish())
|
||||
let el = ConstrainedBox::new(icon.to_galaxyui_icon(icon_fill).finish())
|
||||
.with_width(16.)
|
||||
.with_height(16.)
|
||||
.finish();
|
||||
@@ -260,7 +260,7 @@ impl IntentionSlide {
|
||||
.with_main_axis_size(MainAxisSize::Min)
|
||||
.with_cross_axis_alignment(CrossAxisAlignment::Start);
|
||||
for &item in items {
|
||||
let icon_el = ConstrainedBox::new(Icon::Check.to_warpui_icon(check_fill).finish())
|
||||
let icon_el = ConstrainedBox::new(Icon::Check.to_galaxyui_icon(check_fill).finish())
|
||||
.with_width(16.)
|
||||
.with_height(16.)
|
||||
.finish();
|
||||
|
||||
@@ -5,9 +5,9 @@ use super::OnboardingSlide;
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use warpui::{
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors, Icon};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
shimmering_text::{ShimmerConfig, ShimmeringTextElement, ShimmeringTextStateHandle},
|
||||
Align, ChildAnchor, ConstrainedBox, Container, CrossAxisAlignment, Flex,
|
||||
@@ -139,7 +139,7 @@ impl IntroSlide {
|
||||
let theme = appearance.theme();
|
||||
|
||||
let logo_fill = internal_colors::fg_overlay_4(theme);
|
||||
let logo = ConstrainedBox::new(Icon::WarpLogoLight.to_warpui_icon(logo_fill).finish())
|
||||
let logo = ConstrainedBox::new(Icon::WarpLogoLight.to_galaxyui_icon(logo_fill).finish())
|
||||
.with_width(64.)
|
||||
.with_height(64.)
|
||||
.finish();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
assets::asset_cache::AssetSource,
|
||||
elements::{
|
||||
Align, CacheOption, Clipped, ConstrainedBox, Container, CrossAxisAlignment, Empty,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use warpui::{View, ViewContext};
|
||||
use galaxyui::{View, ViewContext};
|
||||
|
||||
pub trait OnboardingSlide: View {
|
||||
fn on_up(&mut self, _ctx: &mut ViewContext<Self>) {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use warpui::{
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ConstrainedBox, Container, CornerRadius, Empty, Flex, MainAxisSize, ParentElement, Radius,
|
||||
},
|
||||
|
||||
@@ -3,13 +3,13 @@ use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::telemetry::OnboardingEvent;
|
||||
use crate::visuals::project_visual;
|
||||
use ui_components::{button, keyboard_shortcut, Component as _, Options as _};
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warp_core::ui::{
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance, color::coloru_with_opacity, theme::color::internal_colors, Icon,
|
||||
};
|
||||
use warpui::prelude::{MainAxisAlignment, MainAxisSize, Vector2F};
|
||||
use warpui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
|
||||
use warpui::{
|
||||
use galaxyui::prelude::{MainAxisAlignment, MainAxisSize, Vector2F};
|
||||
use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, ClippedScrollStateHandle, ConstrainedBox, Container, CrossAxisAlignment, Flex,
|
||||
MouseStateHandle, ParentElement, Shrinkable,
|
||||
@@ -174,7 +174,7 @@ impl ProjectSlide {
|
||||
TextAndIcon::new(
|
||||
TextAndIconAlignment::IconFirst,
|
||||
selected_local_folder.to_owned(),
|
||||
Icon::Folder.to_warpui_icon(theme.foreground()),
|
||||
Icon::Folder.to_galaxyui_icon(theme.foreground()),
|
||||
MainAxisSize::Max,
|
||||
MainAxisAlignment::Center,
|
||||
Vector2F::new(16., 16.),
|
||||
@@ -204,7 +204,7 @@ impl ProjectSlide {
|
||||
);
|
||||
|
||||
let folder_icon =
|
||||
ConstrainedBox::new(Icon::Folder.to_warpui_icon(theme.foreground()).finish())
|
||||
ConstrainedBox::new(Icon::Folder.to_galaxyui_icon(theme.foreground()).finish())
|
||||
.with_width(16.)
|
||||
.with_height(16.)
|
||||
.finish();
|
||||
@@ -291,7 +291,7 @@ impl ProjectSlide {
|
||||
);
|
||||
|
||||
let theme_picker_last =
|
||||
warp_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled();
|
||||
galaxy_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled();
|
||||
|
||||
let (label, keystroke, action) = match settings {
|
||||
ProjectOnboardingSettings::Project { .. } => (
|
||||
@@ -483,7 +483,7 @@ impl ProjectSlide {
|
||||
}
|
||||
|
||||
self.onboarding_state.update(ctx, |model, ctx| {
|
||||
if warp_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled() {
|
||||
if galaxy_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled() {
|
||||
model.next(ctx);
|
||||
} else {
|
||||
model.complete(ctx);
|
||||
@@ -494,7 +494,7 @@ impl ProjectSlide {
|
||||
fn skip(&mut self, ctx: &mut ViewContext<Self>) {
|
||||
self.onboarding_state.update(ctx, |model, ctx| {
|
||||
model.set_project_selected_local_folder(None, ctx);
|
||||
if warp_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled() {
|
||||
if galaxy_core::features::FeatureFlag::OpenWarpNewSettingsModes.is_enabled() {
|
||||
model.next(ctx);
|
||||
} else {
|
||||
model.complete(ctx);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, ClippedScrollStateHandle, ClippedScrollable, Container, CrossAxisAlignment, Flex,
|
||||
MainAxisSize, ParentElement, ScrollbarWidth, Shrinkable,
|
||||
|
||||
@@ -6,10 +6,10 @@ use crate::visuals::theme_picker_visual;
|
||||
use crate::OnboardingIntention;
|
||||
use pathfinder_color::ColorU;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors, theme::WarpTheme};
|
||||
use warpui::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors, theme::WarpTheme};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ClippedScrollStateHandle, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, Empty, Flex, FormattedTextElement, Hoverable, MainAxisAlignment,
|
||||
|
||||
@@ -5,10 +5,10 @@ use crate::slides::{bottom_nav, layout, slide_content};
|
||||
use crate::OnboardingIntention;
|
||||
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warpui::prelude::Align;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxyui::prelude::Align;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ClippedScrollStateHandle, Container, CrossAxisAlignment, Flex, FormattedTextElement,
|
||||
MainAxisSize, MouseStateHandle, ParentElement,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
use warp_core::ui::theme::Fill;
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use warpui::prelude::Align;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use galaxyui::prelude::Align;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex,
|
||||
FormattedTextElement, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle,
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
use super::agent_slide::AgentSlideAction;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warp_core::ui::{
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance,
|
||||
icons::Icon,
|
||||
theme::{color::internal_colors, Fill},
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
|
||||
Flex, Hoverable, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
|
||||
@@ -97,7 +97,7 @@ pub(super) fn render_two_line_button(
|
||||
// Build title row with optional icon
|
||||
let title_el: Box<dyn Element> = if let Some(icon) = icon {
|
||||
const ICON_SIZE: f32 = 14.;
|
||||
let icon_el = ConstrainedBox::new(Box::new(icon.to_warpui_icon(title_fill)))
|
||||
let icon_el = ConstrainedBox::new(Box::new(icon.to_galaxyui_icon(title_fill)))
|
||||
.with_width(ICON_SIZE)
|
||||
.with_height(ICON_SIZE)
|
||||
.finish();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{json, Value};
|
||||
use strum_macros::{EnumDiscriminants, EnumIter};
|
||||
use warp_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
|
||||
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
|
||||
|
||||
/// Telemetry events for the onboarding flow.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize, EnumDiscriminants)]
|
||||
@@ -144,7 +144,7 @@ impl TelemetryEvent for OnboardingEvent {
|
||||
}
|
||||
|
||||
fn event_descs() -> impl Iterator<Item = Box<dyn TelemetryEventDesc>> {
|
||||
warp_core::telemetry::enum_events::<Self>()
|
||||
galaxy_core::telemetry::enum_events::<Self>()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,4 +214,4 @@ impl TelemetryEventDesc for OnboardingEventDiscriminant {
|
||||
}
|
||||
}
|
||||
|
||||
warp_core::register_telemetry_event!(OnboardingEvent);
|
||||
galaxy_core::register_telemetry_event!(OnboardingEvent);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use warp_core::telemetry::{TelemetryContextModel, TelemetryContextProvider};
|
||||
use warpui::{AppContext, ModelContext};
|
||||
use galaxy_core::telemetry::{TelemetryContextModel, TelemetryContextProvider};
|
||||
use galaxyui::{AppContext, ModelContext};
|
||||
|
||||
/// A mock telemetry context provider for the onboarding binary that logs events
|
||||
/// instead of sending them to a server.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warpui::elements::Align;
|
||||
use warpui::Element;
|
||||
use galaxyui::elements::Align;
|
||||
use galaxyui::Element;
|
||||
|
||||
use super::onboarding_visual::{OnboardingVisual, Pill, RectPct};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warpui::elements::Align;
|
||||
use warpui::Element;
|
||||
use galaxyui::elements::Align;
|
||||
use galaxyui::Element;
|
||||
|
||||
use crate::visuals::onboarding_visual::Rect;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warpui::elements::Align;
|
||||
use warpui::Element;
|
||||
use galaxyui::elements::Align;
|
||||
use galaxyui::Element;
|
||||
|
||||
use super::onboarding_visual::{OnboardingVisual, Pill, RectPct};
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warp_core::ui::Icon;
|
||||
use warpui::assets::asset_cache::{AssetCache, AssetSource, AssetState};
|
||||
use warpui::geometry::rect::RectF;
|
||||
use warpui::geometry::vector::{vec2f, Vector2F};
|
||||
use warpui::image_cache::{AnimatedImageBehavior, CacheOption, FitType, Image, ImageCache};
|
||||
use warpui::{
|
||||
use galaxy_core::ui::Icon;
|
||||
use galaxyui::assets::asset_cache::{AssetCache, AssetSource, AssetState};
|
||||
use galaxyui::geometry::rect::RectF;
|
||||
use galaxyui::geometry::vector::{vec2f, Vector2F};
|
||||
use galaxyui::image_cache::{AnimatedImageBehavior, CacheOption, FitType, Image, ImageCache};
|
||||
use galaxyui::{
|
||||
elements::{CornerRadius, Fill, Point, Radius},
|
||||
event::DispatchedEvent,
|
||||
AfterLayoutContext, AppContext, Element, EventContext, LayoutContext, PaintContext,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warp_core::ui::Icon;
|
||||
use warpui::elements::Align;
|
||||
use warpui::Element;
|
||||
use galaxy_core::ui::Icon;
|
||||
use galaxyui::elements::Align;
|
||||
use galaxyui::Element;
|
||||
|
||||
use super::onboarding_visual::{IconPct, OnboardingVisual, Pill, RectPct};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use super::onboarding_visual::{OnboardingVisual, Pill, RectPct};
|
||||
use warp_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use warpui::{elements::Align, Element};
|
||||
use galaxy_core::ui::{appearance::Appearance, theme::color::internal_colors};
|
||||
use galaxyui::{elements::Align, Element};
|
||||
|
||||
pub(crate) fn theme_picker_visual(appearance: &Appearance) -> Box<dyn Element> {
|
||||
let theme = appearance.theme();
|
||||
|
||||
Reference in New Issue
Block a user