refactor: use ratatui's color serde impl (#26)

rm-config/Cargo.toml

@@ -13,8 +13,6 @@ toml = "0.8"
 serde = { version = "1", features = ["derive"] }
 anyhow = "1"
 url = "2.5"
-ratatui = "0.26"
+ratatui = { version = "0.26", features = ["serde"] }
 
-[dev-dependencies]
-serde_json = "1"
 

rm-config/src/lib.rs

@@ -1,5 +1,3 @@
-mod color;
-
 use std::{
     fs::File,
     io::{Read, Write},
@@ -8,7 +6,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
-use color::Color;
+use ratatui::style::Color;
 use serde::{Deserialize, Serialize};
 use toml::Table;
 use xdg::BaseDirectories;
@@ -23,12 +21,16 @@ pub struct Config {
 pub struct General {
     #[serde(default)]
     pub auto_hide: bool,
-    #[serde(default, with = "color")]
+    #[serde(default = "default_accent_color")]
     pub accent_color: Color,
     #[serde(default = "default_beginner_mode")]
     pub beginner_mode: bool,
 }
 
+fn default_accent_color() -> Color {
+    Color::LightMagenta
+}
+
 fn default_beginner_mode() -> bool {
     true
 }

rm-main/src/ui/components/tabs.rs

@@ -44,8 +44,7 @@ impl Component for TabComponent {
             .flex(Flex::Center)
             .split(rect)[0];
 
-        let tabs_highlight_style =
-            Style::default().fg(self.ctx.config.general.accent_color.as_ratatui());
+        let tabs_highlight_style = Style::default().fg(self.ctx.config.general.accent_color);
         let tabs = Tabs::new(self.tabs_list)
             .style(Style::default().white())
             .highlight_style(tabs_highlight_style)

rm-main/src/ui/global_popups/help.rs

@@ -46,13 +46,13 @@ impl Component for HelpPopup {
         let popup_rect = centered_rect.inner(&Margin::new(1, 1));
         let text_rect = popup_rect.inner(&Margin::new(3, 2));
 
-        let title_style = Style::new().fg(self.ctx.config.general.accent_color.as_ratatui());
+        let title_style = Style::new().fg(self.ctx.config.general.accent_color);
         let block = Block::bordered()
             .border_set(symbols::border::ROUNDED)
             .title(
                 Title::from(
                     " [ CLOSE ] "
-                        .fg(self.ctx.config.general.accent_color.as_ratatui())
+                        .fg(self.ctx.config.general.accent_color)
                         .bold(),
                 )
                 .alignment(Alignment::Right)

rm-main/src/ui/tabs/search.rs

@@ -228,7 +228,7 @@ impl Component for SearchTab {
             if self.search_focus == SearchFocus::Search {
                 Style::default()
                     .underlined()
-                    .fg(self.ctx.config.general.accent_color.as_ratatui())
+                    .fg(self.ctx.config.general.accent_color)
             } else {
                 Style::default().underlined().gray()
             }
@@ -264,8 +264,7 @@ impl Component for SearchTab {
             .ctx
             .config
             .general
-            .accent_color
-            .as_ratatui());
+            .accent_color);
         let table = Table::new(items, widths)
             .header(header)
             .highlight_style(table_higlight_style);

rm-main/src/ui/tabs/torrents/input_manager.rs

@@ -50,7 +50,7 @@ impl Component for InputManager {
 
         spans.push(Span::styled(
             self.prompt.as_str(),
-            Style::default().fg(self.ctx.config.general.accent_color.as_ratatui()),
+            Style::default().fg(self.ctx.config.general.accent_color),
         ));
 
         spans.push(Span::raw(self.text()));

rm-main/src/ui/tabs/torrents/mod.rs

@@ -118,8 +118,7 @@ impl TorrentsTab {
             .ctx
             .config
             .general
-            .accent_color
-            .as_ratatui());
+            .accent_color);
 
         let table_widget = Table::new(torrent_rows, table_manager_lock.widths)
             .header(Row::new(

rm-main/src/ui/tabs/torrents/popups/files.rs

@@ -200,8 +200,7 @@ impl Component for FilesPopup {
 
         let info_text_rect = block_rect.inner(&Margin::new(3, 2));
 
-        let highlight_style =
-            Style::default().fg(self.ctx.config.general.accent_color.as_ratatui());
+        let highlight_style = Style::default().fg(self.ctx.config.general.accent_color);
         let bold_highlight_style = highlight_style.on_black().bold();
 
         let block = Block::bordered()

rm-main/src/ui/tabs/torrents/popups/stats.rs

@@ -40,7 +40,7 @@ impl Component for StatisticsPopup {
         let block_rect = popup_rect.inner(&Margin::new(1, 1));
         let text_rect = block_rect.inner(&Margin::new(3, 2));
 
-        let title_style = Style::default().fg(self.ctx.config.general.accent_color.as_ratatui());
+        let title_style = Style::default().fg(self.ctx.config.general.accent_color);
         let block = Block::bordered()
             .border_type(BorderType::Rounded)
             .title(Title::from(" Statistics ".set_style(title_style)))