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

app/src/settings/import/alacritty_parser.rs

@@ -1,19 +1,20 @@
-use crate::settings::import::config::ThemeError;
+use std::env;
+use std::io::ErrorKind;
+use std::path::PathBuf;
+
 use async_recursion::async_recursion;
 use async_trait::async_trait;
-use galaxy_core::ui::{
-    color::hex_color::coloru_from_hex_string,
-    theme::{AnsiColor, AnsiColors, GalaxyTheme, TerminalColors},
-};
-use galaxyui::fonts::FontInfo;
+use pathfinder_color::ColorU;
 use serde::Deserialize;
-use std::{env, io::ErrorKind, path::PathBuf};
+use galaxy_core::ui::color::hex_color::coloru_from_hex_string;
+use galaxy_core::ui::theme::{AnsiColor, AnsiColors, TerminalColors, WarpTheme};
+use galaxyui::fonts::FontInfo;
 
 use super::config::{
     calculate_accent_color, Config, ConfigError, ImportableSetting, ParseableConfig, SettingType,
     ThemeType,
 };
-use pathfinder_color::ColorU;
+use crate::settings::import::config::ThemeError;
 
 type AlacrittyColor = String;
 const CONFIG_DEPTH_LIMIT: u8 = 5;

app/src/settings/import/alacritty_parser_tests.rs

@@ -1,12 +1,13 @@
 use async_io::block_on;
 use galaxy_core::ui::{color::hex_color::coloru_from_hex_string, theme::AnsiColor};
 use virtual_fs::{Stub, VirtualFS};
-
-use crate::settings::import::config::{ParseableConfig, ThemeType};
+use galaxy_core::ui::color::hex_color::coloru_from_hex_string;
+use galaxy_core::ui::theme::AnsiColor;
 
 use super::{
     AlacrittyColors, AlacrittyConfig, AlacrittyTheme, PrimaryAlacrittyColors, RecursivelyParseable,
 };
+use crate::settings::import::config::{ParseableConfig, ThemeType};
 
 #[test]
 fn test_parse_cobalt2() {

app/src/settings/import/config.rs

@@ -1,31 +1,28 @@
-use std::{path::PathBuf, sync::Arc};
+use std::path::PathBuf;
+use std::sync::Arc;
 
-use galaxy_core::ui::{
-    color::hex_color::HexColorError as UiHexColorError,
-    theme::{AnsiColors, GalaxyTheme},
-};
+use async_trait::async_trait;
 use pathfinder_color::ColorU;
 use serde::Serialize;
 use strum_macros::EnumIter;
-
-use async_trait::async_trait;
-use galaxyui::{fonts::FontInfo, keymap::Keystroke, DisplayIdx};
 use thiserror::Error;
+use galaxy_core::ui::color::hex_color::HexColorError as UiHexColorError;
+use galaxy_core::ui::theme::{AnsiColors, WarpTheme};
+use galaxyui::fonts::FontInfo;
+use galaxyui::keymap::Keystroke;
+use galaxyui::DisplayIdx;
 
-use crate::{
-    interval_timer::IntervalTimer,
-    root_view::QuakeModePinPosition,
-    settings::ExtraMetaKeys,
-    terminal::session_settings::{StartupShell, WorkingDirectoryConfig},
-    themes::theme_creator::pick_accent_color_from_options,
-};
-#[cfg(feature = "local_fs")]
-use crate::{themes::theme_creator_body::ThemeCreatorBody, user_config};
-
-use super::{alacritty_parser::AlacrittyConfig, model::TerminalType};
-
+use super::alacritty_parser::AlacrittyConfig;
 #[cfg(target_os = "macos")]
 use super::iterm_parser::ITermProfile;
+use super::model::TerminalType;
+use crate::interval_timer::IntervalTimer;
+use crate::root_view::QuakeModePinPosition;
+use crate::settings::ExtraMetaKeys;
+use crate::terminal::session_settings::{StartupShell, WorkingDirectoryConfig};
+use crate::themes::theme_creator::pick_accent_color_from_options;
+#[cfg(feature = "local_fs")]
+use crate::{themes::theme_creator_body::ThemeCreatorBody, user_config};
 
 #[derive(Debug)]
 pub enum ThemeType {

app/src/settings/import/iterm_parser.rs

@@ -10,27 +10,24 @@ use itertools::Itertools;
 use palette::Srgba;
 use pathfinder_color::ColorU;
 use plist::{Dictionary, Value};
-
-use crate::{
-    root_view::QuakeModePinPosition,
-    settings::{
-        import::config::HotkeyError, ExtraMetaKeys, DEFAULT_MONOSPACE_FONT_NAME,
-        DEFAULT_MONOSPACE_FONT_SIZE,
-    },
-    terminal::{
-        local_tty::shell::is_valid_path_or_command_for_supported_shell,
-        session_settings::{
-            StartupShell, WorkingDirectoryConfig, WorkingDirectoryMode,
-            WorkingDirectoryPerSourceConfig,
-        },
-    },
-};
+use galaxy_core::ui::theme::{AnsiColors, TerminalColors, WarpTheme};
+use galaxyui::fonts::FontInfo;
+use galaxyui::keymap::Keystroke;
+use galaxyui::platform::mac::utils::unicode_char_to_key;
+use galaxyui::DisplayIdx;
 
 use super::config::{
     calculate_accent_color, Config, ConfigError, GlobalHotkey, ImportableSetting, ImportedFont,
     MouseAndScrollReporting, OpacitySettings, ParseableConfig, QuakeModeWindow, SettingType,
     ThemeError, ThemeType,
 };
+use crate::root_view::QuakeModePinPosition;
+use crate::settings::import::config::HotkeyError;
+use crate::settings::{ExtraMetaKeys, DEFAULT_MONOSPACE_FONT_NAME, DEFAULT_MONOSPACE_FONT_SIZE};
+use crate::terminal::local_tty::shell::is_valid_path_or_command_for_supported_shell;
+use crate::terminal::session_settings::{
+    StartupShell, WorkingDirectoryConfig, WorkingDirectoryMode, WorkingDirectoryPerSourceConfig,
+};
 
 extern crate plist;
 

app/src/settings/import/iterm_parser_tests.rs

@@ -4,13 +4,17 @@ use galaxyui::{fonts::FontInfo, keymap::Keystroke};
 use pathfinder_color::ColorU;
 use plist::{Dictionary, Value};
 use virtual_fs::{Stub, VirtualFS};
-
-use crate::settings::import::{
-    config::{GlobalHotkey, HotkeyError, ImportedFont, ParseableConfig, ThemeType},
-    iterm_parser::{default_dark_theme, default_light_theme, Flags, ITermKeystroke, ITermProfile},
-};
+use galaxy_core::ui::theme::{Fill, WarpTheme};
+use galaxyui::fonts::FontInfo;
+use galaxyui::keymap::Keystroke;
 
 use super::{color_dictionary_to_coloru, ITermTheme, ITermThemeType};
+use crate::settings::import::config::{
+    GlobalHotkey, HotkeyError, ImportedFont, ParseableConfig, ThemeType,
+};
+use crate::settings::import::iterm_parser::{
+    default_dark_theme, default_light_theme, Flags, ITermKeystroke, ITermProfile,
+};
 
 fn courier_new() -> Vec<FontInfo> {
     vec![FontInfo {

app/src/settings/import/model.rs

@@ -1,21 +1,17 @@
 use std::collections::HashMap;
 
-use crate::interval_timer::IntervalTimer;
-use crate::settings::import::config::{Config, ConfigError};
-use crate::{send_telemetry_from_ctx, TelemetryEvent};
-
-use galaxy_core::features::FeatureFlag;
-use galaxyui::Entity;
-use galaxyui::ModelContext;
-use galaxyui::SingletonEntity;
 use serde::Serialize;
 use strum::IntoEnumIterator;
 use strum_macros::{EnumDiscriminants, EnumIter};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{Entity, ModelContext, SingletonEntity};
 
 #[cfg(target_os = "macos")]
 use super::config::HotkeyError;
-use super::config::SettingType;
-use super::config::ThemeType;
+use super::config::{SettingType, ThemeType};
+use crate::interval_timer::IntervalTimer;
+use crate::settings::import::config::{Config, ConfigError};
+use crate::{send_telemetry_from_ctx, TelemetryEvent};
 
 #[derive(Clone, Copy, Debug, EnumDiscriminants, Eq, Hash, PartialEq)]
 #[strum_discriminants(derive(EnumIter, Hash, Serialize))]
@@ -45,9 +41,9 @@ impl ImportedConfigModel {
 
     #[cfg(feature = "local_fs")]
     pub fn search_for_settings_to_import(&mut self, ctx: &mut ModelContext<Self>) {
-        use itertools::Itertools;
         use std::sync::Arc;
-        use strum::IntoEnumIterator;
+
+        use itertools::Itertools;
         self.started = true;
 
         let loaded_system_fonts = galaxyui::fonts::Cache::handle(ctx)

app/src/settings/import/view.rs

@@ -1,46 +1,37 @@
 use galaxy_core::{settings::Setting, ui::appearance::Appearance};
 use itertools::Itertools;
-
-use galaxyui::{
-    elements::{
-        Border, Container, CornerRadius, Flex, Hoverable, MainAxisAlignment, MainAxisSize,
-        MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
-    },
-    fonts::{Properties, Weight},
-    keymap::Keystroke,
-    ui_components::{
-        button::ButtonVariant,
-        components::{Coords, UiComponent, UiComponentStyles},
-        radio_buttons::{self, RadioButtonItem},
-    },
-    Element, Entity, ModelContext, ModelHandle, SingletonEntity, TypedActionView, View,
-    ViewContext,
+use galaxy_core::settings::Setting;
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::elements::{
+    Border, Container, CornerRadius, Flex, Hoverable, MainAxisAlignment, MainAxisSize,
+    MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
 };
-
-use galaxyui::ui_components::radio_buttons::RadioButtonStateHandle;
-
-use crate::{
-    report_if_error, send_telemetry_from_ctx,
-    settings::{
-        import::{
-            config::{Config, ParsedTerminalSetting, SettingType},
-            model::{ImportedConfigModel, TerminalTypeAndProfile},
-        },
-        AppEditorSettings, CursorBlink, FontSettings, GlobalHotkeyMode, SelectionSettings,
-        ThemeSettings,
-    },
-    terminal::{
-        alt_screen_reporting::AltScreenReporting, keys_settings::KeysSettings,
-        session_settings::SessionSettings,
-    },
-    themes::theme::{CustomTheme, SelectedSystemThemes, ThemeKind},
-    ui_components::blended_colors,
-    user_config::{self, GalaxyConfig},
-    window_settings::WindowSettings,
-    GlobalResourceHandlesProvider, TelemetryEvent,
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::keymap::Keystroke;
+use galaxyui::ui_components::button::ButtonVariant;
+use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
+use galaxyui::ui_components::radio_buttons::{self, RadioButtonItem, RadioButtonStateHandle};
+use galaxyui::{
+    Element, Entity, ModelContext, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
 };
 
 use super::config::{QuakeModeWindow, ThemeType};
+use crate::settings::import::config::{Config, ParsedTerminalSetting, SettingType};
+use crate::settings::import::model::{ImportedConfigModel, TerminalTypeAndProfile};
+use crate::settings::{
+    AppEditorSettings, CursorBlink, FontSettings, GlobalHotkeyMode, SelectionSettings,
+    ThemeSettings,
+};
+use crate::terminal::alt_screen_reporting::AltScreenReporting;
+use crate::terminal::keys_settings::KeysSettings;
+use crate::terminal::session_settings::SessionSettings;
+use crate::themes::theme::{CustomTheme, SelectedSystemThemes, ThemeKind};
+use crate::ui_components::blended_colors;
+use crate::user_config::{self, WarpConfig};
+use crate::window_settings::WindowSettings;
+use crate::{
+    report_if_error, send_telemetry_from_ctx, GlobalResourceHandlesProvider, TelemetryEvent,
+};
 
 // UI does not scale, so we set a fixed size for all text.
 const FONT_SIZE: f32 = 14.;