Move styling to style and add Border type

src/musicplayer/control.gleam

@@ -1,4 +1,5 @@
 import gleam/string
+import musicplayer/ui/layout
 
 import musicplayer/input/key.{type Key}
 
@@ -11,6 +12,8 @@ pub type Control {
   TogglePlayPause
   Search(input: String, capturing: Bool)
 
+  SetView(view_idx: layout.ViewIdx)
+
   Exit
 }
 
@@ -25,6 +28,10 @@ pub fn idle_from_key(key: Key) -> Result(Control, Nil) {
   case key {
     key.Char(char) -> {
       case char {
+        // Views are zero indexed
+        "1" -> Ok(SetView(0))
+        "2" -> Ok(SetView(1))
+
         " " -> Ok(TogglePlayPause)
         "/" -> Ok(Search(input: "", capturing: True))
         "q" -> Ok(Exit)

src/musicplayer/musicplayer.gleam

@@ -51,6 +51,15 @@ fn handle_message(state: State, key: Key) -> actor.Next(State, Key) {
     Error(_) -> actor.continue(state)
     Ok(c) ->
       case c {
+        control.SetView(view_idx) -> {
+          logging.log(
+            "musicplayer - setting current view to: "
+            <> string.inspect(view_idx),
+          )
+
+          update_current_view(state.ui, view_idx)
+          actor.continue(state)
+        }
         control.Search(input, capturing) -> {
           case capturing {
             True -> {
@@ -125,7 +134,7 @@ fn update_playback_time(
     Error(err) ->
       process.send(
         ui,
-        ui_control.UpdateState(
+        ui_control.UpdateHeading(
           layout.PlaybackTime,
           "playback time: N/A (err: " <> err.details <> ")",
         ),
@@ -134,7 +143,7 @@ fn update_playback_time(
     Ok(mpv_control.PlaybackTime(data: playback_time)) ->
       process.send(
         ui,
-        ui_control.UpdateState(
+        ui_control.UpdateHeading(
           layout.PlaybackTime,
           "playback time: " <> time.to_duration_string(playback_time),
         ),
@@ -143,7 +152,14 @@ fn update_playback_time(
 }
 
 fn update_search(ui: Subject(ui_control.Control), content: String) -> Nil {
-  process.send(ui, ui_control.UpdateState(layout.Search, content))
+  process.send(ui, ui_control.UpdateHeading(layout.Search, content))
+}
+
+fn update_current_view(
+  ui: Subject(ui_control.Control),
+  view_idx: layout.ViewIdx,
+) {
+  process.send(ui, ui_control.SetView(view_idx))
 }
 
 /// `forward_key` listens to a subject onto which `input` will send messages with `Key`s

src/musicplayer/ui/control.gleam

@@ -1,11 +1,11 @@
 import gleam/erlang/process.{type Subject}
 
-import musicplayer/ui/layout.{type Section}
+import musicplayer/ui/layout.{type Section, type ViewIdx}
 
 pub type Control {
   UpdateDimensions(columns: Int, rows: Int)
-  UpdateState(section: Section, content: String)
-  SetView(view_idx: layout.ViewIdx)
+  UpdateHeading(section: Section, heading: String)
+  SetView(view_idx: ViewIdx)
 
   Exit(reply_to: Subject(Nil))
 }

src/musicplayer/ui/layout.gleam

@@ -1,11 +1,14 @@
 import gleam/dict
+import gleam/int
 import gleam/list
+import gleam/option.{type Option, None, Some}
 import gleam/pair
 import gleam/set
 import gleam/string
 
 import musicplayer/ui/internal
 import musicplayer/ui/plot.{type Buffer}
+import musicplayer/ui/style.{type Style, Percent, Style}
 
 pub const root_section = "reserved_root_section"
 
@@ -17,18 +20,9 @@ pub type Section {
   PlaybackTime
 }
 
-pub type Dimension {
-  Percent(width: Int, height: Int)
-  // TODO add Flex that flows
-}
-
-pub type Style {
-  Style(dimensions: Dimension)
-}
-
 pub type Node {
-  Row(content: String, style: Style, children: List(Section))
-  Cell(content: String, style: Style)
+  Row(heading: Option(String), style: Style, children: List(Section))
+  Cell(heading: Option(String), style: Style)
 }
 
 pub type ViewIdx =
@@ -83,19 +77,24 @@ fn view_loop(i: ViewIdx, view_nodes: List(#(Section, Node))) -> View {
 
   dict.from_list(view_nodes)
   |> dict.insert(
-    Section(string.append("view_", string.inspect(i))),
+    view_index_section(i),
     Row(
-      content: "",
-      style: Style(dimensions: Percent(width: 100, height: 100)),
+      heading: None,
+      style: Style(dimensions: Percent(width: 100, height: 100), border: None),
       children: orphans,
     ),
   )
 }
 
-pub fn update_section(
+/// Takes a ViewIndex and create a Section key from it
+fn view_index_section(view_idx: ViewIdx) -> Section {
+  Section(string.append("view_", int.to_string(view_idx)))
+}
+
+pub fn update_section_heading(
   layout: Layout,
   section: Section,
-  content: String,
+  heading: String,
 ) -> Layout {
   case dict.get(layout.views, layout.current_view) {
     Error(_) -> layout
@@ -104,8 +103,8 @@ pub fn update_section(
         Error(_) -> layout
         Ok(node) -> {
           let updated_node = case node {
-            Cell(..) -> Cell(..node, content: content)
-            Row(..) -> Row(..node, content: content)
+            Cell(..) -> Cell(..node, heading: Some(heading))
+            Row(..) -> Row(..node, heading: Some(heading))
           }
 
           let updated_view = dict.insert(view, section, updated_node)
@@ -123,7 +122,7 @@ pub fn update_dimensions(layout: Layout, columns: Int, rows: Int) -> Layout {
   Layout(..layout, columns:, rows:)
 }
 
-pub fn set_view(layout: Layout, view_idx: ViewIdx) -> Layout {
+pub fn update_current_view(layout: Layout, view_idx: ViewIdx) -> Layout {
   Layout(..layout, current_view: view_idx)
 }
 
@@ -145,8 +144,7 @@ pub fn render(layout: Layout) -> Nil {
       render_loop(
         view,
         context,
-        // TODO extract to function `view_index`
-        Section(string.append("view_", string.inspect(layout.current_view))),
+        view_index_section(layout.current_view),
         buffer,
       )
       |> plot.flush_buffer(layout.columns, layout.rows)
@@ -198,7 +196,8 @@ pub fn render_loop(
         )
       }
 
-      let parent =
+      let parent = case node.heading {
+        None ->
           plot.box(
             buffer,
             node_top_left_x,
@@ -206,7 +205,16 @@ pub fn render_loop(
             node_width,
             node_height,
           )
-        |> plot.text(node.content, node_top_left_x, node_top_left_y)
+        option.Some(heading) ->
+          plot.box_with_heading(
+            buffer,
+            node_top_left_x,
+            node_top_left_y,
+            node_width,
+            node_height,
+            heading,
+          )
+      }
 
       case node {
         Cell(..) -> parent

src/musicplayer/ui/layout_examples/layout_examples.gleam

@@ -1,6 +1,9 @@
+import gleam/option.{Some}
+
 import musicplayer/ui/internal
-import musicplayer/ui/layout.{Percent, Section, Style}
+import musicplayer/ui/layout.{Section}
 import musicplayer/ui/layout_examples/wait_for_input.{wait_for_input}
+import musicplayer/ui/style.{Percent, Style}
 
 pub fn main() {
   let assert Ok(columns) = internal.io_get_columns()
@@ -21,8 +24,11 @@ fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
       #(
         Section("Row1"),
         layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+          heading: Some("row 1"),
+          style: Style(
+            dimensions: Percent(width: 100, height: 50),
+            border: Some(style.BorderSingle),
+          ),
           children: [
             Section("A"),
             Section("B"),
@@ -32,22 +38,31 @@ fn two_rows_with_cells(columns: Int, rows: Int) -> layout.Layout {
       #(
         Section("A"),
         layout.Cell(
-          content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          heading: Some("cell 1"),
+          style: Style(
+            dimensions: Percent(width: 50, height: 50),
+            border: Some(style.BorderSingle),
+          ),
         ),
       ),
       #(
         Section("B"),
         layout.Cell(
-          content: "cell 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          heading: Some("cell 2"),
+          style: Style(
+            dimensions: Percent(width: 50, height: 50),
+            border: Some(style.BorderSingle),
+          ),
         ),
       ),
       #(
         Section("Row2"),
         layout.Row(
-          content: "row 2",
-          style: Style(dimensions: Percent(width: 50, height: 50)),
+          heading: Some("row 2"),
+          style: Style(
+            dimensions: Percent(width: 50, height: 50),
+            border: Some(style.BorderSingle),
+          ),
           children: [],
         ),
       ),

src/musicplayer/ui/plot.gleam

@@ -49,6 +49,19 @@ pub fn box(buffer: Buffer, x: Int, y: Int, width: Int, height: Int) -> Buffer {
   }
 }
 
+pub fn box_with_heading(
+  buffer: Buffer,
+  x: Int,
+  y: Int,
+  width: Int,
+  height: Int,
+  heading: String,
+) -> Buffer {
+  let heading_margin = 1
+  box(buffer, x, y, width, height)
+  |> text(heading, x + heading_margin, y)
+}
+
 fn horizontal_line(
   buffer: Buffer,
   x: Int,

src/musicplayer/ui/style.gleam

@@ -0,0 +1,34 @@
+import gleam/option.{type Option}
+
+pub type Dimension {
+  Percent(width: Int, height: Int)
+  // TODO add Flex that flows
+}
+
+pub type Border {
+  BorderNone
+  BorderSingle
+}
+
+pub type Style {
+  Style(dimensions: Dimension, border: Option(Border))
+}
+
+pub type BorderChars {
+  BorderChars(
+    top_left: String,
+    top_right: String,
+    bottom_left: String,
+    bottom_right: String,
+    horisontal: String,
+    vertical: String,
+  )
+}
+
+// https://en.wikipedia.org/wiki/Box-drawing_characters
+pub fn border_chars(border: Border) -> BorderChars {
+  case border {
+    BorderNone -> BorderChars("", "", "", "", "", "")
+    BorderSingle -> BorderChars("┌", "┐", "└", "┘", "─", "│")
+  }
+}

src/musicplayer/ui/ui.gleam

@@ -1,6 +1,7 @@
 import gleam/erlang/process.{type Subject}
 import gleam/int
 import gleam/list
+import gleam/option.{None, Some}
 import gleam/otp/actor
 import gleam/string
 
@@ -8,6 +9,7 @@ import musicplayer/logging/logging
 import musicplayer/ui/control.{type Control}
 import musicplayer/ui/internal
 import musicplayer/ui/layout.{type Layout}
+import musicplayer/ui/style
 
 pub type State(redraw, content) {
   State(redraw: Subject(Layout), layout: Layout)
@@ -23,33 +25,57 @@ pub fn new() -> Result(Subject(Control), String) {
         #(
           layout.Header,
           layout.Row(
-            content: "Foo (1) | Bar (2) | Baz (3)",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
-            children: [],
+            heading: Some("Foo <1> | Bar (2)"),
+            style: style.Style(
+              dimensions: style.Percent(width: 100, height: 50),
+              border: Some(style.BorderSingle),
             ),
-        ),
-        #(
-          layout.Search,
-          layout.Row(
-            content: "",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
             children: [],
           ),
         ),
         #(
           layout.PlaybackTime,
           layout.Row(
-            content: "00:00",
-            style: layout.Style(dimensions: layout.Percent(
-              width: 100,
-              height: 33,
-            )),
+            heading: None,
+            style: style.Style(
+              dimensions: style.Percent(width: 100, height: 50),
+              border: Some(style.BorderSingle),
+            ),
+            children: [],
+          ),
+        ),
+      ],
+      [
+        #(
+          layout.Header,
+          layout.Row(
+            heading: Some("Foo (1) | Bar <2>"),
+            style: style.Style(
+              dimensions: style.Percent(width: 100, height: 33),
+              border: Some(style.BorderSingle),
+            ),
+            children: [],
+          ),
+        ),
+        #(
+          layout.Search,
+          layout.Row(
+            heading: None,
+            style: style.Style(
+              dimensions: style.Percent(width: 100, height: 33),
+              border: Some(style.BorderSingle),
+            ),
+            children: [],
+          ),
+        ),
+        #(
+          layout.PlaybackTime,
+          layout.Row(
+            heading: None,
+            style: style.Style(
+              dimensions: style.Percent(width: 100, height: 33),
+              border: Some(style.BorderSingle),
+            ),
             children: [],
           ),
         ),
@@ -108,8 +134,8 @@ fn handle_message(
         }
       }
     }
-    control.UpdateState(section, content) -> {
-      let layout = layout.update_section(state.layout, section, content)
+    control.UpdateHeading(section, heading) -> {
+      let layout = layout.update_section_heading(state.layout, section, heading)
 
       actor.send(state.redraw, layout)
       actor.continue(State(..state, layout:))
@@ -121,7 +147,7 @@ fn handle_message(
       actor.stop()
     }
     control.SetView(view_idx) -> {
-      let layout = layout.set_view(state.layout, view_idx)
+      let layout = layout.update_current_view(state.layout, view_idx)
 
       actor.send(state.redraw, layout)
       actor.continue(State(..state, layout:))

test/musicplayer/ui/layout_test.gleam

@@ -1,11 +1,13 @@
 import gleam/dict
 import gleam/io
+import gleam/option.{Some}
 import gleam/string
 import gleeunit
 import gleeunit/should
 
-import musicplayer/ui/layout.{Percent, RenderContext, Section, Style}
+import musicplayer/ui/layout.{RenderContext, Section}
 import musicplayer/ui/plot
+import musicplayer/ui/style.{Percent, Style}
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -17,8 +19,11 @@ pub fn percent_layout_test() {
       #(
         Section("Row1"),
         layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+          heading: Some("row 1"),
+          style: Style(
+            dimensions: Percent(width: 100, height: 50),
+            border: Some(style.BorderSingle),
+          ),
           children: [
             Section("A"),
             Section("B"),
@@ -28,22 +33,31 @@ pub fn percent_layout_test() {
       #(
         Section("A"),
         layout.Cell(
-          content: "cell 1",
-          style: Style(dimensions: Percent(width: 50, height: 100)),
+          heading: Some("cell 1"),
+          style: Style(
+            dimensions: Percent(width: 50, height: 100),
+            border: Some(style.BorderSingle),
+          ),
         ),
       ),
       #(
         Section("B"),
         layout.Cell(
-          content: "cell 2",
-          style: Style(dimensions: Percent(width: 50, height: 100)),
+          heading: Some("cell 2"),
+          style: Style(
+            dimensions: Percent(width: 50, height: 100),
+            border: Some(style.BorderSingle),
+          ),
         ),
       ),
       #(
         Section("Row2"),
         layout.Row(
-          content: "row 1",
-          style: Style(dimensions: Percent(width: 100, height: 50)),
+          heading: Some("row 1"),
+          style: Style(
+            dimensions: Percent(width: 100, height: 50),
+            border: Some(style.BorderSingle),
+          ),
           children: [],
         ),
       ),
@@ -57,8 +71,8 @@ pub fn percent_layout_test() {
   let expected =
     "
 ┌──────────────────────────────────────────────────────────────────────────────┐
-│row 1────────────────────────────────────────────────────────────────────────┐│
-││cell 1───────────────────────────────┐cell 2───────────────────────────────┐││
+│┌row 1───────────────────────────────────────────────────────────────────────┐│
+││┌cell 1──────────────────────────────┐┌cell 2──────────────────────────────┐││
 │││                                    ││                                    │││
 │││                                    ││                                    │││
 │││                                    ││                                    │││
@@ -66,7 +80,7 @@ pub fn percent_layout_test() {
 │││                                    ││                                    │││
 ││└────────────────────────────────────┘└────────────────────────────────────┘││
 │└────────────────────────────────────────────────────────────────────────────┘│
-│row 1────────────────────────────────────────────────────────────────────────┐│
+│┌row 1───────────────────────────────────────────────────────────────────────┐│
 ││                                                                            ││
 ││                                                                            ││
 ││                                                                            ││