From 7e4139fcd4e68b008549bf3c92018377bcf0c3fb Mon Sep 17 00:00:00 2001
From: ClementTsang <cjhtsang@uwaterloo.ca>
Date: Sat, 18 Dec 2021 22:25:42 -0500
Subject: [PATCH] temp 2

---
 src/app.rs                                             | 10 +++++-----
 src/bin/main.rs                                        |  4 ++--
 src/lib.rs                                             |  4 ++--
 src/tuice/component/properties.rs                      |  3 ---
 src/{tuice => tuine}/application.rs                    |  2 +-
 src/{tuice => tuine}/component.rs                      |  3 ---
 src/{tuice => tuine}/component/base/block.rs           |  2 +-
 src/{tuice => tuine}/component/base/carousel.rs        |  2 +-
 src/{tuice => tuine}/component/base/container.rs       |  2 +-
 src/{tuice => tuine}/component/base/flex.rs            |  8 ++------
 .../component/base/flex/flex_element.rs                |  2 +-
 src/{tuice => tuine}/component/base/mod.rs             |  0
 src/{tuice => tuine}/component/base/shortcut.rs        |  2 +-
 src/{tuice => tuine}/component/base/text_table.rs      |  4 ++--
 .../component/base/text_table/table_column.rs          |  0
 .../component/base/text_table/table_scroll_state.rs    |  4 ++--
 src/{tuice => tuine}/component/widget/mod.rs           |  0
 src/{tuice => tuine}/context.rs                        |  0
 src/{tuice => tuine}/element.rs                        |  0
 src/{tuice => tuine}/event.rs                          |  0
 src/{tuice => tuine}/key.rs                            |  0
 src/{tuice => tuine}/layout/bounds.rs                  |  2 +-
 src/{tuice => tuine}/layout/build_layout.rs            |  2 +-
 src/{tuice => tuine}/layout/layout_node.rs             |  0
 src/{tuice => tuine}/layout/mod.rs                     |  0
 src/{tuice => tuine}/layout/size.rs                    |  0
 src/{tuice => tuine}/mod.rs                            |  4 ++--
 src/{tuice => tuine}/runtime.rs                        |  2 +-
 src/{tuice => tuine}/screen.rs                         |  0
 src/{tuice => tuine}/state.rs                          |  2 +-
 src/{tuice => tuine}/tui_rs/block_builder.rs           |  0
 src/{tuice => tuine}/tui_rs/custom_legend_chart.rs     |  0
 src/{tuice => tuine}/tui_rs/mod.rs                     |  0
 src/{tuice => tuine}/tui_rs/pipe_gauge.rs              |  0
 34 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 src/tuice/component/properties.rs
 rename src/{tuice => tuine}/application.rs (95%)
 rename src/{tuice => tuine}/component.rs (96%)
 rename src/{tuice => tuine}/component/base/block.rs (86%)
 rename src/{tuice => tuine}/component/base/carousel.rs (86%)
 rename src/{tuice => tuine}/component/base/container.rs (97%)
 rename src/{tuice => tuine}/component/base/flex.rs (96%)
 rename src/{tuice => tuine}/component/base/flex/flex_element.rs (97%)
 rename src/{tuice => tuine}/component/base/mod.rs (100%)
 rename src/{tuice => tuine}/component/base/shortcut.rs (90%)
 rename src/{tuice => tuine}/component/base/text_table.rs (98%)
 rename src/{tuice => tuine}/component/base/text_table/table_column.rs (100%)
 rename src/{tuice => tuine}/component/base/text_table/table_scroll_state.rs (99%)
 rename src/{tuice => tuine}/component/widget/mod.rs (100%)
 rename src/{tuice => tuine}/context.rs (100%)
 rename src/{tuice => tuine}/element.rs (100%)
 rename src/{tuice => tuine}/event.rs (100%)
 rename src/{tuice => tuine}/key.rs (100%)
 rename src/{tuice => tuine}/layout/bounds.rs (98%)
 rename src/{tuice => tuine}/layout/build_layout.rs (86%)
 rename src/{tuice => tuine}/layout/layout_node.rs (100%)
 rename src/{tuice => tuine}/layout/mod.rs (100%)
 rename src/{tuice => tuine}/layout/size.rs (100%)
 rename src/{tuice => tuine}/mod.rs (80%)
 rename src/{tuice => tuine}/runtime.rs (98%)
 rename src/{tuice => tuine}/screen.rs (100%)
 rename src/{tuice => tuine}/state.rs (90%)
 rename src/{tuice => tuine}/tui_rs/block_builder.rs (100%)
 rename src/{tuice => tuine}/tui_rs/custom_legend_chart.rs (100%)
 rename src/{tuice => tuine}/tui_rs/mod.rs (100%)
 rename src/{tuice => tuine}/tui_rs/pipe_gauge.rs (100%)

diff --git a/src/app.rs b/src/app.rs
index 635cb544..6f244b72 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -29,7 +29,7 @@ use frozen_state::FrozenState;
 use crate::{
     canvas::Painter,
     constants,
-    tuice::{Application, Element, Flex},
+    tuine::{Application, Element, Flex},
     units::data_units::DataUnit,
     Pid,
 };
@@ -235,8 +235,8 @@ impl Application for AppState {
     }
 
     fn view(&mut self) -> Element<'static, Self::Message> {
-        use crate::tuice::FlexElement;
-        use crate::tuice::TextTable;
+        use crate::tuine::FlexElement;
+        use crate::tuine::TextTable;
 
         Flex::column()
             .with_flex_child(
@@ -261,9 +261,9 @@ impl Application for AppState {
     }
 
     fn global_event_handler(
-        &mut self, event: crate::tuice::Event, _messages: &mut Vec<Self::Message>,
+        &mut self, event: crate::tuine::Event, _messages: &mut Vec<Self::Message>,
     ) {
-        use crate::tuice::Event;
+        use crate::tuine::Event;
         match event {
             Event::Keyboard(_) => {}
             Event::Mouse(_) => {}
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 3fcc9ce5..2676ff7a 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate log;
 
-use bottom::{app::AppMessages, options::*, tuice::RuntimeEvent, *};
+use bottom::{app::AppMessages, options::*, tuine::RuntimeEvent, *};
 
 use std::{
     boxed::Box,
@@ -102,7 +102,7 @@ fn main() -> Result<()> {
     // TODO: [Threads, Panic] Make this close all the child threads too!
     panic::set_hook(Box::new(|info| panic_hook(info)));
 
-    tuice::launch_with_application(app, receiver, &mut terminal)?; // FIXME: Move terminal construction INSIDE
+    tuine::launch_with_application(app, receiver, &mut terminal)?; // FIXME: Move terminal construction INSIDE
 
     // I think doing it in this order is safe...
     *thread_termination_lock.lock().unwrap() = true;
diff --git a/src/lib.rs b/src/lib.rs
index d0047f47..1c433b78 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -29,7 +29,7 @@ use crossterm::{
 use app::{data_harvester, AppMessages, UsedWidgets};
 use constants::*;
 use options::*;
-use tuice::{Event, RuntimeEvent};
+use tuine::{Event, RuntimeEvent};
 use utils::error;
 
 pub mod app;
@@ -43,7 +43,7 @@ pub mod clap;
 pub mod constants;
 pub mod data_conversion;
 pub mod options;
-pub mod tuice;
+pub mod tuine;
 pub(crate) mod units;
 
 // FIXME: Use newtype pattern for PID
diff --git a/src/tuice/component/properties.rs b/src/tuice/component/properties.rs
deleted file mode 100644
index d44ab368..00000000
--- a/src/tuice/component/properties.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-/// A trait that the properties of a [`Component`](super::Component)
-/// should implement.
-pub trait Properties: PartialEq {}
diff --git a/src/tuice/application.rs b/src/tuine/application.rs
similarity index 95%
rename from src/tuice/application.rs
rename to src/tuine/application.rs
index 540c8a3c..85051e2d 100644
--- a/src/tuice/application.rs
+++ b/src/tuine/application.rs
@@ -34,7 +34,7 @@ pub trait Application: Sized {
     fn global_event_handler(&mut self, event: Event, messages: &mut Vec<Self::Message>) {}
 }
 
-/// Launches some application with tuice. Note this will take over the calling thread.
+/// Launches some application with tuine. Note this will take over the calling thread.
 pub fn launch_with_application<A, B>(
     application: A, receiver: Receiver<RuntimeEvent<A::Message>>, terminal: &mut Terminal<B>,
 ) -> anyhow::Result<()>
diff --git a/src/tuice/component.rs b/src/tuine/component.rs
similarity index 96%
rename from src/tuice/component.rs
rename to src/tuine/component.rs
index 753f36ba..42cc7d53 100644
--- a/src/tuice/component.rs
+++ b/src/tuine/component.rs
@@ -4,9 +4,6 @@ pub use base::*;
 pub mod widget;
 pub use widget::*;
 
-pub mod properties;
-pub use properties::*;
-
 use enum_dispatch::enum_dispatch;
 use tui::{layout::Rect, Frame};
 
diff --git a/src/tuice/component/base/block.rs b/src/tuine/component/base/block.rs
similarity index 86%
rename from src/tuice/component/base/block.rs
rename to src/tuine/component/base/block.rs
index d1a7e2b9..209dadf5 100644
--- a/src/tuice/component/base/block.rs
+++ b/src/tuine/component/base/block.rs
@@ -1,6 +1,6 @@
 use tui::{backend::Backend, layout::Rect, Frame};
 
-use crate::tuice::{DrawContext, Event, Status, TmpComponent};
+use crate::tuine::{DrawContext, Event, Status, TmpComponent};
 
 pub struct Block {}
 
diff --git a/src/tuice/component/base/carousel.rs b/src/tuine/component/base/carousel.rs
similarity index 86%
rename from src/tuice/component/base/carousel.rs
rename to src/tuine/component/base/carousel.rs
index 2790e372..a129681f 100644
--- a/src/tuice/component/base/carousel.rs
+++ b/src/tuine/component/base/carousel.rs
@@ -1,6 +1,6 @@
 use tui::{backend::Backend, layout::Rect, Frame};
 
-use crate::tuice::{DrawContext, Event, Status, TmpComponent};
+use crate::tuine::{DrawContext, Event, Status, TmpComponent};
 
 pub struct Carousel {}
 
diff --git a/src/tuice/component/base/container.rs b/src/tuine/component/base/container.rs
similarity index 97%
rename from src/tuice/component/base/container.rs
rename to src/tuine/component/base/container.rs
index f30937ca..82c3cd3e 100644
--- a/src/tuice/component/base/container.rs
+++ b/src/tuine/component/base/container.rs
@@ -1,6 +1,6 @@
 use tui::{backend::Backend, layout::Rect, Frame};
 
-use crate::tuice::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
+use crate::tuine::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
 
 /// A [`Container`] just contains a child, as well as being able to be sized.
 ///
diff --git a/src/tuice/component/base/flex.rs b/src/tuine/component/base/flex.rs
similarity index 96%
rename from src/tuice/component/base/flex.rs
rename to src/tuine/component/base/flex.rs
index 1aefca0e..608d75d5 100644
--- a/src/tuice/component/base/flex.rs
+++ b/src/tuine/component/base/flex.rs
@@ -3,7 +3,7 @@ use tui::{backend::Backend, layout::Rect, Frame};
 pub mod flex_element;
 pub use flex_element::FlexElement;
 
-use crate::tuice::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
+use crate::tuine::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
 
 #[derive(Clone, Copy, Debug)]
 pub enum Axis {
@@ -99,11 +99,7 @@ impl<'a, Message> TmpComponent<Message> for Flex<'a, Message> {
     }
 
     fn on_event(&mut self, area: Rect, event: Event, messages: &mut Vec<Message>) -> Status {
-        // for child in self.children.iter_mut() {
-        //     if let Status::Captured = child.on_event() {
-        //         return Status::Captured;
-        //     }
-        // }
+        // FIXME: On event for flex
 
         Status::Ignored
     }
diff --git a/src/tuice/component/base/flex/flex_element.rs b/src/tuine/component/base/flex/flex_element.rs
similarity index 97%
rename from src/tuice/component/base/flex/flex_element.rs
rename to src/tuine/component/base/flex/flex_element.rs
index 43982f56..4972a351 100644
--- a/src/tuice/component/base/flex/flex_element.rs
+++ b/src/tuine/component/base/flex/flex_element.rs
@@ -1,6 +1,6 @@
 use tui::{backend::Backend, layout::Rect, Frame};
 
-use crate::tuice::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
+use crate::tuine::{Bounds, DrawContext, Element, Event, LayoutNode, Size, Status, TmpComponent};
 
 use super::Axis;
 
diff --git a/src/tuice/component/base/mod.rs b/src/tuine/component/base/mod.rs
similarity index 100%
rename from src/tuice/component/base/mod.rs
rename to src/tuine/component/base/mod.rs
diff --git a/src/tuice/component/base/shortcut.rs b/src/tuine/component/base/shortcut.rs
similarity index 90%
rename from src/tuice/component/base/shortcut.rs
rename to src/tuine/component/base/shortcut.rs
index 661c45d7..cb93b00f 100644
--- a/src/tuice/component/base/shortcut.rs
+++ b/src/tuine/component/base/shortcut.rs
@@ -1,6 +1,6 @@
 use tui::{backend::Backend, layout::Rect, Frame};
 
-use crate::tuice::{DrawContext, Event, Status, TmpComponent};
+use crate::tuine::{DrawContext, Event, Status, TmpComponent};
 
 /// A [`Component`] to handle keyboard shortcuts and assign actions to them.
 ///
diff --git a/src/tuice/component/base/text_table.rs b/src/tuine/component/base/text_table.rs
similarity index 98%
rename from src/tuice/component/base/text_table.rs
rename to src/tuine/component/base/text_table.rs
index b6d04a77..a1f830a9 100644
--- a/src/tuice/component/base/text_table.rs
+++ b/src/tuine/component/base/text_table.rs
@@ -14,7 +14,7 @@ use unicode_segmentation::UnicodeSegmentation;
 
 use crate::{
     constants::TABLE_GAP_HEIGHT_LIMIT,
-    tuice::{DrawContext, Event, Status, TmpComponent},
+    tuine::{DrawContext, Event, Status, TmpComponent},
 };
 
 pub use self::table_column::{TextColumn, TextColumnConstraint};
@@ -220,7 +220,7 @@ impl<'a, Message> TmpComponent<Message> for TextTable<'a, Message> {
     }
 
     fn on_event(&mut self, area: Rect, event: Event, messages: &mut Vec<Message>) -> Status {
-        use crate::tuice::MouseBoundIntersect;
+        use crate::tuine::MouseBoundIntersect;
         use crossterm::event::{MouseButton, MouseEventKind};
 
         match event {
diff --git a/src/tuice/component/base/text_table/table_column.rs b/src/tuine/component/base/text_table/table_column.rs
similarity index 100%
rename from src/tuice/component/base/text_table/table_column.rs
rename to src/tuine/component/base/text_table/table_column.rs
diff --git a/src/tuice/component/base/text_table/table_scroll_state.rs b/src/tuine/component/base/text_table/table_scroll_state.rs
similarity index 99%
rename from src/tuice/component/base/text_table/table_scroll_state.rs
rename to src/tuine/component/base/text_table/table_scroll_state.rs
index 729859b1..695b7853 100644
--- a/src/tuice/component/base/text_table/table_scroll_state.rs
+++ b/src/tuine/component/base/text_table/table_scroll_state.rs
@@ -1,7 +1,7 @@
 use std::cmp::{min, Ordering};
 use tui::{layout::Rect, widgets::TableState};
 
-use crate::tuice::Status;
+use crate::tuine::Status;
 
 #[derive(Debug, PartialEq, Eq)]
 enum ScrollDirection {
@@ -197,7 +197,7 @@ impl ScrollState {
 mod test {
     use tui::layout::Rect;
 
-    use crate::tuice::{text_table::table_scroll_state::ScrollDirection, Status};
+    use crate::tuine::{text_table::table_scroll_state::ScrollDirection, Status};
 
     use super::ScrollState;
 
diff --git a/src/tuice/component/widget/mod.rs b/src/tuine/component/widget/mod.rs
similarity index 100%
rename from src/tuice/component/widget/mod.rs
rename to src/tuine/component/widget/mod.rs
diff --git a/src/tuice/context.rs b/src/tuine/context.rs
similarity index 100%
rename from src/tuice/context.rs
rename to src/tuine/context.rs
diff --git a/src/tuice/element.rs b/src/tuine/element.rs
similarity index 100%
rename from src/tuice/element.rs
rename to src/tuine/element.rs
diff --git a/src/tuice/event.rs b/src/tuine/event.rs
similarity index 100%
rename from src/tuice/event.rs
rename to src/tuine/event.rs
diff --git a/src/tuice/key.rs b/src/tuine/key.rs
similarity index 100%
rename from src/tuice/key.rs
rename to src/tuine/key.rs
diff --git a/src/tuice/layout/bounds.rs b/src/tuine/layout/bounds.rs
similarity index 98%
rename from src/tuice/layout/bounds.rs
rename to src/tuine/layout/bounds.rs
index 581ef6c9..6d3a1a10 100644
--- a/src/tuice/layout/bounds.rs
+++ b/src/tuine/layout/bounds.rs
@@ -1,4 +1,4 @@
-use crate::tuice::Size;
+use crate::tuine::Size;
 
 /// [`Bounds`] represent minimal and maximal widths/height constraints while laying things out.
 ///
diff --git a/src/tuice/layout/build_layout.rs b/src/tuine/layout/build_layout.rs
similarity index 86%
rename from src/tuice/layout/build_layout.rs
rename to src/tuine/layout/build_layout.rs
index d9fdddae..a07cbc2d 100644
--- a/src/tuice/layout/build_layout.rs
+++ b/src/tuine/layout/build_layout.rs
@@ -1,6 +1,6 @@
 use tui::layout::Rect;
 
-use crate::tuice::{Bounds, Element, LayoutNode, TmpComponent};
+use crate::tuine::{Bounds, Element, LayoutNode, TmpComponent};
 
 pub fn build_layout_tree<Message>(rect: Rect, root: &Element<'_, Message>) -> LayoutNode {
     let mut root_layout_node = LayoutNode::from_rect(rect);
diff --git a/src/tuice/layout/layout_node.rs b/src/tuine/layout/layout_node.rs
similarity index 100%
rename from src/tuice/layout/layout_node.rs
rename to src/tuine/layout/layout_node.rs
diff --git a/src/tuice/layout/mod.rs b/src/tuine/layout/mod.rs
similarity index 100%
rename from src/tuice/layout/mod.rs
rename to src/tuine/layout/mod.rs
diff --git a/src/tuice/layout/size.rs b/src/tuine/layout/size.rs
similarity index 100%
rename from src/tuice/layout/size.rs
rename to src/tuine/layout/size.rs
diff --git a/src/tuice/mod.rs b/src/tuine/mod.rs
similarity index 80%
rename from src/tuice/mod.rs
rename to src/tuine/mod.rs
index ff5fe5b1..bf66ffc2 100644
--- a/src/tuice/mod.rs
+++ b/src/tuine/mod.rs
@@ -1,7 +1,7 @@
-//! tuice is a wrapper around tui-rs that expands upon state management and
+//! tuine is a wrapper around tui-rs that expands upon state management and
 //! event handling.
 //!
-//! tuice is inspired by a **ton** of other libraries and frameworks, like:
+//! tuine is inspired by a **ton** of other libraries and frameworks, like:
 //! - Iced
 //! - [crochet](https://github.com/raphlinus/crochet)
 //! - Flutter
diff --git a/src/tuice/runtime.rs b/src/tuine/runtime.rs
similarity index 98%
rename from src/tuice/runtime.rs
rename to src/tuine/runtime.rs
index 1666c21d..23d6361c 100644
--- a/src/tuice/runtime.rs
+++ b/src/tuine/runtime.rs
@@ -2,7 +2,7 @@ use std::sync::mpsc::Receiver;
 
 use tui::{backend::Backend, layout::Rect, Terminal};
 
-use crate::tuice::Status;
+use crate::tuine::Status;
 
 use super::{build_layout_tree, Application, Element, Event, TmpComponent};
 
diff --git a/src/tuice/screen.rs b/src/tuine/screen.rs
similarity index 100%
rename from src/tuice/screen.rs
rename to src/tuine/screen.rs
diff --git a/src/tuice/state.rs b/src/tuine/state.rs
similarity index 90%
rename from src/tuice/state.rs
rename to src/tuine/state.rs
index 144c129f..b60ebf17 100644
--- a/src/tuice/state.rs
+++ b/src/tuine/state.rs
@@ -3,7 +3,7 @@
 
 use std::any::Any;
 
-/// A trait that any sort of [`Component`](crate::tuice::Component) state should implement.
+/// A trait that any sort of [`Component`](crate::tuine::Component) state should implement.
 pub trait State {
     fn as_any(&self) -> &dyn Any;
 
diff --git a/src/tuice/tui_rs/block_builder.rs b/src/tuine/tui_rs/block_builder.rs
similarity index 100%
rename from src/tuice/tui_rs/block_builder.rs
rename to src/tuine/tui_rs/block_builder.rs
diff --git a/src/tuice/tui_rs/custom_legend_chart.rs b/src/tuine/tui_rs/custom_legend_chart.rs
similarity index 100%
rename from src/tuice/tui_rs/custom_legend_chart.rs
rename to src/tuine/tui_rs/custom_legend_chart.rs
diff --git a/src/tuice/tui_rs/mod.rs b/src/tuine/tui_rs/mod.rs
similarity index 100%
rename from src/tuice/tui_rs/mod.rs
rename to src/tuine/tui_rs/mod.rs
diff --git a/src/tuice/tui_rs/pipe_gauge.rs b/src/tuine/tui_rs/pipe_gauge.rs
similarity index 100%
rename from src/tuice/tui_rs/pipe_gauge.rs
rename to src/tuine/tui_rs/pipe_gauge.rs