fix: rename tui to ratataui

tari-project · Aug 21, 2023 · 33e3f84 · 33e3f84
1 parent d1dc378
commit 33e3f84
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 48 deletions.
diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -62,8 +62,7 @@ path = "../../base_layer/core"
 default-features = false
 features = ["transactions", "mempool_proto", "base_node_proto"]
 
-[dependencies.tui]
-package = "ratatui"
+[dependencies.ratatui]
 version = "^0.22"
 default-features = false
 features = ["crossterm"]

diff --git a/applications/minotari_console_wallet/src/ui/app.rs b/applications/minotari_console_wallet/src/ui/app.rs
@@ -21,13 +21,13 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use minotari_wallet::{util::wallet_identity::WalletIdentity, WalletConfig, WalletSqlite};
-use tari_comms::peer_manager::Peer;
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout},
     Frame,
 };
+use tari_comms::peer_manager::Peer;
+use tokio::runtime::Handle;
 
 use crate::{
     notifier::Notifier,

diff --git a/applications/minotari_console_wallet/src/ui/components/balance.rs b/applications/minotari_console_wallet/src/ui/components/balance.rs
@@ -1,15 +1,15 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tari_core::transactions::tari_amount::MicroMinotari;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Paragraph},
     Frame,
 };
+use tari_core::transactions::tari_amount::MicroMinotari;
 
 use crate::ui::{components::Component, state::AppState};
 

diff --git a/applications/minotari_console_wallet/src/ui/components/base_node.rs b/applications/minotari_console_wallet/src/ui/components/base_node.rs
@@ -21,7 +21,7 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use minotari_wallet::connectivity_service::{OnlineStatus, WalletConnectivityInterface};
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Style},

diff --git a/applications/minotari_console_wallet/src/ui/components/burn_tab.rs b/applications/minotari_console_wallet/src/ui/components/burn_tab.rs
@@ -5,16 +5,16 @@ use std::fs;
 
 use log::*;
 use minotari_wallet::output_manager_service::UtxoSelectionCriteria;
-use tari_core::transactions::tari_amount::MicroMinotari;
-use tokio::{runtime::Handle, sync::watch};
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, ListItem, Paragraph, Wrap},
     Frame,
 };
+use tari_core::transactions::tari_amount::MicroMinotari;
+use tokio::{runtime::Handle, sync::watch};
 use unicode_width::UnicodeWidthStr;
 
 use crate::ui::{

diff --git a/applications/minotari_console_wallet/src/ui/components/component.rs b/applications/minotari_console_wallet/src/ui/components/component.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::Rect,
     style::{Color, Style},

diff --git a/applications/minotari_console_wallet/src/ui/components/contacts_tab.rs b/applications/minotari_console_wallet/src/ui/components/contacts_tab.rs
@@ -1,15 +1,15 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Clear, ListItem, Paragraph, Wrap},
     Frame,
 };
+use tokio::runtime::Handle;
 use unicode_width::UnicodeWidthStr;
 
 use crate::{

diff --git a/applications/minotari_console_wallet/src/ui/components/events_component.rs b/applications/minotari_console_wallet/src/ui/components/events_component.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Rect},
     widgets::{Block, Borders, Row, Table, TableState},

diff --git a/applications/minotari_console_wallet/src/ui/components/log_tab.rs b/applications/minotari_console_wallet/src/ui/components/log_tab.rs
@@ -3,15 +3,15 @@
 
 use std::fs;
 
-use regex::Regex;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Paragraph, Wrap},
     Frame,
 };
+use regex::Regex;
 
 use crate::ui::{components::Component, state::AppState};
 

diff --git a/applications/minotari_console_wallet/src/ui/components/menu.rs b/applications/minotari_console_wallet/src/ui/components/menu.rs
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 use minotari_app_utilities::consts;
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Style},
     text::{Line, Span},
     widgets::{Block, Paragraph},
     Frame,
 };
+use tokio::runtime::Handle;
 
 use crate::ui::{components::Component, state::AppState};
 

diff --git a/applications/minotari_console_wallet/src/ui/components/network_tab.rs b/applications/minotari_console_wallet/src/ui/components/network_tab.rs
@@ -4,17 +4,17 @@
 use std::collections::HashMap;
 
 use log::*;
-use tari_comms::peer_manager::Peer;
-use tari_utilities::hex::Hex;
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, ListItem, ListState, Paragraph, Wrap},
     Frame,
 };
+use tari_comms::peer_manager::Peer;
+use tari_utilities::hex::Hex;
+use tokio::runtime::Handle;
 
 use crate::{
     ui::{

diff --git a/applications/minotari_console_wallet/src/ui/components/notification_tab.rs b/applications/minotari_console_wallet/src/ui/components/notification_tab.rs
@@ -8,15 +8,15 @@
 // Currently notifications are only added from the wallet_event_monitor which has
 // add_notification method.
 
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Paragraph, Wrap},
     Frame,
 };
+use tokio::runtime::Handle;
 
 use crate::ui::{components::Component, state::AppState};
 

diff --git a/applications/minotari_console_wallet/src/ui/components/receive_tab.rs b/applications/minotari_console_wallet/src/ui/components/receive_tab.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},

diff --git a/applications/minotari_console_wallet/src/ui/components/register_template_tab.rs b/applications/minotari_console_wallet/src/ui/components/register_template_tab.rs
@@ -7,6 +7,14 @@ use blake2::Blake2b;
 use digest::{consts::U32, Digest};
 use log::*;
 use minotari_wallet::output_manager_service::UtxoSelectionCriteria;
+use ratatui::{
+    backend::Backend,
+    layout::{Constraint, Direction, Layout, Rect},
+    style::{Color, Modifier, Style},
+    text::{Line, Span},
+    widgets::{Block, Borders, Paragraph, Wrap},
+    Frame,
+};
 use regex::Regex;
 use reqwest::StatusCode;
 use tari_core::transactions::{tari_amount::MicroMinotari, transaction_components::TemplateType};
@@ -16,14 +24,6 @@ use tokio::{
     runtime::{Handle, Runtime},
     sync::watch,
 };
-use tui::{
-    backend::Backend,
-    layout::{Constraint, Direction, Layout, Rect},
-    style::{Color, Modifier, Style},
-    text::{Line, Span},
-    widgets::{Block, Borders, Paragraph, Wrap},
-    Frame,
-};
 use unicode_width::UnicodeWidthStr;
 use url::Url;
 

diff --git a/applications/minotari_console_wallet/src/ui/components/send_tab.rs b/applications/minotari_console_wallet/src/ui/components/send_tab.rs
@@ -3,17 +3,17 @@
 
 use log::*;
 use minotari_wallet::output_manager_service::UtxoSelectionCriteria;
-use tari_core::transactions::tari_amount::MicroMinotari;
-use tari_utilities::hex::Hex;
-use tokio::{runtime::Handle, sync::watch};
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Paragraph, TableState, Wrap},
     Frame,
 };
+use tari_core::transactions::tari_amount::MicroMinotari;
+use tari_utilities::hex::Hex;
+use tokio::{runtime::Handle, sync::watch};
 use unicode_width::UnicodeWidthStr;
 
 use crate::ui::{

diff --git a/applications/minotari_console_wallet/src/ui/components/styles.rs b/applications/minotari_console_wallet/src/ui/components/styles.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-use tui::style::{Color, Modifier, Style};
+use ratatui::style::{Color, Modifier, Style};
 
 pub fn header_row() -> Style {
     Style::default().fg(Color::Magenta)

diff --git a/applications/minotari_console_wallet/src/ui/components/tabs_container.rs b/applications/minotari_console_wallet/src/ui/components/tabs_container.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::Rect,
     style::{Color, Modifier, Style},

diff --git a/applications/minotari_console_wallet/src/ui/components/transactions_tab.rs b/applications/minotari_console_wallet/src/ui/components/transactions_tab.rs
@@ -6,16 +6,16 @@ use std::collections::HashMap;
 use chrono::{DateTime, Local};
 use log::*;
 use minotari_wallet::transaction_service::storage::models::TxCancellationReason;
-use tari_common_types::transaction::{TransactionDirection, TransactionStatus};
-use tokio::runtime::Handle;
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, ListItem, Paragraph, Wrap},
     Frame,
 };
+use tari_common_types::transaction::{TransactionDirection, TransactionStatus};
+use tokio::runtime::Handle;
 
 use crate::ui::{
     components::{balance::Balance, styles, Component},

diff --git a/applications/minotari_console_wallet/src/ui/mod.rs b/applications/minotari_console_wallet/src/ui/mod.rs
@@ -43,8 +43,8 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use log::*;
+use ratatui::{backend::CrosstermBackend, Terminal};
 use tokio::runtime::Handle;
-use tui::{backend::CrosstermBackend, Terminal};
 use ui_error::UiError;
 
 use crate::utils::events::{Event, EventStream};

diff --git a/applications/minotari_console_wallet/src/ui/widgets/list_state.rs b/applications/minotari_console_wallet/src/ui/widgets/list_state.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tui::widgets::ListState;
+use ratatui::widgets::ListState;
 #[derive(Debug)]
 pub struct WindowedListState {
     offset: usize,

diff --git a/applications/minotari_console_wallet/src/ui/widgets/multi_column_list.rs b/applications/minotari_console_wallet/src/ui/widgets/multi_column_list.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::Style,

diff --git a/applications/minotari_console_wallet/src/ui/widgets/utilities.rs b/applications/minotari_console_wallet/src/ui/widgets/utilities.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},

diff --git a/applications/minotari_console_wallet/src/wallet_modes.rs b/applications/minotari_console_wallet/src/wallet_modes.rs
@@ -29,12 +29,12 @@ use log::*;
 use minotari_app_grpc::authentication::ServerAuthenticationInterceptor;
 use minotari_wallet::{WalletConfig, WalletSqlite};
 use rand::{rngs::OsRng, seq::SliceRandom};
+use ratatui::backend::CrosstermBackend;
 use tari_common::exit_codes::{ExitCode, ExitError};
 use tari_common_types::grpc_authentication::GrpcAuthentication;
 use tari_comms::{multiaddr::Multiaddr, peer_manager::Peer, utils::multiaddr::multiaddr_to_socketaddr};
 use tokio::{runtime::Handle, sync::broadcast};
 use tonic::transport::Server;
-use tui::backend::CrosstermBackend;
 
 use crate::{
     automation::commands::command_runner,