Playlist

gonk/src/browser.rs

@@ -121,12 +121,7 @@ pub fn draw(
     let songs: Vec<_> = browser.songs.iter().map(|(s, _)| lines!(s)).collect();
 
     fn list<'a>(title: &'static str, items: Vec<Lines<'a>>, use_symbol: bool) -> List<'a> {
-        let block = block(
-            Some(text!(title, bold())),
-            Borders::ALL,
-            BorderType::Rounded,
-        )
-        .margin(1);
+        let block = block(Some(text!(title, bold())), Borders::ALL, Rounded).margin(1);
         let symbol = if use_symbol { ">" } else { " " };
         winter::list(Some(block), items, Some(symbol), None)
     }

gonk/src/main.rs

@@ -167,7 +167,7 @@ fn draw_log(area: Rect, buf: &mut Buffer) -> Rect {
             Constraint::Length(3)
         );
         lines([text![msg]])
-            .block(None, Borders::ALL, BorderType::Rounded)
+            .block(None, Borders::ALL, Rounded)
             .draw(area[1], buf);
         area[0]
     } else {
@@ -374,21 +374,15 @@ fn main() -> std::result::Result<(), Box<dyn Error>> {
 
             // mode = Mode::Browser;
             // mode = Mode::Settings;
-            mode = Mode::Queue;
+            // mode = Mode::Queue;
+            mode = Mode::Playlist;
             match mode {
                 Mode::Browser => browser::draw(&mut browser, area, buf, None),
                 Mode::Settings => settings::draw(&mut settings, area, buf),
                 Mode::Queue => queue::draw(&mut queue, area, buf, None),
-                _ => (),
+                Mode::Playlist => playlist::draw(&mut playlist, area, buf, None, &mut stdout),
             }
 
-            // match mode {
-            //     Mode::Browser => browser::draw(&mut browser, f, top, None),
-            //     Mode::Queue => queue::draw(&mut queue, f, top, None),
-            //     Mode::Playlist => playlist::draw(&mut playlist, f, top, None),
-            //     Mode::Settings => settings::draw(&mut settings, f, top),
-            // }
-
             // if help {
             //     let area = top.inner(&SEARCH_MARGIN);
             //     f.render_widget(tui::widgets::Clear, area);
@@ -409,7 +403,7 @@ fn main() -> std::result::Result<(), Box<dyn Error>> {
             //             Block::default()
             //                 .title("Help:")
             //                 .borders(Borders::ALL)
-            //                 .border_type(BorderType::Rounded),
+            //                 .border_type(Rounded),
             //         )
             //         .widths(&widths);