refactor: Move src/widgets/*_switcher.* to src/widgets/switchers/, …

…Close #54

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "desktop"
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 
 [[bin]]

src/views/body.rs

@@ -25,8 +25,9 @@ use crate::styles::constants::{FONT_SIZE_SMALLER, ICON_FONT_SIZE_TOOLBAR, SPACIN
 use crate::views::detail::inspect::{self, Information};
 use crate::views::detail::logs::{self, Logs};
 use crate::views::detail::stats::{self, Stats};
+use crate::widgets::switchers::CharacterSwitcher;
 use crate::widgets::tabs::Tab;
-use crate::widgets::{Button, CharacterSwitcher, Column, Container, Element, Row, Tabs, Text};
+use crate::widgets::{Button, Column, Container, Element, Row, Tabs, Text};
 
 // #[derive(Default)]
 pub struct Body {

src/views/sidebar.rs

@@ -32,6 +32,8 @@ use crate::utils::connection_status::ConnectionStatus;
 use crate::widgets::lists::PlaybookItem;
 use crate::widgets::*;
 
+use crate::widgets::switchers::ContextSwitcher;
+
 use super::compose::{self, Compose};
 
 pub struct Sidebar {

src/widgets/mod.rs

@@ -14,14 +14,9 @@
 
 pub mod empty;
 pub mod lists;
+pub mod switchers;
 pub mod tabs;
 
-mod context_switcher;
-pub use context_switcher::ContextSwitcher;
-
-mod character_switcher;
-pub use character_switcher::CharacterSwitcher;
-
 use crate::styles::Theme;
 
 pub type Element<'a, Message> = iced::Element<'a, Message, Theme>;

src/widgets/character_switcher.rs → src/widgets/switchers/character_switcher.rs

@@ -11,7 +11,7 @@
 
 use crate::{
     styles::{self, constants::ICON_FONT_SIZE_TOOLBAR, Theme},
-    widgets::Button,
+    widgets::{Button, Container, Element, Text},
 };
 use amp_common::resource::CharacterSpec;
 use iced::{widget::Component, Length};
@@ -21,8 +21,6 @@ use iced_aw::{
 };
 use tracing::debug;
 
-use super::{Container, Element, Text};
-
 #[derive(Default)]
 pub struct CharacterSwitcher<Message> {
     current: CharacterSpec,

src/widgets/context_switcher.rs → src/widgets/switchers/context_switcher.rs

@@ -13,7 +13,7 @@ use std::collections::HashMap;
 
 use crate::{
     styles::{self, Theme},
-    widgets::Button,
+    widgets::{Button, Column, Container, Element, Row, Text},
 };
 use amp_common::config::Cluster;
 use iced::{widget::Component, Alignment, Length};
@@ -25,8 +25,6 @@ use tracing::debug;
 
 use crate::utils::connection_status::ConnectionStatus;
 
-use super::{Column, Container, Element, Row, Text};
-
 #[derive(Default)]
 pub struct ContextSwitcher<Message> {
     name: String,

src/widgets/switchers/mod.rs

@@ -0,0 +1,16 @@
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod context_switcher;
+pub use context_switcher::ContextSwitcher;
+
+mod character_switcher;
+pub use character_switcher::CharacterSwitcher;