From bf11d5967fd52453292e8a5a0d9a0c618a03c4ad Mon Sep 17 00:00:00 2001
From: krolxon <krolyxon@tutanota.com>
Date: Wed, 24 Apr 2024 12:36:33 +0530
Subject: hmm stuff

---
 src/ui.rs | 53 +++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'src/ui.rs')

diff --git a/src/ui.rs b/src/ui.rs
index 52bfe98..0682d97 100755
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,5 +1,5 @@
 use crate::app::{App, AppResult};
-use ratatui::{prelude::*, widgets::*};
+use ratatui::{prelude::*, widgets::{block::Title, *}};
 
 /// Renders the user interface widgets
 pub fn render(app: &mut App, frame: &mut Frame) {
@@ -29,32 +29,33 @@ pub fn render(app: &mut App, frame: &mut Frame) {
     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();
-    //
-    // 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").borders(Borders::ALL));
-    // frame.render_widget(status, main_layout[1]);
+    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]);
+
 }
 
 /// 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").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);
@@ -66,21 +67,25 @@ 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 list = List::new(app.play_deque.clone())
-        .block(Block::default().title("Play Queue").borders(Borders::ALL))
+    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))
         .highlight_symbol(">>")
         .repeat_highlight_symbol(true);
 
     app.update_queue();
+    queue_state.select(Some(app.queue_list.index));
     frame.render_stateful_widget(list, size, &mut queue_state);
 }
 
 /// draws all playlists
 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 list = List::new(app.pl_list.list.clone())
-        .block(Block::default().title("Playlists").borders(Borders::ALL))
+        .block(title.borders(Borders::ALL))
         .highlight_style(Style::new().add_modifier(Modifier::REVERSED))
         .highlight_symbol(">>")
         .repeat_highlight_symbol(true);
-- 
cgit v1.2.3