ui2: Reference `theme2` and `settings2` crates without the `2` (#3424)

Marshall Bowers created 2 years ago

This PR updates the `ui2` crate to reference the `theme2` and
`settings2` crates without the `2` the way we do in our other crates.

Release Notes:

- N/A

Change summary

crates/ui2/Cargo.toml                 | 4 ++--
crates/ui2/src/components/checkbox.rs | 3 +--
crates/ui2/src/components/popover.rs  | 4 ++--
crates/ui2/src/components/tooltip.rs  | 4 ++--
crates/ui2/src/prelude.rs             | 2 +-
crates/ui2/src/styled_ext.rs          | 2 +-
crates/ui2/src/styles/color.rs        | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)

Detailed changes

crates/ui2/Cargo.toml

@@ -15,11 +15,11 @@ gpui = { package = "gpui2", path = "../gpui2" }
 itertools = { version = "0.11.0", optional = true }
 menu = { package = "menu2", path = "../menu2"}
 serde.workspace = true
-settings2 = { path = "../settings2" }
+settings = { package = "settings2", path = "../settings2" }
 smallvec.workspace = true
 story = { path = "../story", optional = true }
 strum = { version = "0.25.0", features = ["derive"] }
-theme2 = { path = "../theme2" }
+theme = { package = "theme2", path = "../theme2" }
 rand = "0.8"
 
 [features]

crates/ui2/src/components/checkbox.rs

@@ -1,7 +1,6 @@
 use gpui::{div, prelude::*, Div, Element, ElementId, IntoElement, Styled, WindowContext};
 
-use theme2::ActiveTheme;
-
+use crate::prelude::*;
 use crate::{Color, Icon, IconElement, Selection};
 
 pub type CheckHandler = Box<dyn Fn(&Selection, &mut WindowContext) + 'static>;

crates/ui2/src/components/popover.rs

@@ -3,9 +3,9 @@ use gpui::{
     WindowContext,
 };
 use smallvec::SmallVec;
-use theme2::ActiveTheme;
 
-use crate::{v_stack, StyledExt};
+use crate::prelude::*;
+use crate::v_stack;
 
 /// A popover is used to display a menu or show some options.
 ///

crates/ui2/src/components/tooltip.rs

@@ -1,6 +1,6 @@
 use gpui::{overlay, Action, AnyView, IntoElement, Overlay, Render, VisualContext};
-use settings2::Settings;
-use theme2::{ActiveTheme, ThemeSettings};
+use settings::Settings;
+use theme::ThemeSettings;
 
 use crate::prelude::*;
 use crate::{h_stack, v_stack, Color, KeyBinding, Label, LabelSize, StyledExt};

crates/ui2/src/prelude.rs

@@ -5,7 +5,7 @@ pub use gpui::{
 
 pub use crate::StyledExt;
 pub use crate::{ButtonVariant, Color};
-pub use theme2::ActiveTheme;
+pub use theme::ActiveTheme;
 
 use strum::EnumIter;
 

crates/ui2/src/styled_ext.rs

@@ -1,6 +1,6 @@
 use gpui::{px, Styled, WindowContext};
-use theme2::ActiveTheme;
 
+use crate::prelude::*;
 use crate::{ElevationIndex, UITextSize};
 
 fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E {

crates/ui2/src/styles/color.rs

@@ -1,5 +1,5 @@
 use gpui::{Hsla, WindowContext};
-use theme2::ActiveTheme;
+use theme::ActiveTheme;
 
 #[derive(Default, PartialEq, Copy, Clone)]
 pub enum Color {