1 files changed, 44 insertions, 26 deletions

diff --git a/src/ui.rs b/src/ui.rs
index 0682d97..5a52003 100755
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,5 +1,8 @@
 use crate::app::{App, AppResult};
-use ratatui::{prelude::*, widgets::{block::Title, *}};
+use ratatui::{
+    prelude::*,
+    widgets::{block::Title, *},
+};
 
 /// Renders the user interface widgets
 pub fn render(app: &mut App, frame: &mut Frame) {
@@ -27,35 +30,18 @@ pub fn render(app: &mut App, frame: &mut Frame) {
     draw_song_list(frame, app, outer_layout[0]);
     draw_queue(frame, app, inner_layout[0]);
     draw_playlists(frame, app, inner_layout[1]);
-
-    // Status
-    let song = app
-        .conn
-        .now_playing().unwrap()
-        .unwrap_or_else(|| "No Title Found".to_string());
-
-    let (elapsed, total) = app.conn.conn.status().unwrap().time.unwrap_or_default();
-
-    let mut lines = vec![];
-    lines.push(Line::from(vec![
-        Span::styled("Current: ", Style::default().fg(Color::Red)),
-        Span::styled(song, Style::default().fg(Color::Yellow)),
-        Span::styled(
-            format!("[{}/{}]", elapsed.as_secs(), total.as_secs()),
-            Style::default().fg(Color::Yellow),
-        ),
-    ]));
-    let status = Paragraph::new(Text::from(lines))
-        .block(Block::default().title("Status".bold().green()).borders(Borders::ALL));
-    frame.render_widget(status, main_layout[1]);
-
+    draw_progress_bar(frame, app, main_layout[1]);
 }
 
 /// draws list of songs
 fn draw_song_list(frame: &mut Frame, app: &mut App, size: Rect) {
     let mut song_state = ListState::default();
     let list = List::new(app.conn.songs_filenames.clone())
-        .block(Block::default().title("Song List".green().bold()).borders(Borders::ALL))
+        .block(
+            Block::default()
+                .title("Song List".green().bold())
+                .borders(Borders::ALL),
+        )
         .highlight_style(Style::new().add_modifier(Modifier::REVERSED))
         .highlight_symbol(">>")
         .repeat_highlight_symbol(true);
@@ -67,7 +53,9 @@ fn draw_song_list(frame: &mut Frame, app: &mut App, size: Rect) {
 /// draws playing queue
 fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
     let mut queue_state = ListState::default();
-    let title = Block::default().title(Title::from("Play Queue".green().bold())).title("Shift + ▲ ▼  to scroll, Shift + Enter to play".yellow());
+    let title = Block::default()
+        .title(Title::from("Play Queue".green().bold()))
+        .title("Shift + ▲ ▼  to scroll, Shift + Enter to play".yellow());
     let list = List::new(app.queue_list.list.clone())
         .block(title.borders(Borders::ALL))
         .highlight_style(Style::new().add_modifier(Modifier::REVERSED))
@@ -83,7 +71,9 @@ fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
 fn draw_playlists(frame: &mut Frame, app: &mut App, size: Rect) {
     let mut state = ListState::default();
 
-    let title = Block::default().title(Title::from("Playlist".green().bold())).title("▲ ▼  to scroll, Use ► to add playlist to queue".yellow());
+    let title = Block::default()
+        .title(Title::from("Playlist".green().bold()))
+        .title("▲ ▼  to scroll, Use ► to add playlist to queue".yellow());
     let list = List::new(app.pl_list.list.clone())
         .block(title.borders(Borders::ALL))
         .highlight_style(Style::new().add_modifier(Modifier::REVERSED))
@@ -93,3 +83,31 @@ fn draw_playlists(frame: &mut Frame, app: &mut App, size: Rect) {
     state.select(Some(app.pl_list.index));
     frame.render_stateful_widget(list, size, &mut state);
 }
+
+// Progress Bar
+fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
+    let song = app
+        .conn
+        .now_playing()
+        .unwrap()
+        .unwrap_or_else(|| "No Title Found".to_string());
+
+    let state = &app.conn.state;
+    // let (elapsed, total) = app.conn.conn.status().unwrap().time.unwrap_or_default();
+
+    let title = Block::default()
+        .title(Title::from(format!("{}: ", state).red().bold()))
+        .title(Title::from(song.green().bold()));
+    let progress_bar = LineGauge::default()
+        .block(title.borders(Borders::ALL))
+        .gauge_style(
+            Style::default()
+                .fg(Color::LightBlue)
+                .bg(Color::Gray)
+                .add_modifier(Modifier::BOLD),
+        )
+        .line_set(symbols::line::THICK)
+        .ratio(0.2);
+
+    frame.render_widget(progress_bar, size);
+}