From 34fb52591a25c0ee2fd855de970727a4dbd0b3e4 Mon Sep 17 00:00:00 2001
From: Nick Bisby <nbisby@gmail.com>
Date: Thu, 14 Mar 2019 12:11:05 -0500
Subject: [PATCH] File restructure and some footer work

---
 components/ConfigurationData.xml  |   8 --
 components/ConfigurationItem.xml  |  51 -------------
 components/ConfigurationList.xml  |  78 -------------------
 components/ConfigurationScene.brs |  58 --------------
 components/ConfigurationScene.xml |  23 ------
 components/LibItem.xml            |  36 ---------
 components/LibList.xml            |  92 -----------------------
 components/Library.xml            |   7 --
 components/LibraryData.xml        |   9 ---
 components/MovieData.xml          |  31 --------
 components/MovieItemDetails.brs   | 114 ----------------------------
 components/MovieItemDetails.xml   |  48 ------------
 components/MovieItemMinimal.xml   |  33 --------
 components/MovieList.xml          | 104 -------------------------
 components/Movies.xml             |  15 ----
 components/Pager.xml              |   7 +-
 components/TVSeasonData.xml       |  26 -------
 components/TVSeasonList.xml       |  92 -----------------------
 components/TVShowData.xml         |  30 --------
 components/TVShowItemDetails.brs  | 121 ------------------------------
 components/TVShowItemDetails.xml  |  47 ------------
 components/TVShowList.xml         | 104 -------------------------
 components/TVShows.xml            |  15 ----
 source/HelperUtils.brs            |   6 +-
 24 files changed, 8 insertions(+), 1147 deletions(-)
 delete mode 100644 components/ConfigurationData.xml
 delete mode 100644 components/ConfigurationItem.xml
 delete mode 100644 components/ConfigurationList.xml
 delete mode 100644 components/ConfigurationScene.brs
 delete mode 100644 components/ConfigurationScene.xml
 delete mode 100644 components/LibItem.xml
 delete mode 100644 components/LibList.xml
 delete mode 100644 components/Library.xml
 delete mode 100644 components/LibraryData.xml
 delete mode 100644 components/MovieData.xml
 delete mode 100644 components/MovieItemDetails.brs
 delete mode 100644 components/MovieItemDetails.xml
 delete mode 100644 components/MovieItemMinimal.xml
 delete mode 100644 components/MovieList.xml
 delete mode 100644 components/Movies.xml
 delete mode 100644 components/TVSeasonData.xml
 delete mode 100644 components/TVSeasonList.xml
 delete mode 100644 components/TVShowData.xml
 delete mode 100644 components/TVShowItemDetails.brs
 delete mode 100644 components/TVShowItemDetails.xml
 delete mode 100644 components/TVShowList.xml
 delete mode 100644 components/TVShows.xml

diff --git a/components/ConfigurationData.xml b/components/ConfigurationData.xml
deleted file mode 100644
index 1a798b65..00000000
--- a/components/ConfigurationData.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="ConfigData" extends="ContentNode">
-  <interface>
-    <field id="label" type="string" />
-    <field id="value" type="string" />
-    <field id="type" type="string" />
-  </interface>
-</component>
diff --git a/components/ConfigurationItem.xml b/components/ConfigurationItem.xml
deleted file mode 100644
index bf774eab..00000000
--- a/components/ConfigurationItem.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="ConfigItem" extends="Group">
-  <children>
-    <LayoutGroup
-      layoutDirection="horiz"
-      vertAlignment="center"
-      itemSpacings="20"
-      translation="[8,40]" >
-      <Label id="label"
-        horizAlign="left"
-        width="196"
-        height="60"
-        color="#666666" />
-      <Label id="value"
-        horizAlign="left"
-        width="196"
-        height="60"
-        color="#666666" />
-    </LayoutGroup>
-  </children>
-
-  <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged" />
-  </interface>
-
-  <script type="text/brightscript">
-  <![CDATA[
-  sub Init()
-    m.name = m.top.findNode("label")
-    m.value = m.top.findNode("value")
-  end sub
-
-  sub itemContentChanged() as void
-    data = m.top.itemContent
-
-    m.name.text = data.label
-    if data.value = ""
-      m.value.color = "#444444"
-      m.value.text = "Enter a value..."
-    else if data.type = "password"
-      m.value.color = "#ffffff"
-      m.value.text = "********"
-    else
-      m.value.color = "#ffffff"
-      m.value.text = data.value
-    end if
-  end sub
-  ]]>
-  </script>
-
-</component>
diff --git a/components/ConfigurationList.xml b/components/ConfigurationList.xml
deleted file mode 100644
index ea5404cb..00000000
--- a/components/ConfigurationList.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="ConfigList" extends="MarkupList">
-  <interface>
-    <function name="setData" />
-  </interface>
-  <script type="text/brightscript" uri="pkg:/source/config.brs" />
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    m.top.itemComponentName = "ConfigItem"
-
-    m.top.drawFocusFeedback = True
-    m.top.vertFocusAnimationStyle = "floatingFocus"
-
-    m.top.observeField("itemSelected", "onItemSelected")
-
-    m.top.setfocus(true)
-
-  end sub
-
-  function setData(items)
-    data = CreateObject("roSGNode", "ContentNode")
-
-    for each item in items
-      config = data.CreateChild("ConfigData")
-      config.label = item["label"]
-      config.value = get_setting(item["field"])
-      config.type = item["type"]
-    end for
-
-    m.top.content = data
-  end function
-
-  function onItemSelected()
-    i = m.top.itemSelected
-    itemField =  m.top.content.getchild(i)
-
-    show_dialog(itemField)
-
-  end function
-
-  function onDialogButton()
-    d = m.dialog
-    button_text = d.buttons[d.buttonSelected]
-
-    if button_text = "OK"
-      m.configField.value = d.text
-      dismiss_dialog()
-      return true
-    else if button_text = "Cancel"
-      dismiss_dialog()
-      return false
-    end if
-  end function
-
-
-  sub show_dialog(configField)
-    dialog = createObject("roSGNode", "KeyboardDialog")
-    m.configField = configField
-    dialog.title = "Enter the " + configField.label
-    dialog.buttons = ["OK", "Cancel"]
-
-    if configField.value <> "" then
-      dialog.text = configField.value
-    end if
-
-    m.top.getparent().dialog = dialog
-    m.dialog = dialog
-
-    dialog.observeField("buttonSelected", "onDialogButton")
-  end sub
-
-  sub dismiss_dialog()
-    m.dialog.close = true
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/ConfigurationScene.brs b/components/ConfigurationScene.brs
deleted file mode 100644
index fbd76825..00000000
--- a/components/ConfigurationScene.brs
+++ /dev/null
@@ -1,58 +0,0 @@
-sub init()
-    m.top.backgroundColor = "#000b35ff"
-    m.top.backgroundURI = ""
-
-    m.top.setFocus(true)
-end sub
-
-function onKeyEvent(key as String, press as Boolean) as Boolean
-  if not press then return false
-  list = m.top.findNode("configOptions")
-  button = m.top.findNode("submit")
-  if key = "down" and button.focusedChild = invalid
-    limit = list.content.getChildren(-1, 0).count() - 1
-
-    if limit = list.itemFocused
-      m.top.setFocus(false)
-      button.setFocus(true)
-      return true
-    end if
-  else if key = "up" and button.focusedChild <> invalid
-    list.setFocus(true)
-    return true
-  end if
-  return false
-end function
-
-function onDialogButton()
-  d = m.top.dialog
-  button_text = d.buttons[d.buttonSelected]
-
-  if button_text = "OK"
-    m.focused_item.text = d.text
-    dismiss_dialog()
-    return true
-  else if button_text = "Cancel"
-    dismiss_dialog()
-    return false
-  end if
-end function
-
-
-sub show_dialog(title as String)
-  dialog = createObject("roSGNode", "KeyboardDialog")
-  dialog.title = "Enter the " + m.focused_item.id
-  dialog.buttons = ["OK", "Cancel"]
-
-  if m.focused_item.text <> "" then
-    dialog.text = m.focused_item.text
-  end if
-
-  m.top.dialog = dialog
-
-  dialog.observeField("buttonSelected", "onDialogButton")
-end sub
-
-sub dismiss_dialog()
-  m.top.dialog.close = true
-end sub
diff --git a/components/ConfigurationScene.xml b/components/ConfigurationScene.xml
deleted file mode 100644
index 6e4499ca..00000000
--- a/components/ConfigurationScene.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="ConfigScene" extends="Scene">
-  <children>
-    <label text="Enter Configuration"
-      id="prompt"
-      height="70"
-      font="font:MediumBoldSystemFont"
-      translation="[150, 150]" />
-    <ConfigList
-      id="configOptions"
-      translation="[150, 250]"
-      itemSize="[440, 40]"
-      itemSpacing="[0, 20]"
-      numRows="12" />
-    <Button
-      id="submit"
-      text="Submit"
-      showFocusFootprint="false"
-      translation="[150, 350]"
-      />
-  </children>
-  <script type="text/brightscript" uri="pkg:/components/ConfigurationScene.brs"/>
-</component>
diff --git a/components/LibItem.xml b/components/LibItem.xml
deleted file mode 100644
index d8998261..00000000
--- a/components/LibItem.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="LibItem" extends="Group">
-  <children>
-    <Label id="itemText" horizAlign="center" font="font:MediumSystemFont" height="75" />
-  </children>
-  <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged"/>
-  </interface>
-
-  <script type="text/brightscript">
-  <![CDATA[
-  sub Init()
-    m.itemText = m.top.findNode("itemText")
-    m.itemText.text = "Loading..."
-
-    updateSize()
-  end sub
-
-  sub updateSize()
-    m.itemText = m.top.findNode("itemText")
-    maxSize = m.top.getParent().itemSize
-    m.itemText.width = maxSize[0]
-
-    m.itemText.translation = [0, (maxSize[1] / 2) - 15]
-  end sub
-
-  function itemContentChanged() as void
-    m.itemText = m.top.findNode("itemText")
-    itemData = m.top.itemContent
-    m.itemText.text = itemData.labelText
-    updateSize()
-  end function
-  ]]>
-  </script>
-
-</component>
diff --git a/components/LibList.xml b/components/LibList.xml
deleted file mode 100644
index a3178c46..00000000
--- a/components/LibList.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="LibraryRow" extends="RowList">
-  <interface>
-    <field id="rowSize" type="int" />
-    <field id="libList" type="associativearray" onChange="setData" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    m.top.itemComponentName = "LibItem"
-    m.top.content = getData()
-
-    m.top.rowFocusAnimationStyle = "floatingFocus"
-    m.top.vertFocusAnimationStyle = "floatingFocus"
-
-    m.top.showRowLabel = [false]
-
-    updateSize()
-
-    m.top.setfocus(true)
-  end sub
-
-  sub updateSize()
-    m.top.numrows = 1
-    m.top.rowSize = 5
-
-    dimensions = m.top.getScene().currentDesignResolution
-
-    border = 200
-    m.top.translation = [border, border + 115]
-
-    itemWidth = (dimensions["width"] - border*2) / m.top.rowSize
-    itemHeight = 75
-
-    m.top.visible = true
-
-    ' size of the whole row
-    m.top.itemSize = [dimensions["width"] - border*2, itemHeight]
-    ' spacing between rows
-    m.top.itemSpacing = [ 0, 30 ]
-
-    ' size of the item in the row
-    m.top.rowItemSize = [ itemWidth, itemHeight ]
-    ' spacing between items in a row
-    m.top.rowItemSpacing = [ 0, 0 ]
-  end sub
-
-  function setData()
-    libs = m.top.liblist
-    rowsize = m.top.rowSize
-
-    n = libs.TotalRecordCount
-
-    ' Test for no remainder
-    if int(n/rowsize) = n/rowsize then
-      m.top.numRows = n/rowsize
-    else
-      m.top.numRows = n/rowsize + 1
-    end if
-
-    m.top.content = getData()
-  end function
-
-  function getData()
-    if m.top.libList = invalid then
-      data = CreateObject("roSGNode", "ContentNode")
-      return data
-    end if
-
-    libs = m.top.libList
-    rowsize = m.top.rowSize
-    data = CreateObject("roSGNode", "ContentNode")
-    for rownum=1 to m.top.numRows
-      row = data.CreateChild("ContentNode")
-      for i=1 to rowsize
-        index = (rownum - 1) * rowsize + i
-        if index > libs.TotalRecordCount then
-          exit for
-        end if
-        datum = libs.Items[index-1]
-        item = row.CreateChild("LibraryData")
-        item.labelText = datum.name
-        item.libraryID = datum.id
-        item.libraryType = datum.CollectionType
-        item.data = datum
-      end for
-    end for
-    return data
-  end function
-  ]]>
-  </script>
-</component>
diff --git a/components/Library.xml b/components/Library.xml
deleted file mode 100644
index b7fa4dd6..00000000
--- a/components/Library.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="Library" extends="Scene">
-  <children>
-    <LibraryRow id="LibrarySelect" />
-    <Overhang id="overhang" title="Libraries" />
-  </children>
-</component>
diff --git a/components/LibraryData.xml b/components/LibraryData.xml
deleted file mode 100644
index dcf7e3be..00000000
--- a/components/LibraryData.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="LibraryData" extends="ContentNode">
-  <interface>
-    <field id="labelText" type="string" />
-    <field id="libraryID" type="string" />
-    <field id="libraryType" type="string" />
-    <field id="data" type="associativearray" />
-  </interface>
-</component>
diff --git a/components/MovieData.xml b/components/MovieData.xml
deleted file mode 100644
index 08e2e1a1..00000000
--- a/components/MovieData.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="MovieData" extends="ContentNode">
-  <interface>
-    <field id="title" type="string" />
-    <field id="posterUrl" type="string" />
-    <field id="movieID" type="string" />
-    <field id="description" type="string" />
-    <field id="favorite" type="boolean" />
-    <field id="watched" type="boolean" />
-    <field id="seasons" type="associativearray" />
-    <field id="full_data" type="associativearray" onChange="setFields" />
-    <function name="favorite_toggle" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub setFields()
-    datum = m.top.full_data
-    m.top.title = datum.name
-    m.top.movieID = datum.id
-    if datum.posterURL <> invalid
-      m.top.posterURL = datum.posterURL
-    else
-      m.top.posterURL = ""
-    end if
-    m.top.description = datum.overview
-    m.top.favorite = datum.UserData.isFavorite
-    m.top.watched = datum.UserData.played
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/MovieItemDetails.brs b/components/MovieItemDetails.brs
deleted file mode 100644
index 7f8effa1..00000000
--- a/components/MovieItemDetails.brs
+++ /dev/null
@@ -1,114 +0,0 @@
-sub itemContentChanged()
-  itemData = m.top.itemContent.full_data
-
-  m.top.findNode("moviePoster").uri = m.top.itemContent.posterURL
-
-  ' Handle all "As Is" fields
-  setFieldText("title", itemData.name)
-  setFieldText("releaseYear", itemData.productionYear)
-  setFieldText("officialRating", itemData.officialRating)
-  setFieldText("communityRating", str(itemData.communityRating))
-  setFieldText("overview", itemData.overview)
-
-  setFieldText("runtime", stri(getRuntime()) + " mins")
-  setFieldText("ends-at", "Ends at " + getEndTime())
-
-  if itemData.genres.count() > 0
-    setFieldText("genres", itemData.genres.join(", "))
-  end if
-  director = invalid
-  for each person in itemData.people
-    if person.type = "Director"
-      director = person.name
-      exit for
-    end if
-  end for
-  if director <> invalid
-    setFieldText("director", "Director: " + director)
-  end if
-  setFieldText("video_codec", "Video: " + itemData.mediaStreams[0].displayTitle)
-  setFieldText("audio_codec", "Audio: " + itemData.mediaStreams[1].displayTitle)
-  ' TODO - cmon now. these are buttons, not words
-  if itemData.taglines.count() > 0
-    setFieldText("tagline", itemData.taglines[0])
-  end if
-  setFavoriteColor()
-  setWatchedColor()
-end sub
-
-sub setFieldText(field as string, value)
-  node = m.top.findNode(field)
-  if node = invalid then return
-
-  node.text = value
-end sub
-
-function getRuntime() as Integer
-  itemData = m.top.itemContent.full_data
-
-  ' A tick is .1ms, so 1/10,000,000 for ticks to seconds,
-  ' then 1/60 for seconds to minutess... 1/600,000,000
-  return round(itemData.RunTimeTicks / 600000000.0)
-end function
-
-function getEndTime() as string
-  itemData = m.top.itemContent.full_data
-
-  date = CreateObject("roDateTime")
-  duration_s = int(itemData.RunTimeTicks / 10000000.0)
-  date.fromSeconds(date.asSeconds() + duration_s)
-  date.toLocalTime()
-  hours = date.getHours()
-  meridian = "AM"
-  if hours = 0
-    hours = 12
-    meridian = "AM"
-  else if hours = 12
-    hours = 12
-    meridian = "PM"
-  else if hours > 12
-    hours = hours - 12
-    meridian = "PM"
-  end if
-
-  return Substitute("{0}:{1} {2}", stri(hours).trim(), stri(date.getMinutes()).trim(), meridian)
-end function
-
-sub setFavoriteColor()
-  fave = m.top.itemContent.favorite
-  fave_button = m.top.findNode("favorite-button")
-  if fave
-    fave_button.textColor = "#00ff00ff"
-    fave_button.focusedTextColor = "#269926ff"
-  else
-    fave_button.textColor = "0xddddddff"
-    fave_button.focusedTextColor = "#262626ff"
-  end if
-end sub
-
-sub setWatchedColor()
-  watched = m.top.itemContent.watched
-  watched_button = m.top.findNode("watched-button")
-  if watched
-    watched_button.textColor = "#ff0000ff"
-    watched_button.focusedTextColor = "#992626ff"
-  else
-    watched_button.textColor = "0xddddddff"
-    watched_button.focusedTextColor = "#262626ff"
-  end if
-end sub
-
-function round(f as Float) as Integer
-  ' BrightScript only has a "floor" round
-  ' This compares floor to floor + 1 to find which is closer
-  m = int(f)
-  n = m + 1
-  x = abs(f - m)
-  y = abs(f - n)
-  if y > x
-    return m
-  else
-    return n
-  end if
-end function
-
diff --git a/components/MovieItemDetails.xml b/components/MovieItemDetails.xml
deleted file mode 100644
index 5c4b769a..00000000
--- a/components/MovieItemDetails.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="MovieItemDetailScene" extends="Scene">
-  <children>
-    <LayoutGroup id="main_group" layoutDirection="horiz" >
-      <Poster id="moviePoster"
-        translation="[150,150]"
-        width="400" height="600" />
-      <LayoutGroup layoutDirection="vert" translation="[355, 150]" itemSpacings="[25]">
-        <Label id="title" font="font:LargeBoldSystemFont" />
-        <LayoutGroup layoutDirection="horiz" itemSpacings="[150]">
-          <Label id="releaseYear" />
-          <Label id="runtime" />
-          <Label id="officialRating" />
-          <Label id="communityRating" />
-          <Label id="ends-at" />
-        </LayoutGroup>
-        <Label id="genres" />
-        <Label id="director" />
-        <Label id="video_codec" />
-        <Label id="audio_codec" />
-        <ButtonGroupHoriz id="buttons" itemSpacings="[10]">
-          <Button text="Play" id="play-button" />
-          <Button text="Watched" id="watched-button" />
-          <Button text="Favorite" id="favorite-button" />
-        </ButtonGroupHoriz>
-        <Label id="tagline" />
-        <Label id="overview" />
-
-      </LayoutGroup>
-    </LayoutGroup>
-  </children>
-  <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged" />
-  </interface>
-  <script type="text/brightscript" uri="pkg:/components/MovieItemDetails.brs" />
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    main = m.top.findNode("main_group")
-    dimensions = m.top.getScene().currentDesignResolution
-
-    main.translation=[50, 50]
-
-    m.top.findNode("buttons").setFocus(true)
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/MovieItemMinimal.xml b/components/MovieItemMinimal.xml
deleted file mode 100644
index 260f7950..00000000
--- a/components/MovieItemMinimal.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="MovieItemMinimal" extends="Group">
-  <children>
-    <Label id="title"
-      horizAlign="center"
-      translation="[0,319]"
-      font="font:MediumSystemFont"
-      width="196"
-      height="65" />
-  </children>
-  <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged"/>
-  </interface>
-
-  <script type="text/brightscript">
-  <![CDATA[
-  sub Init()
-    m.title = m.top.findNode("title")
-    m.title.text = "Loading..."
-  end sub
-
-  function itemContentChanged() as void
-    ' re-declare this because init doesnt re-run
-    ' when we come back from elsewhere
-    m.title = m.top.findNode("title")
-
-    itemData = m.top.itemContent
-    m.title.text = itemData.title
-  end function
-  ]]>
-  </script>
-
-</component>
diff --git a/components/MovieList.xml b/components/MovieList.xml
deleted file mode 100644
index 7190bec8..00000000
--- a/components/MovieList.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="MovieRow" extends="RowList">
-  <interface>
-    <field id="rowSize" type="int" />
-    <field id="movieData" type="associativearray" onChange="setData" />
-    <field id="library" type="associativearray" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    m.top.itemComponentName = "ListPoster"
-    m.top.content = getData()
-
-    m.top.rowFocusAnimationStyle = "floatingFocus"
-    'm.top.vertFocusAnimationStyle = "floatingFocus"
-
-    m.top.showRowLabel = [false]
-
-    updateSize()
-
-    m.top.setfocus(true)
-  end sub
-
-  sub updateSize()
-    m.top.numrows = 1
-    m.top.rowSize = 5
-
-    dimensions = m.top.getScene().currentDesignResolution
-
-    border = 75
-    m.top.translation = [border, border + 115]
-
-    textHeight = 50
-    ' Do we decide width by rowSize, or rowSize by width...
-    itemWidth = (dimensions["width"] - border*2) / m.top.rowSize
-    itemHeight = itemWidth * 1.5 + textHeight
-
-    m.top.visible = true
-
-    ' size of the whole row
-    m.top.itemSize = [dimensions["width"] - border*2, itemHeight]
-    ' spacing between rows
-    m.top.itemSpacing = [ 0, 10 ]
-
-    ' size of the item in the row
-    m.top.rowItemSize = [ itemWidth, itemHeight ]
-    ' spacing between items in a row
-    m.top.rowItemSpacing = [ 0, 0 ]
-  end sub
-
-  function setData()
-    movieData = m.top.movieData
-    rowsize = m.top.rowSize
-
-    n = movieData.items.count()
-
-    ' Test for no remainder
-    if int(n/rowsize) = n/rowsize then
-      m.top.numRows = n/rowsize
-    else
-      m.top.numRows = n/rowsize + 1
-    end if
-
-    m.top.content = getData()
-  end function
-
-  function getData()
-    if m.top.movieData = invalid then
-      data = CreateObject("roSGNode", "ContentNode")
-      return data
-    end if
-
-    movieData = m.top.movieData
-    rowsize = m.top.rowSize
-    data = CreateObject("roSGNode", "ContentNode")
-    for rownum=1 to m.top.numRows
-      row = data.CreateChild("ContentNode")
-      for i=1 to rowsize
-        index = (rownum - 1) * rowsize + i
-        if index > movieData.items.count() then
-          exit for
-        end if
-        datum = movieData.Items[index-1]
-        item = row.CreateChild("MovieData")
-        item.full_data = datum
-      end for
-    end for
-    return data
-  end function
-
-  function onKeyEvent(key as string, press as boolean) as boolean
-    if not press then return false
-
-    if key = "down" and (m.top.itemFocused + 1) = m.top.content.getChildCount()
-      m.top.getScene().findNode("pager").setFocus(true)
-      m.top.getScene().findNode("pager").getChild(0).setFocus(true)
-      return true
-    end if
-
-    return false
-  end function
-  ]]>
-  </script>
-</component>
diff --git a/components/Movies.xml b/components/Movies.xml
deleted file mode 100644
index e67aa9c9..00000000
--- a/components/Movies.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="Movies" extends="Scene">
-  <children>
-    <MovieRow
-      id="MovieSelect"
-      visible="true"
-      />
-    <Overhang
-      id="overhang"
-      title="Movies"
-      />
-    <Rectangle id="footerBackdrop" />
-    <Pager id="pager" />
-  </children>
-</component>
diff --git a/components/Pager.xml b/components/Pager.xml
index fbc89ffa..4565c744 100644
--- a/components/Pager.xml
+++ b/components/Pager.xml
@@ -13,6 +13,8 @@
     m.top.currentPage = 0
     m.top.maxPages = 0
     m.top.layoutDirection = "horiz"
+    m.top.horizAlignment = "center"
+    m.top.vertAlignment = "center"
   end sub
 
   sub recountPages()
@@ -56,9 +58,8 @@
 
   sub updateLayout()
     dimensions = m.top.getScene().currentDesignResolution
-    width = m.top.getChildCount() * 50
-
-    m.top.translation = [(dimensions.width - width) / 2, dimensions.height - 83]
+    height = 115
+    m.top.translation = [dimensions.width / 2, dimensions.height - (height / 2)]
   end sub
 
   sub addPage(i)
diff --git a/components/TVSeasonData.xml b/components/TVSeasonData.xml
deleted file mode 100644
index 8a05df1d..00000000
--- a/components/TVSeasonData.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVSeasonData" extends="ContentNode">
-  <interface>
-    <field id="title" type="string" />
-    <field id="posterUrl" type="string" />
-    <field id="showID" type="string" />
-    <field id="description" type="string" />
-    <field id="full_data" type="associativearray" onChange="setFields" />
-    <function name="getPoster" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub setFields()
-    datum = m.top.full_data
-    m.top.title = datum.name
-    m.top.showID = datum.id
-    if datum.posterURL <> invalid
-      m.top.posterURL = datum.posterURL
-    else
-      m.top.posterURL = ""
-    end if
-    m.top.description = datum.overview
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/TVSeasonList.xml b/components/TVSeasonList.xml
deleted file mode 100644
index 83f5e5f5..00000000
--- a/components/TVSeasonList.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVSeasonRow" extends="RowList">
-  <interface>
-    <field id="rowSize" type="int" />
-    <field id="TVSeasonData" type="associativearray" onChange="setData" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  ' TODO - make this not a "row" list
-  sub init()
-    m.top.itemComponentName = "ListPoster"
-    m.top.content = getData()
-
-    'm.top.rowFocusAnimationStyle = "floatingFocus"
-    'm.top.vertFocusAnimationStyle = "floatingFocus"
-
-    m.top.showRowLabel = [false]
-
-    updateSize()
-
-    m.top.setfocus(true)
-  end sub
-
-  sub updateSize()
-    m.top.numrows = 1
-    m.top.rowSize = 5
-
-    dimensions = m.top.getScene().currentDesignResolution
-
-    border = 75
-    m.top.translation = [border, border]
-
-    textHeight = 50
-    ' Do we decide width by rowSize, or rowSize by width...
-    itemWidth = (dimensions["width"] - border*2) / m.top.rowSize
-    itemHeight = itemWidth * 1.5 + textHeight
-
-    m.top.visible = true
-
-    ' size of the whole row
-    m.top.itemSize = [dimensions["width"] - border*2, itemHeight]
-    ' spacing between rows
-    m.top.itemSpacing = [ 0, 10 ]
-
-    ' size of the item in the row
-    m.top.rowItemSize = [ itemWidth, itemHeight ]
-    ' spacing between items in a row
-    m.top.rowItemSpacing = [ 0, 0 ]
-  end sub
-
-  function setData()
-    seasonData = m.top.TVSeasonData
-    rowsize = m.top.rowSize
-
-    n = seasonData.items.count()
-
-    ' Test for no remainder
-    if int(n/rowsize) = n/rowsize then
-      m.top.numRows = n/rowsize
-    else
-      m.top.numRows = n/rowsize + 1
-    end if
-
-    m.top.content = getData()
-  end function
-
-  function getData()
-    if m.top.TVSeasonData = invalid then
-      data = CreateObject("roSGNode", "ContentNode")
-      return data
-    end if
-
-    seasonData = m.top.TVSeasonData
-    rowsize = m.top.rowSize
-    data = CreateObject("roSGNode", "ContentNode")
-    for rownum=1 to m.top.numRows
-      row = data.CreateChild("ContentNode")
-      for i=1 to rowsize
-        index = (rownum - 1) * rowsize + i
-        if index > seasonData.items.count() then
-          exit for
-        end if
-        datum = seasonData.Items[index-1]
-        item = row.CreateChild("TVSeasonData")
-        item.full_data = datum
-      end for
-    end for
-    return data
-  end function
-  ]]>
-  </script>
-</component>
diff --git a/components/TVShowData.xml b/components/TVShowData.xml
deleted file mode 100644
index 67d464b7..00000000
--- a/components/TVShowData.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVShowData" extends="ContentNode">
-  <interface>
-    <field id="title" type="string" />
-    <field id="posterUrl" type="string" />
-    <field id="showID" type="string" />
-    <field id="description" type="string" />
-    <field id="seasons" type="associativearray" />
-    <field id="nextup" type="associativearray" />
-    <field id="full_data" type="associativearray" onChange="setFields" />
-    <function name="loadSeasons" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub setFields()
-    datum = m.top.full_data
-    m.top.title = datum.name
-    m.top.showID = datum.id
-    if datum.posterURL <> invalid
-      m.top.posterURL = datum.posterURL
-    else
-      m.top.posterURL = ""
-    end if
-    m.top.description = datum.overview
-    'm.top.seasons = TVSeasons(datum.id)
-    'm.top.nextup = TVNext(datum.id)
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/TVShowItemDetails.brs b/components/TVShowItemDetails.brs
deleted file mode 100644
index 818fc91b..00000000
--- a/components/TVShowItemDetails.brs
+++ /dev/null
@@ -1,121 +0,0 @@
-sub itemContentChanged()
-  itemData = m.top.itemContent.full_data
-
-  m.top.findNode("tvshowPoster").uri = m.top.itemContent.posterURL
-
-  ' Handle all "As Is" fields
-  setFieldText("title", itemData.name)
-  setFieldText("releaseYear", itemData.productionYear)
-  setFieldText("officialRating", itemData.officialRating)
-  setFieldText("communityRating", str(itemData.communityRating))
-  setFieldText("overview", itemData.overview)
-
-  setFieldText("runtime", stri(getRuntime()) + " mins")
-
-  setFieldText("history", getHistory())
-
-  if itemData.genres.count() > 0
-    setFieldText("genres", itemData.genres.join(", "))
-  end if
-  director = invalid
-  for each person in itemData.people
-    if person.type = "Director"
-      director = person.name
-      exit for
-    end if
-  end for
-  if itemData.taglines.count() > 0
-    setFieldText("tagline", itemData.taglines[0])
-  end if
-  m.top.findNode("TVSeasonSelect").TVSeasonData = m.top.itemContent.seasons
-end sub
-
-sub setFieldText(field as string, value)
-  node = m.top.findNode(field)
-  if node = invalid then return
-
-  node.text = value
-end sub
-
-function getRuntime() as Integer
-  itemData = m.top.itemContent.full_data
-
-  ' A tick is .1ms, so 1/10,000,000 for ticks to seconds,
-  ' then 1/60 for seconds to minutess... 1/600,000,000
-  return round(itemData.RunTimeTicks / 600000000.0)
-end function
-
-function getEndTime() as string
-  itemData = m.top.itemContent.full_data
-
-  date = CreateObject("roDateTime")
-  duration_s = int(itemData.RunTimeTicks / 10000000.0)
-  date.fromSeconds(date.asSeconds() + duration_s)
-  date.toLocalTime()
-  hours = date.getHours()
-  meridian = "AM"
-  if hours = 0
-    hours = 12
-    meridian = "AM"
-  else if hours = 12
-    hours = 12
-    meridian = "PM"
-  else if hours > 12
-    hours = hours - 12
-    meridian = "PM"
-  end if
-
-  return Substitute("{0}:{1} {2}", stri(hours).trim(), stri(date.getMinutes()).trim(), meridian)
-end function
-
-function getHistory() as string
-  itemData = m.top.itemContent.full_data
-  ' Aired Fridays at 9:30 PM on ABC (US)
-
-  airwords = invalid
-  studio = invalid
-  if itemData.status = "Ended"
-    verb = "Aired"
-  else
-    verb = "Airs"
-  end if
-
-  airdays = itemData.airdays
-  airtime = itemData.airtime
-  if airtime <> invalid and airdays.count() = 1
-    airwords = airdays[0] + " at " + airtime
-  endif
-
-  if itemData.studios.count() > 0
-    studio = itemData.studios[0].name
-  end if
-
-  if studio = invalid and airwords = invalid
-    return ""
-  end if
-
-  words = verb
-  if airwords <> invalid
-    words = words + " " + airwords
-  end if
-  if studio <> invalid
-    words = words + " on " + studio
-  end if
-
-  return words
-end function
-
-function round(f as Float) as Integer
-  ' BrightScript only has a "floor" round
-  ' This compares floor to floor + 1 to find which is closer
-  m = int(f)
-  n = m + 1
-  x = abs(f - m)
-  y = abs(f - n)
-  if y > x
-    return m
-  else
-    return n
-  end if
-end function
-
diff --git a/components/TVShowItemDetails.xml b/components/TVShowItemDetails.xml
deleted file mode 100644
index 2f9b8d1b..00000000
--- a/components/TVShowItemDetails.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVShowItemDetailScene" extends="Scene">
-  <children>
-    <LayoutGroup id="main_group" layoutDirection="horiz" >
-      <Poster id="tvshowPoster"
-        translation="[150,150]"
-        width="400" height="600" />
-      <LayoutGroup layoutDirection="vert" translation="[355, 150]" itemSpacings="[25]">
-        <Label id="title" font="font:LargeBoldSystemFont" />
-        <LayoutGroup layoutDirection="horiz" itemSpacings="[150]">
-          <Label id="releaseYear" />
-          <Label id="officialRating" />
-          <Label id="communityRating" />
-        </LayoutGroup>
-        <Label id="genres" />
-        <ButtonGroupHoriz id="buttons" itemSpacings="[10]">
-          <Button text="Play" id="play-button" />
-          <Button text="Shuffle" id="shuffle-button" />
-          <Button text="Watched" id="watched-button" />
-          <Button text="Favorite" id="favorite-button" />
-        </ButtonGroupHoriz>
-        <Label id="tagline" />
-        <Label id="overview" />
-        <Label id="history" />
-
-      </LayoutGroup>
-    </LayoutGroup>
-    <!-- Next Up -->
-    <TVSeasonRow id="TVSeasonSelect" visible="true" translation="[150, 800]" />
-  </children>
-  <interface>
-    <field id="itemContent" type="node" onChange="itemContentChanged" />
-  </interface>
-  <script type="text/brightscript" uri="pkg:/components/TVShowItemDetails.brs" />
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    main = m.top.findNode("main_group")
-    dimensions = m.top.getScene().currentDesignResolution
-
-    main.translation=[50, 50]
-
-    m.top.findNode("buttons").setFocus(true)
-  end sub
-  ]]>
-  </script>
-</component>
diff --git a/components/TVShowList.xml b/components/TVShowList.xml
deleted file mode 100644
index e4182eea..00000000
--- a/components/TVShowList.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVShowRow" extends="RowList">
-  <interface>
-    <field id="rowSize" type="int" />
-    <field id="TVShowData" type="associativearray" onChange="setData" />
-  </interface>
-  <script type="text/brightscript">
-  <![CDATA[
-  sub init()
-    m.top.itemComponentName = "ListPoster"
-    m.top.content = getData()
-
-
-    m.top.rowFocusAnimationStyle = "floatingFocus"
-    'm.top.vertFocusAnimationStyle = "floatingFocus"
-
-    m.top.showRowLabel = [false]
-
-    updateSize()
-
-    m.top.setfocus(true)
-  end sub
-
-  sub updateSize()
-    m.top.numrows = 1
-    m.top.rowSize = 5
-
-    dimensions = m.top.getScene().currentDesignResolution
-
-    border = 75
-    m.top.translation = [border, border + 115]
-
-    textHeight = 50
-    ' Do we decide width by rowSize, or rowSize by width...
-    itemWidth = (dimensions["width"] - border*2) / m.top.rowSize
-    itemHeight = itemWidth * 1.5 + textHeight
-
-    m.top.visible = true
-
-    ' size of the whole row
-    m.top.itemSize = [dimensions["width"] - border*2, itemHeight]
-    ' spacing between rows
-    m.top.itemSpacing = [ 0, 10 ]
-
-    ' size of the item in the row
-    m.top.rowItemSize = [ itemWidth, itemHeight ]
-    ' spacing between items in a row
-    m.top.rowItemSpacing = [ 0, 0 ]
-  end sub
-
-  function setData()
-    tvshowData = m.top.TVShowData
-    rowsize = m.top.rowSize
-
-    n = tvshowData.items.count()
-
-    ' Test for no remainder
-    if int(n/rowsize) = n/rowsize then
-      m.top.numRows = n/rowsize
-    else
-      m.top.numRows = n/rowsize + 1
-    end if
-
-    m.top.content = getData()
-  end function
-
-  function getData()
-    if m.top.TVShowData = invalid then
-      data = CreateObject("roSGNode", "ContentNode")
-      return data
-    end if
-
-    TVShowData = m.top.TVShowData
-    rowsize = m.top.rowSize
-    data = CreateObject("roSGNode", "ContentNode")
-    for rownum=1 to m.top.numRows
-      row = data.CreateChild("ContentNode")
-      for i=1 to rowsize
-        index = (rownum - 1) * rowsize + i
-        if index > tvshowData.items.count() then
-          exit for
-        end if
-        datum = tvshowData.Items[index-1]
-        item = row.CreateChild("TVShowData")
-        item.full_data = datum
-      end for
-    end for
-    return data
-  end function
-
-  function onKeyEvent(key as string, press as boolean) as boolean
-    if not press then return false
-
-    if key = "down" and (m.top.itemFocused + 1) = m.top.content.getChildCount()
-      m.top.getScene().findNode("pager").setFocus(true)
-      m.top.getScene().findNode("pager").getChild(0).setFocus(true)
-      return true
-    end if
-
-    return false
-  end function
-  ]]>
-  </script>
-</component>
diff --git a/components/TVShows.xml b/components/TVShows.xml
deleted file mode 100644
index 8208395b..00000000
--- a/components/TVShows.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component name="TVShows" extends="Scene">
-  <children>
-    <TVShowRow
-      id="TVShowSelect"
-      visible="true"
-      />
-    <Overhang
-      id="overhang"
-      title="TV Shows"
-      />
-    <Rectangle id="footerBackdrop" />
-    <Pager id="pager" />
-  </children>
-</component>
diff --git a/source/HelperUtils.brs b/source/HelperUtils.brs
index 3b16d7e9..d714c49f 100644
--- a/source/HelperUtils.brs
+++ b/source/HelperUtils.brs
@@ -20,8 +20,10 @@ sub themeScene(scene)
   if footer_background <> invalid
     footer_background.color = scene.backgroundColor
     footer_background.width = dimensions.width
-    footer_background.height = 115
-    footer_background.translation = [0, dimensions.height - 115]
+    height = footer_background.height
+    if height = invalid or height = 0 then height = 115
+    footer_background.height = height
+    footer_background.translation = [0, dimensions.height - height]
   end if
 
   overhang = scene.findNode("overhang")