Feat: begin slight refactoring

crates/ratatui/src/text_input.rs

@@ -1,4 +1,4 @@
-use crate::theme::{input, ui};
+use crate::theme;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::style::{Color, Style};
 use ratatui::text::{Line, Span};
@@ -11,7 +11,7 @@ pub struct TextInputModal<'a> {
     title: &'a str,
     input: &'a str,
     hint: Option<&'a str>,
-    border_color: Color,
+    border_color: Option<Color>,
     width: u16,
 }
 
@@ -21,7 +21,7 @@ impl<'a> TextInputModal<'a> {
             title,
             input,
             hint: None,
-            border_color: ui::TEXT_PRIMARY,
+            border_color: None,
             width: 50,
         }
     }
@@ -32,7 +32,7 @@ impl<'a> TextInputModal<'a> {
     }
 
     pub fn border_color(mut self, c: Color) -> Self {
-        self.border_color = c;
+        self.border_color = Some(c);
         self
     }
 
@@ -42,12 +42,14 @@ impl<'a> TextInputModal<'a> {
     }
 
     pub fn render_centered(self, frame: &mut Frame, term: Rect) {
+        let colors = theme::get();
+        let border_color = self.border_color.unwrap_or(colors.ui.text_primary);
         let height = if self.hint.is_some() { 6 } else { 5 };
 
         let inner = ModalFrame::new(self.title)
             .width(self.width)
             .height(height)
-            .border_color(self.border_color)
+            .border_color(border_color)
             .render_centered(frame, term);
 
         if self.hint.is_some() {
@@ -57,15 +59,15 @@ impl<'a> TextInputModal<'a> {
             frame.render_widget(
                 Paragraph::new(Line::from(vec![
                     Span::raw("> "),
-                    Span::styled(self.input, Style::new().fg(input::TEXT)),
-                    Span::styled("█", Style::new().fg(input::CURSOR)),
+                    Span::styled(self.input, Style::new().fg(colors.input.text)),
+                    Span::styled("█", Style::new().fg(colors.input.cursor)),
                 ])),
                 rows[0],
             );
 
             if let Some(hint) = self.hint {
                 frame.render_widget(
-                    Paragraph::new(Span::styled(hint, Style::new().fg(input::HINT))),
+                    Paragraph::new(Span::styled(hint, Style::new().fg(colors.input.hint))),
                     rows[1],
                 );
             }
@@ -73,8 +75,8 @@ impl<'a> TextInputModal<'a> {
             frame.render_widget(
                 Paragraph::new(Line::from(vec![
                     Span::raw("> "),
-                    Span::styled(self.input, Style::new().fg(input::TEXT)),
-                    Span::styled("█", Style::new().fg(input::CURSOR)),
+                    Span::styled(self.input, Style::new().fg(colors.input.text)),
+                    Span::styled("█", Style::new().fg(colors.input.cursor)),
                 ])),
                 inner,
             );