Bump tui: 0.9 -> 0.12 (#289)

Author: WizardOhio24

Cargo.lock

@@ -23,7 +23,7 @@ scopetime = { path = "./scopetime", version = "0.1" }
 asyncgit = { path = "./asyncgit", version = "0.10" }
 crossterm = { version = "0.17", features = [ "serde" ] }
 clap = { version = "2.33", default-features = false }
-tui = { version = "0.9", default-features = false, features = ['crossterm'] }
+tui = { version = "0.12", default-features = false, features = ['crossterm'] }
 bytesize = { version = "1.0.1", default-features = false}
 itertools = "0.9"
 rayon-core = "1.8"

Cargo.toml

@@ -27,6 +27,7 @@ use std::{
 use tui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Margin, Rect},
+    text::{Span, Spans},
     widgets::{Block, Borders, Tabs},
     Frame,
 };
@@ -599,24 +600,27 @@ impl App {
             horizontal: 1,
         });
 
-        let tabs = &[
-            strings::tab_status(&self.key_config),
-            strings::tab_log(&self.key_config),
-            strings::tab_stashing(&self.key_config),
-            strings::tab_stashes(&self.key_config),
-        ];
+        let tabs = [
+            Span::raw(strings::tab_status(&self.key_config)),
+            Span::raw(strings::tab_log(&self.key_config)),
+            Span::raw(strings::tab_stashing(&self.key_config)),
+            Span::raw(strings::tab_stashes(&self.key_config)),
+        ]
+        .iter()
+        .cloned()
+        .map(Spans::from)
+        .collect();
 
         f.render_widget(
-            Tabs::default()
+            Tabs::new(tabs)
                 .block(
                     Block::default()
                         .borders(Borders::BOTTOM)
                         .border_style(self.theme.block(false)),
                 )
-                .titles(tabs)
                 .style(self.theme.tab(false))
                 .highlight_style(self.theme.tab(true))
-                .divider(&strings::tab_divider(&self.key_config))
+                .divider(strings::tab_divider(&self.key_config))
                 .select(self.tab),
             r,
         );

src/app.rs

@@ -6,7 +6,8 @@ use std::borrow::Cow;
 use tui::{
     backend::Backend,
     layout::{Alignment, Rect},
-    widgets::{Paragraph, Text},
+    text::{Span, Spans},
+    widgets::Paragraph,
     Frame,
 };
 use unicode_width::UnicodeWidthStr;
@@ -142,28 +143,44 @@ impl CommandBar {
         if r.width < MORE_WIDTH {
             return;
         }
-
-        let splitter = Text::Raw(Cow::from(strings::cmd_splitter(
+        let splitter = Span::raw(Cow::from(strings::cmd_splitter(
             &self.key_config,
         )));
 
         let texts = self
             .draw_list
-            .iter()
-            .map(|c| match c {
-                DrawListEntry::Command(c) => Text::Styled(
-                    Cow::from(c.txt.as_str()),
-                    self.theme.commandbar(c.enabled, c.line),
-                ),
-                DrawListEntry::LineBreak => {
-                    Text::Raw(Cow::from("\n"))
-                }
-                DrawListEntry::Splitter => splitter.clone(),
+            .split(|c| match c {
+                DrawListEntry::LineBreak => true,
+                _ => false,
             })
-            .collect::<Vec<_>>();
+            .map(|c_arr| {
+                Spans::from(
+                    c_arr
+                        .iter()
+                        .map(|c| match c {
+                            DrawListEntry::Command(c) => {
+                                Span::styled(
+                                    Cow::from(c.txt.as_str()),
+                                    self.theme.commandbar(
+                                        c.enabled, c.line,
+                                    ),
+                                )
+                            }
+                            DrawListEntry::LineBreak => {
+                                // Doesn't exist in split array
+                                Span::raw("")
+                            }
+                            DrawListEntry::Splitter => {
+                                splitter.clone()
+                            }
+                        })
+                        .collect::<Vec<Span>>(),
+                )
+            })
+            .collect::<Vec<Spans>>();
 
         f.render_widget(
-            Paragraph::new(texts.iter()).alignment(Alignment::Left),
+            Paragraph::new(texts).alignment(Alignment::Left),
             r,
         );
 
@@ -176,14 +193,13 @@ impl CommandBar {
             );
 
             f.render_widget(
-                Paragraph::new(
-                    vec![Text::Raw(Cow::from(if self.expanded {
+                Paragraph::new(Spans::from(vec![Span::raw(
+                    Cow::from(if self.expanded {
                         "less [.]"
                     } else {
                         "more [.]"
-                    }))]
-                    .iter(),
-                )
+                    }),
+                )]))
                 .alignment(Alignment::Right),
                 r,
             );

src/cmdbar.rs

@@ -78,11 +78,6 @@ impl CommandInfo {
         res
     }
 
-    ///
-    pub fn print(&self, out: &mut String) {
-        out.push_str(&self.text.name);
-    }
-
     ///
     pub const fn show_in_quickbar(&self) -> bool {
         self.quick_bar && self.available