first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,27 +1,28 @@
use instant::Instant;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{
Border, CacheOption, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element,
Flex, FormattedTextElement, HighlightedHyperlink, Icon, Image, MouseStateHandle, ParentElement,
Radius,
};
use galaxyui::fonts::Weight;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{
elements::{
Border, CacheOption, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element,
Flex, FormattedTextElement, HighlightedHyperlink, Icon, Image, MouseStateHandle,
ParentElement, Radius,
},
fonts::Weight,
ui_components::components::{UiComponent, UiComponentStyles},
AppContext, Entity, ModelAsRef, ModelHandle, SingletonEntity, TypedActionView, View,
ViewContext,
};
use instant::Instant;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use crate::{
appearance::Appearance,
changelog_model::{ChangelogHeader, ChangelogModel, ChangelogState, Event as ChangelogEvent},
themes::theme::Fill,
ui_components::icons,
use super::feature_section::FeatureSection;
use super::{SectionAction, SectionView};
use crate::appearance::Appearance;
use crate::changelog_model::{
ChangelogHeader, ChangelogModel, ChangelogState, Event as ChangelogEvent,
};
use crate::{send_telemetry_from_ctx, server::telemetry::TelemetryEvent};
use super::{feature_section::FeatureSection, SectionAction, SectionView};
use crate::send_telemetry_from_ctx;
use crate::server::telemetry::TelemetryEvent;
use crate::themes::theme::Fill;
use crate::ui_components::icons;
#[derive(Default)]
struct ChangelogMouseStateHandles {
@@ -1,23 +1,17 @@
use galaxyui::{
elements::{
ConstrainedBox, Container, Element, Empty, Flex, MouseStateHandle, ParentElement,
Shrinkable,
},
ui_components::components::{UiComponent, UiComponentStyles},
AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext,
};
use pathfinder_color::ColorU;
use crate::util::color::{ContrastingColor, MinimumAllowedContrast};
use crate::{
appearance::Appearance,
resource_center::{ContentItem, ContentSectionData},
use galaxyui::elements::{
ConstrainedBox, Container, Element, Empty, Flex, MouseStateHandle, ParentElement, Shrinkable,
};
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use super::{
SectionAction, SectionView, CHEVRON_ICON_SIZE, DESCRIPTION_FONT_SIZE, ICON_PADDING,
ITEM_PADDING_BOTTOM, SECTION_SPACING,
};
use crate::appearance::Appearance;
use crate::resource_center::{ContentItem, ContentSectionData};
use crate::util::color::{ContrastingColor, MinimumAllowedContrast};
#[derive(Default)]
struct ContentMouseStateHandles {
@@ -1,31 +1,29 @@
use crate::{
appearance::Appearance,
send_telemetry_from_ctx,
server::telemetry::TelemetryEvent,
settings_view::keybindings::{KeybindingChangedEvent, KeybindingChangedNotifier},
themes::theme::Fill,
use warpui::elements::{
Align, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Hoverable, Icon,
MouseState, MouseStateHandle, ParentElement, Shrinkable,
};
use galaxyui::fonts::Weight;
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Hoverable, Icon,
MouseState, MouseStateHandle, ParentElement, Shrinkable,
},
fonts::Weight,
platform::Cursor,
ui_components::components::{UiComponent, UiComponentStyles},
Action, AppContext, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
ViewContext, WindowId,
};
use crate::resource_center::{
complete_tips_and_write_to_user_defaults, main_page::ActionTarget,
skip_tips_and_write_to_user_defaults, FeatureItem, FeatureSectionData, Tip, TipsCompleted,
};
use super::{
SectionAction, SectionView, CHEVRON_ICON_SIZE, DESCRIPTION_FONT_SIZE, ELLIPSE_ICON_SIZE,
ELLIPSE_SVG_PATH, ICON_PADDING, ITEM_PADDING_BOTTOM, SCROLLBAR_OFFSET, SECTION_SPACING,
};
use crate::appearance::Appearance;
use crate::resource_center::main_page::ActionTarget;
use crate::resource_center::{
complete_tips_and_write_to_user_defaults, skip_tips_and_write_to_user_defaults, FeatureItem,
FeatureSectionData, Tip, TipsCompleted,
};
use crate::send_telemetry_from_ctx;
use crate::server::telemetry::TelemetryEvent;
use crate::settings_view::keybindings::{KeybindingChangedEvent, KeybindingChangedNotifier};
use crate::themes::theme::Fill;
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum FeatureSection {
+10 -12
View File
@@ -4,20 +4,18 @@ pub mod content_section;
pub use content_section::ContentSectionView;
use galaxy_core::features::FeatureFlag;
pub mod changelog_section;
use crate::{
appearance::Appearance,
resource_center::{section_views::feature_section::FeatureSection, TipAction},
};
pub use changelog_section::ChangelogSectionView;
use galaxyui::{
elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Hoverable,
Icon, MouseStateHandle, ParentElement, ScrollbarWidth, Shrinkable,
},
platform::Cursor,
ui_components::components::{UiComponent, UiComponentStyles},
AppContext, ViewContext, ViewHandle,
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Element, Flex, Hoverable, Icon,
MouseStateHandle, ParentElement, ScrollbarWidth, Shrinkable,
};
use warpui::platform::Cursor;
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
use warpui::{AppContext, ViewContext, ViewHandle};
use crate::appearance::Appearance;
use crate::resource_center::section_views::feature_section::FeatureSection;
use crate::resource_center::TipAction;
pub const HEADER_FONT_SIZE: f32 = 16.;
pub const SECTION_HEADER_FONT_SIZE: f32 = 16.;