Refactor some ui while upgrading tui partway.

Cargo.lock

@@ -24,12 +24,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -254,31 +248,6 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
-[[package]]
-name = "crossterm"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
-dependencies = [
- "bitflags 2.4.1",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crptls"
 version = "0.2.2"
@@ -294,18 +263,18 @@ dependencies = [
 
 [[package]]
 name = "cryptools"
-version = "0.12.6"
+version = "0.12.4"
 dependencies = [
  "chrono",
  "crptls",
  "csv",
  "dotenv",
- "ratatui",
  "rust_decimal",
  "rust_decimal_macros",
  "rustyline",
  "structopt",
- "termion",
+ "termion 2.0.1",
+ "tui",
 ]
 
 [[package]]
@@ -344,12 +313,6 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
 
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
 [[package]]
 name = "endian-type"
 version = "0.1.2"
@@ -422,16 +385,6 @@ dependencies = [
  "ahash 0.8.3",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
-dependencies = [
- "ahash 0.8.3",
- "allocator-api2",
-]
-
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -441,12 +394,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "hermit-abi"
 version = "0.1.17"
@@ -488,21 +435,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -530,16 +462,6 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.11"
@@ -549,33 +471,12 @@ dependencies = [
  "cfg-if 0.1.10",
 ]
 
-[[package]]
-name = "lru"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60"
-dependencies = [
- "hashbrown 0.14.2",
-]
-
 [[package]]
 name = "memchr"
 version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
-[[package]]
-name = "mio"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys",
-]
-
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
@@ -617,35 +518,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall 0.4.1",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -769,25 +641,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "ratatui"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425"
-dependencies = [
- "bitflags 2.4.1",
- "cassowary",
- "crossterm",
- "indoc",
- "itertools",
- "lru",
- "paste",
- "strum",
- "termion",
- "unicode-segmentation",
- "unicode-width",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -803,15 +656,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_termios"
 version = "0.1.1"
@@ -897,12 +741,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
 [[package]]
 name = "rustyline"
 version = "12.0.0"
@@ -975,36 +813,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "simdutf8"
 version = "0.1.4"
@@ -1045,34 +853,12 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
 dependencies = [
- "heck 0.3.1",
+ "heck",
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "syn 0.15.44",
 ]
 
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "rustversion",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "syn"
 version = "0.15.44"
@@ -1112,6 +898,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "termion"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905"
+dependencies = [
+ "libc",
+ "numtoa",
+ "redox_syscall 0.1.57",
+ "redox_termios",
+]
+
 [[package]]
 name = "termion"
 version = "2.0.1"
@@ -1175,6 +973,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tui"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9"
+dependencies = [
+ "bitflags 1.3.2",
+ "cassowary",
+ "termion 1.5.5",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -1183,9 +994,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
 
 [[package]]
 name = "unicode-width"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cryptools"
-version = "0.12.6"
+version = "0.12.4"
 authors = ["scoobybejesus <scoobybejesus@users.noreply.github.com>"]
 edition = "2021"
 description = "Command-line utility for processing cryptocurrency transactions into 'lots' and 'movements'."
@@ -10,7 +10,7 @@ description = "Command-line utility for processing cryptocurrency transactions i
 # but it is optional because Windows doesn't support it.
 default = ["print_menu"]
 
-print_menu = ["ratatui", "termion"]
+print_menu = ["tui", "termion"]
 
 [[bin]]
 name = "cryptools"
@@ -26,7 +26,7 @@ rust_decimal_macros = "1.32.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 structopt = "0.2.10"
 rustyline = "12.0.0"
-ratatui = { version = "0.24.0", optional = true, features = ['termion'] }
+tui = { version = "0.14", optional = true, features = ['termion'] }
 termion = { version = "2.0.1", optional = true }
 dotenv = "0.15.0"
 

src/mytui/app.rs

@@ -7,7 +7,7 @@ use std::collections::HashMap;
 use crptls::transaction::{Transaction, ActionRecord};
 use crptls::account::{Account, RawAccount};
 use crptls::core_functions::ImportProcessParameters;
-use ratatui::widgets::ListState;
+use tui::widgets::ListState;
 
 use crate::export::{export_csv, export_je, export_txt};
 

src/mytui/print_menu_tui.rs

@@ -6,8 +6,8 @@ use std::time::Duration;
 use std::collections::HashMap;
 use std::error::Error;
 
-use ratatui::Terminal;
+use tui::Terminal;
-use ratatui::backend::TermionBackend;
+use tui::backend::TermionBackend;
 use termion::raw::IntoRawMode;
 use termion::screen::IntoAlternateScreen;
 use termion::input::MouseTerminal;

src/mytui/ui.rs

@@ -1,57 +1,54 @@
 // Copyright (c) 2017-2023, scoobybejesus
 // Redistributions must include the license: https://github.com/scoobybejesus/cryptools/blob/master/LEGAL.txt
 
-use std::error::Error;
+use std::io;
 
-use ::ratatui::Terminal;
+use ::tui::Terminal;
-use ::ratatui::style::{Color, Modifier, Style};
+use ::tui::style::{Color, Modifier, Style};
-use ::ratatui::text::{Text, Span, Line};
+// use tui::widgets::ListState;
-use ratatui::widgets::{Wrap, ListItem};
+use ::tui::text::{Text, Span, Spans};
-use ::ratatui::widgets::{Block, Borders, Paragraph, List};
+use tui::widgets::{Wrap, ListItem};
-use ::ratatui::layout::{Layout, Constraint, Direction};
+use ::tui::widgets::{
-use ::ratatui::backend::Backend;
+    // Widget,
+    Block, Borders,
+    // SelectableList,
+    // Text,
+    Paragraph, List};
+use ::tui::layout::{Layout, Constraint, Direction};
+use ::tui::backend::Backend;
 
 use crate::mytui::app::{PrintWindow, REPORTS};
 
 
-pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Result<(), Box<dyn Error>> {
+pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Result<(), io::Error> {
 
     terminal.draw(|f| {
 
         let instructions = vec![
-            Line::from(vec![Span::raw("")]),
+            Spans::from(vec![Span::raw("")]),
-
+            Spans::from(vec![
-            Line::from(vec![
+                Span::raw("Press '"),
-                Span::raw("  Press '"),
                 Span::styled("x", Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD)),
                 Span::raw("' to add the selected report to the list of reports to print/export."),
             ]),
-
+            Spans::from(vec![
-            Line::from(vec![Span::raw("")]),
+                Span::raw("Press '"),
-            
-            Line::from(vec![
-                Span::raw("  Press '"),
                 Span::styled("d", Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD)),
                 Span::raw("' to delete the selected report from the list of reports to print/export."),
             ]),
-            
+            Spans::from(vec![
-            Line::from(vec![Span::raw("")]),
+                Span::raw("Press '"),
-            
-            Line::from(vec![
-                Span::raw("  Press '"),
                 Span::styled("p", Style::default().fg(Color::Green).add_modifier(Modifier::BOLD)),
                 Span::raw("' to print/export the selected reports."),
             ]),
-            
+            Spans::from(vec![
-            Line::from(vec![Span::raw("")]),
+                Span::raw("Press '"),
-            
-            Line::from(vec![
-                Span::raw("  Press '"),
                 Span::styled("q", Style::default().fg(Color::Red).add_modifier(Modifier::BOLD)),
                 Span::raw("' to quit without printing."),
             ]),
+            Spans::from(vec![Span::raw("")]),
+            Spans::from(vec![Span::raw("")]),
             ];
-
         let rpts_to_prnt = app.to_print_by_title.iter().map(|&rpt_to_prnt| {
             Text::styled(
                 format!("{}", rpt_to_prnt),
@@ -62,7 +59,7 @@ pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Re
         let top_level_chunks = Layout::default()
             .constraints([
                 Constraint::Length(1),
-                Constraint::Length(instructions.len() as u16 + 2),
+                Constraint::Length(instructions.len() as u16), // 2 for title "Instructions", plus 3 TEXT array elements/instruction
                 Constraint::Length(REPORTS.len() as u16 + 2),
                 Constraint::Length(rpts_to_prnt.len() as u16 + 2),
                 Constraint::Length(1),
@@ -72,12 +69,10 @@ pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Re
         let pg1 = Paragraph::new(instructions)
             .block(Block::default()
                 .borders(Borders::NONE)
-                .title(Span::styled(
+                .title("Instructions")
-                    "Instructions",
+                .title_style(Style::default().fg(Color::LightMagenta).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED)),
-                    Style::default().fg(Color::LightMagenta).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED)
-                ))
             )
-            .wrap(Wrap {trim: false});
+            .wrap(Wrap {trim: true});
         f.render_widget(pg1, top_level_chunks[1]);
 
         let level_2_chunks = Layout::default()
@@ -85,15 +80,14 @@ pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Re
             .direction(Direction::Horizontal)
             .split(top_level_chunks[2]);
 
-        let report_list_items: Vec<_> = app.tasks.items.iter().map(|i| ListItem::new(*i)).collect();
+        let items: Vec<_> = app.tasks.items.iter().map(|i| ListItem::new(*i)).collect();
+        // app.tasks.state.select(Some(0));
 
-        let items = List::new(report_list_items)
+        let items = List::new(items)
             .block(Block::default()
                 .borders(Borders::ALL)
-                .title(Span::styled(
+                .title("Reports available for exporting")
-                    "Reports available for exporting",
+                .title_style(Style::default().fg(Color::White).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED))
-                    Style::default().fg(Color::White).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED)
-                ))
             )
             .highlight_style(Style::default().fg(Color::Yellow).add_modifier(Modifier::BOLD))
             .highlight_symbol(">");
@@ -105,17 +99,12 @@ pub fn draw<B: Backend>(terminal: &mut Terminal<B>, app: &mut PrintWindow) -> Re
             .split(top_level_chunks[3]);
 
         let rpts_to_prnt: Vec<_> = app.to_print_by_title.iter().map(|i| ListItem::new(*i)).collect();
-
         let to_print = List::new(rpts_to_prnt)
             .block(Block::default()
                 .borders(Borders::ALL)
-                .title(Span::styled(
+                .title("Reports to be exported")
-                    "Reports to be exported",
+                .title_style(Style::default().fg(Color::LightYellow).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED))
-                    Style::default().fg(Color::LightYellow).add_modifier(Modifier::BOLD).add_modifier(Modifier::UNDERLINED)
-                ))
             );
-        f.render_widget(to_print, level_2_chunks[1]);
+            f.render_widget(to_print, level_2_chunks[1])
-    })?;
+    })
-
-    Ok(())
 }