From fa91515a61c9f779343ead52251e13ee6cc28e37 Mon Sep 17 00:00:00 2001 From: Joscha Date: Wed, 10 Aug 2022 22:35:22 +0200 Subject: [PATCH] Move euph room ui to new euph module --- src/ui.rs | 2 +- src/ui/euph.rs | 1 + src/ui/{ => euph}/room.rs | 29 ++++++++++++++--------------- src/ui/rooms.rs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 src/ui/euph.rs rename src/ui/{ => euph}/room.rs (95%) diff --git a/src/ui.rs b/src/ui.rs index b428cb7..f8c16b0 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1,6 +1,6 @@ mod chat; +mod euph; mod input; -mod room; mod rooms; mod util; mod widgets; diff --git a/src/ui/euph.rs b/src/ui/euph.rs new file mode 100644 index 0000000..addf7a5 --- /dev/null +++ b/src/ui/euph.rs @@ -0,0 +1 @@ +pub mod room; diff --git a/src/ui/room.rs b/src/ui/euph/room.rs similarity index 95% rename from src/ui/room.rs rename to src/ui/euph/room.rs index 65619d5..c68cade 100644 --- a/src/ui/room.rs +++ b/src/ui/euph/room.rs @@ -12,23 +12,22 @@ use toss::terminal::Terminal; use crate::euph::api::{SessionType, SessionView, Snowflake}; use crate::euph::{self, Joined, Status}; use crate::store::MsgStore; +use crate::ui::chat::{ChatState, Reaction}; +use crate::ui::input::{key, KeyBindingsList, KeyEvent}; +use crate::ui::widgets::background::Background; +use crate::ui::widgets::border::Border; +use crate::ui::widgets::editor::EditorState; +use crate::ui::widgets::empty::Empty; +use crate::ui::widgets::float::Float; +use crate::ui::widgets::join::{HJoin, Segment, VJoin}; +use crate::ui::widgets::layer::Layer; +use crate::ui::widgets::list::{List, ListState}; +use crate::ui::widgets::padding::Padding; +use crate::ui::widgets::text::Text; +use crate::ui::widgets::BoxedWidget; +use crate::ui::{util, UiEvent}; use crate::vault::EuphVault; -use super::chat::{ChatState, Reaction}; -use super::input::{key, KeyBindingsList, KeyEvent}; -use super::widgets::background::Background; -use super::widgets::border::Border; -use super::widgets::editor::EditorState; -use super::widgets::empty::Empty; -use super::widgets::float::Float; -use super::widgets::join::{HJoin, Segment, VJoin}; -use super::widgets::layer::Layer; -use super::widgets::list::{List, ListState}; -use super::widgets::padding::Padding; -use super::widgets::text::Text; -use super::widgets::BoxedWidget; -use super::{util, UiEvent}; - enum State { Normal, ChooseNick(EditorState), diff --git a/src/ui/rooms.rs b/src/ui/rooms.rs index 574f544..672cb6f 100644 --- a/src/ui/rooms.rs +++ b/src/ui/rooms.rs @@ -13,8 +13,8 @@ use crate::euph::api::SessionType; use crate::euph::{Joined, Status}; use crate::vault::Vault; +use super::euph::room::EuphRoom; use super::input::{key, KeyBindingsList, KeyEvent}; -use super::room::EuphRoom; use super::widgets::background::Background; use super::widgets::border::Border; use super::widgets::editor::EditorState;