From 5f4fb2239f5ea4add88b035a1b244f576422e3c3 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Mon, 26 Sep 2022 21:26:17 -0400
Subject: [PATCH 1/2] Add appears on artist section

---
 components/IconButton.brs              |  10 +--
 components/ItemGrid/ItemGrid.brs       |  17 ++---
 components/ItemGrid/LoadItemsTask2.brs |  10 ++-
 components/data/MusicAlbumData.xml     |   5 +-
 components/data/MusicSongData.xml      |   6 +-
 components/music/AlbumGrid.brs         |  16 ++++-
 components/music/AlbumGrid.xml         |   1 +
 components/music/ArtistView.brs        |  91 +++++++++++++++++++------
 components/music/ArtistView.xml        |  18 +++--
 components/section/section.brs         |  34 +++++++++
 components/section/section.xml         |  22 ++++--
 components/section/sectionScroller.brs |  25 ++++++-
 images/icons/album.png                 | Bin 0 -> 5253 bytes
 images/icons/cassette.png              | Bin 0 -> 2024 bytes
 source/Main.brs                        |   6 ++
 source/ShowScenes.brs                  |  10 +--
 source/api/Items.brs                   |  63 +++++++++++++----
 17 files changed, 255 insertions(+), 79 deletions(-)
 create mode 100644 images/icons/album.png
 create mode 100644 images/icons/cassette.png

diff --git a/components/IconButton.brs b/components/IconButton.brs
index 20176757..22113af5 100644
--- a/components/IconButton.brs
+++ b/components/IconButton.brs
@@ -69,17 +69,11 @@ end sub
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
 
-    if key = "OK" and m.top.hasFocus()
-        ' Simply toggle the selected field to trigger the next event
-        m.top.selected = not m.top.selected
-        return true
-    end if
-
-    if key = "right" and m.top.hasFocus()
+    if key = "right" and m.top.focus
         m.top.escape = "right"
     end if
 
-    if key = "left" and m.top.hasFocus()
+    if key = "left" and m.top.focus
         m.top.escape = "left"
     end if
 
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index a637138c..caa62b99 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -163,25 +163,16 @@ sub loadInitialItems()
         m.loadItemsTask.itemId = m.top.parentItem.Id
     else if getCollectionType() = "music"
         ' Default Settings
+        m.loadItemsTask.recursive = true
+        m.itemGrid.itemSize = "[290, 290]"
 
-        if m.voiceBox.text <> ""
-            m.loadItemsTask.recursive = true
-        else
-            m.loadItemsTask.recursive = false
-            m.itemGrid.itemSize = "[290, 290]"
-        end if
-
-        m.loadItemsTask.itemType = "MusicArtist,MusicAlbum"
+        m.loadItemsTask.itemType = "MusicArtist"
         m.loadItemsTask.itemId = m.top.parentItem.Id
 
         m.view = get_user_setting("display.music.view")
 
-        if m.view = "music-artist"
-            m.loadItemsTask.recursive = true
-            m.loadItemsTask.itemType = "MusicArtist"
-        else if m.view = "music-album"
+        if m.view = "music-album"
             m.loadItemsTask.itemType = "MusicAlbum"
-            m.loadItemsTask.recursive = true
         end if
     else if m.top.parentItem.collectionType = "livetv"
         m.loadItemsTask.itemType = "TvChannel"
diff --git a/components/ItemGrid/LoadItemsTask2.brs b/components/ItemGrid/LoadItemsTask2.brs
index 75483317..7b632d29 100644
--- a/components/ItemGrid/LoadItemsTask2.brs
+++ b/components/ItemGrid/LoadItemsTask2.brs
@@ -77,6 +77,12 @@ sub loadItems()
     else if m.top.view = "Genres"
         url = "Genres"
         params.append({ UserId: get_setting("active_user") })
+    else if m.top.ItemType = "MusicArtist"
+        url = "Artists"
+        params.append({
+            UserId: get_setting("active_user")
+        })
+        params.IncludeItemTypes = ""
     else
         url = Substitute("Users/{0}/Items/", get_setting("active_user"))
     end if
@@ -110,7 +116,9 @@ sub loadItems()
                 tmp = CreateObject("roSGNode", "FolderData")
             else if item.Type = "Studio"
                 tmp = CreateObject("roSGNode", "FolderData")
-            else if item.Type = "MusicArtist" or item.Type = "MusicAlbum"
+            else if item.Type = "MusicAlbum"
+                tmp = CreateObject("roSGNode", "MusicAlbumData")
+            else if item.Type = "MusicArtist"
                 tmp = CreateObject("roSGNode", "MusicArtistData")
             else if item.Type = "Audio"
                 tmp = CreateObject("roSGNode", "MusicSongData")
diff --git a/components/data/MusicAlbumData.xml b/components/data/MusicAlbumData.xml
index 9d86bd36..c418dfdd 100644
--- a/components/data/MusicAlbumData.xml
+++ b/components/data/MusicAlbumData.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<component name="MusicAlbumData" extends="ContentNode">
+<component name="MusicAlbumData" extends="JFContentItem">
   <interface>
     <field id="id" type="string" />
     <field id="title" type="string" />
     <field id="image" type="node" onChange="setPoster" />
-    <field id="posterURL" type="string" />
     <field id="overview" type="string" />
-    <field id="type" type="string" value="Episode" />
-    <field id="json" type="assocarray" onChange="setFields" />
   </interface>
   <script type="text/brightscript" uri="MusicAlbumData.brs" />
 </component>
diff --git a/components/data/MusicSongData.xml b/components/data/MusicSongData.xml
index 75c4b896..b9aea8b0 100644
--- a/components/data/MusicSongData.xml
+++ b/components/data/MusicSongData.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<component name="MusicSongData" extends="ContentNode">
+<component name="MusicSongData" extends="JFContentItem">
   <interface>
     <field id="id" type="string" />
     <field id="title" type="string" />
     <field id="trackNumber" type="integer" />
     <field id="image" type="node" onChange="setPoster" />
-    <field id="posterURL" type="string" />
     <field id="overview" type="string" />
-    <field id="type" type="string" value="Song" />
-    <field id="json" type="assocarray" onChange="setFields" />
-    <field id="favorite" type="boolean" />
   </interface>
   <script type="text/brightscript" uri="MusicSongData.brs" />
 </component>
diff --git a/components/music/AlbumGrid.brs b/components/music/AlbumGrid.brs
index e029053c..8c241087 100644
--- a/components/music/AlbumGrid.brs
+++ b/components/music/AlbumGrid.brs
@@ -15,10 +15,15 @@ function getData()
 
     for each album in albumData.items
         gridAlbum = CreateObject("roSGNode", "ContentNode")
+
+        if not isValid(album.posterURL) or album.posterURL = ""
+            album.posterURL = "pkg:/images/icons/album.png"
+        end if
+
         gridAlbum.shortdescriptionline1 = album.title
         gridAlbum.HDGRIDPOSTERURL = album.posterURL
         gridAlbum.hdposterurl = album.posterURL
-        gridAlbum.SDGRIDPOSTERURL = album.SDGRIDPOSTERURL
+        gridAlbum.SDGRIDPOSTERURL = album.posterURL
         gridAlbum.sdposterurl = album.posterURL
 
         data.appendChild(gridAlbum)
@@ -47,6 +52,15 @@ function onKeyEvent(key as string, press as boolean) as boolean
             m.top.escape = key
             return true
         end if
+    else if key = "down"
+        totalCount = m.top.MusicArtistAlbumData.items.count()
+        totalRows = div_ceiling(totalCount, 5)
+        currentRow = div_ceiling(m.top.itemFocused + 1, 5)
+
+        if currentRow = totalRows
+            m.top.escape = key
+            return true
+        end if
     end if
 
     return false
diff --git a/components/music/AlbumGrid.xml b/components/music/AlbumGrid.xml
index 37221f33..bdf18455 100644
--- a/components/music/AlbumGrid.xml
+++ b/components/music/AlbumGrid.xml
@@ -5,4 +5,5 @@
     <field id="escape" type="string" alwaysNotify="true" />
   </interface>
   <script type="text/brightscript" uri="AlbumGrid.brs" />
+  <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
 </component>
diff --git a/components/music/ArtistView.brs b/components/music/ArtistView.brs
index 2eaa868d..fdd68393 100644
--- a/components/music/ArtistView.brs
+++ b/components/music/ArtistView.brs
@@ -8,8 +8,16 @@ sub init()
     m.albumHeader = m.top.findNode("albumHeader")
     m.albumHeader.text = tr("Albums")
 
+    m.appearsOnHeader = m.top.findNode("appearsOnHeader")
+    m.appearsOnHeader.text = tr("AppearsOn")
+
+    m.appearsOn = m.top.findNode("appearsOn")
+    m.appearsOn.observeField("escape", "onAppearsOnEscape")
+    m.appearsOn.observeField("MusicArtistAlbumData", "onAppearsOnData")
+
     m.albums = m.top.findNode("albums")
     m.albums.observeField("escape", "onAlbumsEscape")
+    m.albums.observeField("MusicArtistAlbumData", "onAlbumsData")
 
     m.pageLoadAnimation = m.top.findNode("pageLoad")
     m.pageLoadAnimation.control = "start"
@@ -33,15 +41,47 @@ sub init()
     createDialogPallete()
 end sub
 
+sub onAlbumsData()
+    ' We have no album data
+    if m.albums.MusicArtistAlbumData.TotalRecordCount = 0
+        m.sectionScroller.removeChild(m.top.findNode("albumsSlide"))
+        m.sectionNavigation.removeChild(m.top.findNode("albumsLink"))
+        m.top.findNode("appearsOnSlide").callFunc("scrollUpToOnDeck")
+    end if
+end sub
+
+sub onAppearsOnData()
+    ' We have no appears on data
+    if m.appearsOn.MusicArtistAlbumData.TotalRecordCount = 0
+        m.sectionScroller.removeChild(m.top.findNode("appearsOnSlide"))
+        m.sectionNavigation.removeChild(m.top.findNode("appearsOnLink"))
+    end if
+end sub
+
 sub onSectionScrollerChange()
     m.overhang.isVisible = (m.sectionScroller.displayedIndex = 0)
 end sub
 
+sub OnScreenShown()
+    m.sectionScroller.focus = true
+
+    if m.sectionScroller.displayedIndex = 0
+        m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
+        m.top.selectedButtonIndex = 0
+        m.buttonGrp.setFocus(true)
+    else
+        m.overhang.opacity = "0"
+        m.overhang.isVisible = false
+        m.overhang.opacity = "1"
+    end if
+end sub
+
 sub OnScreenHidden()
     if not m.overhang.isVisible
         m.overhang.disableMoveAnimation = true
         m.overhang.isVisible = true
         m.overhang.disableMoveAnimation = false
+        m.overhang.opacity = "1"
     end if
 end sub
 
@@ -50,6 +90,18 @@ sub onAlbumsEscape()
         m.sectionNavigation.selected = m.sectionScroller.displayedIndex - 1
     else if m.albums.escape = "left"
         m.sectionNavigation.setFocus(true)
+    else if m.albums.escape = "down"
+        if m.sectionScroller.displayedIndex + 1 < m.sectionNavigation.getChildCount()
+            m.sectionNavigation.selected = m.sectionScroller.displayedIndex + 1
+        end if
+    end if
+end sub
+
+sub onAppearsOnEscape()
+    if m.appearsOn.escape = "up"
+        m.sectionNavigation.selected = m.sectionScroller.displayedIndex - 1
+    else if m.appearsOn.escape = "left"
+        m.sectionNavigation.setFocus(true)
     end if
 end sub
 
@@ -95,7 +147,6 @@ sub pageContentChanged()
     ' Populate scene data
     setScreenTitle(item.json)
     setPosterImage(item.posterURL)
-    setOnScreenTextValues(item.json)
 end sub
 
 sub setScreenTitle(json)
@@ -129,10 +180,12 @@ sub setBackdropImage(data)
     end if
 end sub
 
-' Populate on screen text variables
-sub setOnScreenTextValues(json)
-    if isValid(json)
-        setFieldTextValue("overview", json.overview)
+' Event fired when page data is loaded
+sub artistOverviewChanged()
+    overviewContent = m.top.artistOverview
+
+    if isValid(overviewContent)
+        setFieldTextValue("overview", overviewContent)
     end if
 end sub
 
@@ -194,19 +247,17 @@ sub createDialogPallete()
     }
 end sub
 
-sub OnScreenShown()
-    m.sectionScroller.focus = true
-
-    if m.sectionScroller.displayedIndex = 0
-        m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
-        m.top.selectedButtonIndex = 0
-        m.buttonGrp.setFocus(true)
-    end if
-end sub
-
 function onKeyEvent(key as string, press as boolean) as boolean
 
     if m.buttonGrp.isInFocusChain()
+        if key = "OK"
+            if press
+                selectedButton = m.buttonGrp.getChild(m.top.selectedButtonIndex)
+                selectedButton.selected = not selectedButton.selected
+                return true
+            end if
+        end if
+
         if key = "left"
             if m.top.selectedButtonIndex > 0
                 m.previouslySelectedButtonIndex = m.top.selectedButtonIndex
@@ -241,11 +292,13 @@ function onKeyEvent(key as string, press as boolean) as boolean
         end if
 
         if key = "down"
-            selectedButton = m.buttonGrp.getChild(m.top.selectedButtonIndex)
-            selectedButton.focus = false
+            if m.sectionNavigation.getChildCount() > 1
+                selectedButton = m.buttonGrp.getChild(m.top.selectedButtonIndex)
+                selectedButton.focus = false
 
-            m.top.selectedButtonIndex = 0
-            m.sectionNavigation.selected = m.sectionScroller.displayedIndex + 1
+                m.top.selectedButtonIndex = 0
+                m.sectionNavigation.selected = m.sectionScroller.displayedIndex + 1
+            end if
         end if
     end if
 
diff --git a/components/music/ArtistView.xml b/components/music/ArtistView.xml
index f02c2edd..0c6f728c 100644
--- a/components/music/ArtistView.xml
+++ b/components/music/ArtistView.xml
@@ -19,20 +19,27 @@
         </LayoutGroup>
       </Section>
 
-      <Section id="slide-2" translation="[0, 1050]" defaultFocusID="albums">
+      <Section id="albumsSlide" translation="[0, 950]" defaultFocusID="albums">
         <Rectangle id='albumRect' translation="[0, 0]" width="1920" height="1080" color="#000000" opacity=".75" />
         <Label id="albumHeader" translation="[120, 50]" font="font:LargeSystemFont" />
         <AlbumGrid id="albums" translation="[120, 150]" vertFocusAnimationStyle="fixedFocus" basePosterSize="[300, 300]" numColumns="5" numRows="99" caption1NumLines="1" itemSpacing="[50, 50]" />
       </Section>
+
+      <Section id="appearsOnSlide" translation="[0, 1100]" defaultFocusID="appearsOn">
+        <Rectangle id='appearsOnRect' translation="[0, 0]" width="1920" height="1080" color="#000000" opacity=".75" />
+        <Label id="appearsOnHeader" translation="[120, 50]" font="font:LargeSystemFont" />
+        <AlbumGrid id="appearsOn" translation="[120, 150]" vertFocusAnimationStyle="fixedFocus" basePosterSize="[300, 300]" numColumns="5" numRows="99" caption1NumLines="1" itemSpacing="[50, 50]" />
+      </Section>
+
     </SectionScroller>
 
     <bgv_ButtonGroupVert id="sectionNavigation" translation="[-100, 175]" itemSpacings="[10]">
       <sob_SlideOutButton background="#070707" focusBackground="#00a4dc" highlightBackground="#555555" padding="20" icon="pkg:/images/icons/details.png" text="Details" height="50" width="60" />
-      <sob_SlideOutButton background="#070707" focusBackground="#00a4dc" highlightBackground="#555555" padding="20" icon="pkg:/images/icons/cd.png" text="Albums" height="50" width="60" />
+      <sob_SlideOutButton id="albumsLink" background="#070707" focusBackground="#00a4dc" highlightBackground="#555555" padding="20" icon="pkg:/images/icons/cd.png" text="Albums" height="50" width="60" />
+      <sob_SlideOutButton id="appearsOnLink" background="#070707" focusBackground="#00a4dc" highlightBackground="#555555" padding="20" icon="pkg:/images/icons/cassette.png" text="Appears On" height="50" width="60" />
     </bgv_ButtonGroupVert>
 
-    <Animation id="pageLoad" duration=".5" repeat="false">
-      <Vector2DFieldInterpolator key="[0.0, .5]" keyValue="[[0, 1050], [0, 750]]" fieldToInterp="slide-2.translation" />
+    <Animation id="pageLoad" duration="1" repeat="false">
       <Vector2DFieldInterpolator key="[0.5, 1.0]" keyValue="[[-100, 175], [40, 175]]" fieldToInterp="sectionNavigation.translation" />
     </Animation>
 
@@ -40,7 +47,10 @@
   <interface>
     <field id="pageContent" type="node" onChange="pageContentChanged" />
     <field id="musicArtistAlbumData" type="assocarray" alias="albums.MusicArtistAlbumData" />
+    <field id="musicArtistAppearsOnData" type="assocarray" alias="appearsOn.MusicArtistAlbumData" />
+    <field id="artistOverview" type="string" onChange="artistOverviewChanged" />
     <field id="musicAlbumSelected" alias="albums.itemSelected" />
+    <field id="appearsOnSelected" alias="appearsOn.itemSelected" />
     <field id="playArtistSelected" alias="play.selected" />
     <field id="instantMixSelected" alias="instantMix.selected" />
     <field id="selectedButtonIndex" type="integer" value="-1" />
diff --git a/components/section/section.brs b/components/section/section.brs
index 98dd6944..e62d48c5 100644
--- a/components/section/section.brs
+++ b/components/section/section.brs
@@ -15,6 +15,16 @@ sub init()
     m.scrollOffBottomPosition = m.top.findNode("scrollOffBottomPosition")
     m.scrollOffBottomOpacity = m.top.findNode("scrollOffBottomOpacity")
 
+    m.scrollUpToOnDeckAnimation = m.top.findNode("scrollUpToOnDeckAnimation")
+    m.scrollUpToOnDeckPosition = m.top.findNode("scrollUpToOnDeckPosition")
+
+    m.scrollDownToOnDeckAnimation = m.top.findNode("scrollDownToOnDeckAnimation")
+    m.scrollDownToOnDeckPosition = m.top.findNode("scrollDownToOnDeckPosition")
+
+    m.scrollOffOnDeckAnimation = m.top.findNode("scrollOffOnDeckAnimation")
+    m.scrollOffOnDeckPosition = m.top.findNode("scrollOffOnDeckPosition")
+
+    m.top.observeField("translation", "onTranslationChange")
     m.top.observeField("id", "onIDChange")
     m.top.observeField("focusedChild", "onFocusChange")
 end sub
@@ -31,6 +41,18 @@ sub onIDChange()
 
     m.scrollOffBottomPosition.fieldToInterp = m.top.id + ".translation"
     m.scrollOffBottomOpacity.fieldToInterp = m.top.id + ".opacity"
+
+    m.scrollUpToOnDeckPosition.fieldToInterp = m.top.id + ".translation"
+
+    m.scrollDownToOnDeckPosition.fieldToInterp = m.top.id + ".translation"
+
+    m.scrollOffOnDeckPosition.fieldToInterp = m.top.id + ".translation"
+end sub
+
+sub onTranslationChange()
+    m.startingPosition = m.top.translation
+    m.scrollOffBottomPosition.keyValue = "[[0, 0], [" + str(m.startingPosition[0]) + ", " + str(m.startingPosition[1]) + "]]"
+    m.top.unobserveField("translation")
 end sub
 
 sub showFromTop()
@@ -49,6 +71,18 @@ sub scrollOffTop()
     m.scrollOffTopAnimation.control = "start"
 end sub
 
+sub scrollUpToOnDeck()
+    m.scrollUpToOnDeckAnimation.control = "start"
+end sub
+
+sub scrollDownToOnDeck()
+    m.scrollDownToOnDeckAnimation.control = "start"
+end sub
+
+sub scrollOffOnDeck()
+    m.scrollOffOnDeckAnimation.control = "start"
+end sub
+
 sub onFocusChange()
     defaultFocusElement = m.top.findNode(m.top.defaultFocusID)
 
diff --git a/components/section/section.xml b/components/section/section.xml
index ffba7582..9cfdd502 100644
--- a/components/section/section.xml
+++ b/components/section/section.xml
@@ -3,19 +3,28 @@
     <children>
         <Animation id="showFromBottomAnimation" duration="0.5" repeat="false">
             <Vector2DFieldInterpolator id="showFromBottomPosition" key="[0.0, 1.0]" keyValue="[[0, 750], [0, 0]]" fieldToInterp="" />
-            <FloatFieldInterpolator id="showFromBottomOpacity" key="[0.0, 1.0]" keyValue="[0.75, 0.95]" fieldToInterp="" />
+            <FloatFieldInterpolator id="showFromBottomOpacity" key="[0.0, 1.0]" keyValue="[0.55, 0.95]" fieldToInterp="" />
         </Animation>
         <Animation id="showFromTopAnimation" duration="0.5" repeat="false">
             <Vector2DFieldInterpolator id="showFromTopPosition" key="[0.0, 1.0]" keyValue="[[0, -1080], [0, 0]]" fieldToInterp="" />
-            <FloatFieldInterpolator id="showFromTopOpacity" key="[0.0, 1.0]" keyValue="[0.75, 0.95]" fieldToInterp="" />
+            <FloatFieldInterpolator id="showFromTopOpacity" key="[0.0, 1.0]" keyValue="[0.55, 0.95]" fieldToInterp="" />
         </Animation>
         <Animation id="scrollOffBottomAnimation" duration="0.5" repeat="false">
-            <Vector2DFieldInterpolator id="scrollOffBottomPosition" key="[0.0, 1.0]" keyValue="[[0, 0], [0, 750]]" fieldToInterp="" />
-            <FloatFieldInterpolator id="scrollOffBottomOpacity" key="[0.0, 1.0]" keyValue="[0.95, 0.75]" fieldToInterp="" />
+            <Vector2DFieldInterpolator id="scrollOffBottomPosition" key="[0.0, 1.0]" keyValue="[]" fieldToInterp="" />
+            <FloatFieldInterpolator id="scrollOffBottomOpacity" key="[0.0, 1.0]" keyValue="[0.95, 0.55]" fieldToInterp="" />
         </Animation>
         <Animation id="scrollOffTopAnimation" duration="0.5" repeat="false">
             <Vector2DFieldInterpolator id="scrollOffTopPosition" key="[0.0, 1.0]" keyValue="[[0, 0], [0, -1080]]" fieldToInterp="" />
-            <FloatFieldInterpolator id="scrollOffTopOpacity" key="[0.0, 1.0]" keyValue="[0.95, 0.75]" fieldToInterp="" />
+            <FloatFieldInterpolator id="scrollOffTopOpacity" key="[0.0, 1.0]" keyValue="[0.95, 0.55]" fieldToInterp="" />
+        </Animation>
+        <Animation id="scrollUpToOnDeckAnimation" duration="0.5" repeat="false">
+            <Vector2DFieldInterpolator id="scrollUpToOnDeckPosition" key="[0.0, 1.0]" keyValue="[[0, 1100], [0, 950]]" fieldToInterp="" />
+        </Animation>
+        <Animation id="scrollDownToOnDeckAnimation" duration="0.5" repeat="false">
+            <Vector2DFieldInterpolator id="scrollDownToOnDeckPosition" key="[0.0, 1.0]" keyValue="[[0, 0], [0, 950]]" fieldToInterp="" />
+        </Animation>
+        <Animation id="scrollOffOnDeckAnimation" duration="0.5" repeat="false">
+            <Vector2DFieldInterpolator id="scrollOffOnDeckPosition" key="[0.0, 1.0]" keyValue="[[0, 950], [0, 1080]]" fieldToInterp="" />
         </Animation>
     </children>
     <interface>
@@ -24,6 +33,9 @@
         <function name="showFromBottom" />
         <function name="scrollOffTop" />
         <function name="scrollOffBottom" />
+        <function name="scrollUpToOnDeck" />
+        <function name="scrollDownToOnDeck" />
+        <function name="scrollOffOnDeck" />
     </interface>
     <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
     <script type="text/brightscript" uri="section.brs" />
diff --git a/components/section/sectionScroller.brs b/components/section/sectionScroller.brs
index 9749813e..d502bcb6 100644
--- a/components/section/sectionScroller.brs
+++ b/components/section/sectionScroller.brs
@@ -24,13 +24,34 @@ sub displayedIndexChanged()
     displayedSection = m.top.getChild(m.top.displayedIndex)
     displayedSection.setFocus(true)
 
+    onDeckSection = invalid
+    previouslyOnDeckSection = invalid
+
+    if m.top.displayedIndex + 1 <= (m.top.getChildCount() - 1)
+        onDeckSection = m.top.getChild(m.top.displayedIndex + 1)
+    end if
+
+    if m.top.displayedIndex + 2 <= (m.top.getChildCount() - 1)
+        previouslyOnDeckSection = m.top.getChild(m.top.displayedIndex + 2)
+    end if
+
     ' Move sections either up or down depending on what index we're moving to
     if m.top.displayedIndex > m.previouslyDisplayedSection
-        m.top.getChild(m.previouslyDisplayedSection).callFunc("scrollOffTop")
+        for i = m.previouslyDisplayedSection to m.top.displayedIndex - 1
+            m.top.getChild(i).callFunc("scrollOffTop")
+        end for
+
         displayedSection.callFunc("showFromBottom")
+        if isValid(onDeckSection)
+            onDeckSection.callFunc("scrollUpToOnDeck")
+        end if
     else if m.top.displayedIndex < m.previouslyDisplayedSection
-        m.top.getChild(m.previouslyDisplayedSection).callFunc("scrollOffBottom")
+        m.top.getChild(m.top.displayedIndex + 1).callFunc("scrollDownToOnDeck")
         displayedSection.callFunc("showFromTop")
+
+        if isValid(previouslyOnDeckSection)
+            previouslyOnDeckSection.callFunc("scrollOffOnDeck")
+        end if
     end if
 
     m.previouslyDisplayedSection = m.top.displayedIndex
diff --git a/images/icons/album.png b/images/icons/album.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6573c67d49700b33004a0ee101ff8690b7bc324
GIT binary patch
literal 5253
zcma)A={po~*Z$3nZ7`OQeUKKi4P#dsl#oGW%`(X{mKah*7_z02ipWk9Nw$bY#!h6-
zk_e%(?`wv6J%7Oayzi&`KKHrKxz2}k&WHQ4iP2RAvj8&y0HLpU*%ScCF@*pox?|W0
z!Yu>9ZK!`)>qfxna)yj;;WaKYoB`T^LGiINJZd0>H{ehltPHRQoG2eF-J^!dRaX=r
z69X*lKQTji*m0KW7%-y8BJ|d8$o5x?#0B)h{?Z@P)bF4b&VUhG_incfX2$ZG?pG)T
za~W`Og3EM(^S{vjm%!=r>yr=+-~e>s{|!V30E#Ai7(AQUg#Prv)0^gJCYbkJL(kIu
zwZJQJAR66i7lAI&VfmdRd_o7`By3BDoGOz5mzltfPhUw6<RS|K9gJ^8EW|iNM57Mv
ziOeewD*aj<vCnuxV^A}F#Uy2oRa_41cPGM=w;YP$i?0gn>@&_u-ViP<l>u+|ah-Dw
z^>4;Zf9bgTV8NRA;<dTdNO2j7=taRUeoz{5K9mm^bjajhdLC2<Ck|qGY2HlAbine7
z!{*Fv+P7dUjxGq8o1eH+zUR=-bWS@)2(;g>=E)yxiUqjTNwsjTW{PYyAt|I$!Uo{D
zn%?it@-Rcm-lo(B{zps@Lc!idHj6O+Pmhc)k0pUEd9P=5#@K$1R;Q-Ozybx7Y1uy^
zWe0=xlT!BDaI8V*_EG30kVUQFKWZ=qY$O`#tDOgHovSwgY7R`UV#~eKgH<md_Ex?P
zWrkw<ugctv*<q}nh`+;&$F&GBS$@T8od#AWhe+m%(l8dh%|oyKd+=O9HrbBP4!i%$
ztQo;l`sA-O{!QKv9kE{XPgvMOXc(83K|{Ih>*#e)(2xh#wjsu>sULR~-Z6U$Zk@St
z7yt`{0iN$AC2)-}?wd#WAUXeM2ZJD6scxXF=#F#v2|u>&*g@kJV<a65n5p>T%A$<c
zVlHaPZQb;<4MK%M!8L)y0~l%T(WM&tD{)N{7pv~%X+epd6W5Pkdkw7ZC~b}AmCMh4
zxh#qSs0dTLqvYPAug<r7{fA8igh2JxOz!$jgNLs7r}X5_XS#TqSiu%`m1p_uw3SHB
z8fj&&>5cTmC<|(Q#w4rwBg>W|-4zvJV$Pb7PWkRyFmrZvBmC!!?Be%Qm+su}hLGjV
zCG8e;wz<rsT&dg||FU%YxW|5m{viTlx#^uAv*mQ_j{3fPIy_jddtMMsWZ@qk?+8=r
z{cAOWSGDBl%+;C$)sq3aT)W<`jq>=W$YXq7yQ`DR3<3(a4zsvxZ<WABzMCdGdP1!u
zYp(YEwVp<S>KkhjcT)`4z(b;q$rzo=(y&(-4`3dmb%%ayE2w*)lhj})5t7x7_>U$Z
zN6PZ~wI3PV?I@1>&ZWl>=oeS*_HRNan_O1U*G^<O7>nKkvLl(H209kxr#GstFN~cS
zGwsva0%Y}%ilf+)A1t5Ve7_hKt|eBLQNgDHE^JR2-|as+lHjlEm>;EXh<^5j52!lT
zTo+8~vIW__i!4%x!+Q$H>-&5^=4wip5QLbNR^^e>u-<+{<1HhQTfW}&Mmh^NQ+12|
zTLR}mNh{NZ^$P-TA5r<vfYOe@>R~@^O;i76ezuGi!imdE0oi=QU=ROc?Stk%_XCNk
z6Z671Z>xQpW8Ja)5<U-1VjKQ_lvf>6U@7W7iDhRj-7Em)!=C-d6$MVXK;+vfu}M)v
z_X5e51P4ZYyT}P)p*iV7?KN#F@AmRfoevBF;e}9siUj=*&v!^}Ujh$@`yyBc+2u15
zZFp}=qi|5+44*;`)#}3rr3{eaS@#vLvk1Ume#AzTY@46uz<fCYd6c$oxCK><Jj(R1
zF{E=P4NJBG%w6PoJ%5jlQ(8D%Wsr3-&Ve!+V+n9i%+!qU^_|2aDu3*C_l|~Y^5O?~
zZ`mC#worsooT8OTsr%=n*~l{D2g#<hA{IVB-);D@n3tK}KjE{Wz$szXo>}pT0WALs
zia8KDnnYTvrS?TKd)}Sqc2W1Y-EFt&g$Rnl2ppqFS37NnzG8L|#Q|k1t#q~T8Yw6J
zFlU?qvT2mY^v2E2pXl;vik~doDJ*2Fq#eaJ_uj>%76LlOmP2n$-6<8fQ-A7etl??Z
z3yCy=s3M$cxnG7$$7ToK=5wGoq0Nh^g@SDpNI=;t881UCo>ikce6V)*-Sr*SNNs((
zWg;U!2M1df!VxHe&d|SW;h$~F4_jImkJ~A2@EC|e3A1OPznj~f2*3HjXvYy3_k6(n
z#qTGBvRV$HLZ4@0Z-%{f`jQv_VnbH5vCl0n#w|VZX9!kcbz0<K!}^Atpu-GVZrSsU
zdrol~TQ%xRyC%4@A-<|n{JpXvYb(JexojcF<1)8S#}zy<5$jF+b#Os?LeXVpp`{?^
z1dHB~bfylBxDn!EluQ$%cGf)?97Y>T#qH%}GXg#}vQBiTLxkT<qaLFt=ODeoeH|#V
z8&{%QwDm4O`1h1gKRtnzMaB2?_x9GHD_%V#y^fgUK7GJ?UJQcCldWOftsiZ{dYiPg
zbQpb~UdCK0^Bu{ulR2HyuT^e&IZ$c&83@33!f+49Xb#0E?DWk%4>GMMoei&Gr58{k
zq4FF6MR%<OhRekK8}ZI(7PmE6N^d+U>JpvlNZfjv!&}PF3<TXCfG)0>>1^ye*W`v$
zN=fjCap6AYEhw7~gt*b@kl}pv;GiOBz_<swsG2%B(?E#Z)U_u&O8^t$<=yUukRoAs
z)Ix^Jc<rSDMN{2ueByXDJ3X=H@dtD%EuFmFu*4*AH>$1NCBjsxzep|zU<M}*jKGNF
z&!d!YA{Hni=_y%_Mm@(tRL6zfUaXPcioiW9k~V~B(5(7-?zz10_MMtV#wYj-U;X9k
z{y56GC8xOD*yYO)xvSeZ=neq+MauhJ1jf?a;cP^}w26<F)JM(S;jrtcC-ffbe(M-V
zK#0QUq5kDmzqy}>{JYbcuhpZF`STFnCvN&^kyloy&%ru;nSe<{_eU;(rz{b^ZQSi|
zt;>=XhE?$+)!?>&Ua^vJikr{GAcRFaqVi`NZzAvXH5)U(HrTobTK!&!Nu@h?l!Xo;
zsv`)?xP7-@HhtX!3r9PjEF^ZFDn7f50fLtfRuWqJu12Wf$XuNv)M=M5<xpJ4A<sJz
zUd;|6c5;L4`>ntHVPw_Htr9BVt*gpz=3CmIn<;Pp#Je01R|nY6hn@Dj=bSa=`cm$F
z!8~$HTTL8fhDZUW%JFu*wfJpM(?vz4O&&NSwtZ#N>$s-OU5p-lrMDz8$n^U?-+x+s
z7QiFjtsX-_q1V@CK#WQqx*iL@&iwu5QRD%|?6WO0bWHAYfNUh869Qs;-74dTmzH!t
zA{=e<Q!Ejfl#EB-p)@@h(Odtd)h0V|dbef93YJEyeBQ7VHkMac-2kC@?zzU?!>3J*
zs2HeT<AmbGrh(6{QNn9S?zPhZ9}yO~itRqNcRkbud2)Mtjwi*yT@?`f)qBJMMy54I
zAKgKkc<mWzyl?iRQ~y4LT|U5Yq+oJw0RI_^;;)7yD*h(F1f+CdTr~G=sE`K0ImjK%
z@q)rhYk4ScL6NOJfh8cvw$e~pYzuOO7hWP!7^W-of+WV~LPa_cXlRB!3U%IG?9s7w
zqHOBXjItuUDFH~JR~%p#E$1Q>f~$yF!S)FXSrWc^hFYC@(h$$jsC~(qLs;tu#lyEH
zO&|g_?IIt=yQYwL4*&Rvs@y<S6)N!Y(+q&gt2NdJxJat+i9~Vhw<#}~{|K?DrT+`!
zMUQ{xT*yt=HEXj<w++*BFRD9US(R++bVQjuiTiueK$ZE1%9nvY9jEu2j^X|l8;fWY
zj~A;ye9NiU8^ObkAo~NQJvgK;u?wH>lIJhtD$LrnJFd&S2z4jGokvoF{nDrIaC~OF
z1BN<w?U-OhjlpM2Srcz<Dy7i7jIN5LTY*v5diMTM@REKG<<O=EZp0sDTn`%V5`X42
zOpQ*AQ}9Xu-1MEqC5Gl@Kfca!u72g%Q!bgr+pfFCTSiQ|k0;|Ye*4h@o*>&uD7bj;
zp?uk*^Ba#_KjV;yK}CeXD}l|*47)I_i+=p^)n0mA=9-A`JSWXn^{YPZ0%_{k;!0`B
zD}i;RIduv8k3k>OVdPg{!MAT188G=L)*Ozevv^$3QsS}S9Q}Ee|K-)j6u>xt<2p3g
zeVv!Yp<6gMr4cphnbgDfo{!^_WZfuvTv*R#;+;3Z+a!||;P7N@PK`yq*bGl$fxkiN
zlaLSy+xmoe#oM@Kba#ZJm&)-YjaQKqc$vs`(f+T*xr09hpe(Lq!^#Ar+ESP3rO}CZ
zOiy3O-rCRVYBlCx{LxYhvcumZea27R2`b^@`evM&Tu<3yxI7@1a0JPYK6R30Bhm`7
z)SibWjaaJwdgfonJDH=aD1c6509yqG>dymm#Q$A=?YFVwwtux&p{VI}sVOX#7x4K<
zaSRKW+kOs)h7~7|*QfbN&-kmE@`o(4fWUIE4lBmmGb;8Hq=2E9miCC>`2G1GHT`1T
z4!|=l#M8p1USBnV#YjB-D({CZ0rPHOB0!yJY<9Y4<z&9w{+ER{XUrCP(}#cWFb_VV
z2YbfO1p@Dj+_M&FW9REr=KD0#B2>JU@GrIYQ<#K9!#q1s4^q;z$m!}j(y$9_vsACR
zpD+jF%#^3~`6TBZvjOUFR6@qmjA&BHVRftNTh~~|#<%ln9#xWA-dPXg!$Os9!MC^S
z#Ow42MUm?QW%9BGsFlsk%02($!b66G`a)_d64H(yD?yiYI=26Sj$KRe#anv6^lRW)
z>5G^_XGRXr*9xNmDWzsQveSk@ubHIZAfGnI5`fh`KOIEBOSPtYXFczB+)}h3lmh7<
zwjB}{Q|IScW=n4KFvpB2{a9N(`u90fP&LeMS0CAA7~8t}kAZkM!69o4w!y3t@OyC#
ze)2Uc>L>d>A=462x)4qZ@|J%=Id^x|%joX|`=b|et1@)pB;T17PCFy>)a7AHMG!+B
z^$Dq|Sf`Ho0}Tw%t)xKug$wj9x?CjJyeWUZKl&Rod2cb9kEvjLzt*^ZOEP?R!ildo
z$4mR01~3#})3qG3viuY*H;l~ZX?ByNLB$^xJ_iO|L?Nl=M!aX#nOS(~?fA*&t3QVX
zKpV+bK{YH93Osqe;>{iVB^Ow;nKk73=v<`Iv{(Yw!Hm_iHLSaGrL-{MAEl(0|3>du
z1`;I1SWbG?MNI*Wz*29f&uZypKOwgb@5Ttc<8W+@dBCvWJa@4lLd@u`b878SR;LBU
zG%D2;e8F2;tetZnCkx%CIR?N2-9Zsbu#&~ld7sJXbmi;>Zs;PSWK0hMb^?Y}T<(NI
zc=qx30F(V-J#HP|tO&8f?fku0y~BU;;OGJ%3tZZrI!h5}AS(53>ST^EN&i%)e<!V}
z@;%sTYP_G0m@=EWRpV<X{OheKJviSLzvJ12#R?LIzFfI^YwSeedVCp_{3<H@*%>$z
z<lRm)*p^i-oo1)w|0los<~ksIp6JuUalV|FI16xDhYzHNexrlI2!BbL?fah>ty+eW
zEfA3SGpoW`PM?PXs6{r}_!qLrbIkeEf?z}+zwYvFb|%mQVZ(0MUW|(7spI6#gw}gR
z##gv**EIo52N&OaOvcf$H20MKpeP;B?#;@hFi18BEyRgY>87YCd)xUuaY|>F<#{J1
z&*TCqlo-6R`kv%LI4y|P=JZnCzu(qbpGRob5)&7Y0xYrc^wfD?s1!cX9dF8T1TpEh
zzHgg;nT?sKf1%e@dvb6{Px(em8iDvVAlO%EiKj-SZm&Bj)S7eWYwr8}Mkpq?-gVCR
zY{|!2In>iYs^C90^%OoKU=x>#m^inMxEHrjQ0PDKDZT)_B59k&{fs7@yxOLj$i4e@
zx-UTsiqgW=B@Vz3Sw)M`-Fru4hxGYbl7`@H6efRocZkx3%%k*4VYkO6X=KQ&>PIpN
zx>mC<N#QrC<rY3Qlv^A4YQVSkkIkn_hW_IoC3T=({ZghF9-QrXp-wzYS6Oizc6j2)
z>BXwKS#%VF=o>frh4wHl={8duA=e>dM`iRZ6r6pjo!~~hSiPk-2~V2(F;_au6c<%x
zrhgrv;Ms<hgHMwq+n$>3jbT0-g_JPm=K$ry<bgXcj{mbVT3%m|gB?<XSgKwqKGZ1b
z1GolmYKE;_cIqdBBK7VRqs65`CL^;ob4MsSR&r0pwYO1Xnl-lincAmRhv?wue1@K+
zlSiFqKfgKAfv1wy_x)ydL=ep|*`>YTy?0f$gV9Hl*rP=T8Wl+k<sH)-r!7tCLH3Hc
zFEmm03YAC_$Gi~n7q@OEV$UlBZ0>FM&ir<Xrj@`Z(Gx?le(Mh7Ne@EdAZwRatNUp$
zm=y_gb9js-_Oy+dWeTMJ?$%^=QyfnRYw!lM$tM$R9_tiVV#l<nMm^FZbbVI=@+}>*
zHqU2~C@41`6{xh`nNA1Hh6%h24BG)33gHYw5#t{&<O6E5vg~I8(GHXSSrfq<p$L!_
zU(MRKhI{w4-R+8Ca{4g(dAl5#)XXh~yH=~}xGo&=%l5(JmbGIipyW{Y^p-0%&BVT>
zG*wwi%iigjt-u-wMzUsQ1eVk(H-)t4X6X`El(Zz!-ITX_03q&PDavsfi8^)4=fXTF
za9rD2M<12krfxp!n6P@Xxghz!*=_%)#l`?mZOTB2K=c%dVFIV1#F+m=yYi^)5ji~_
UPW3uM$Mz!7zhZQ`SQ{7qKT26~xBvhE

literal 0
HcmV?d00001

diff --git a/images/icons/cassette.png b/images/icons/cassette.png
new file mode 100644
index 0000000000000000000000000000000000000000..38db84e8f139c9eb4c9380222dbc5b5f626909ab
GIT binary patch
literal 2024
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

literal 0
HcmV?d00001

diff --git a/source/Main.brs b/source/Main.brs
index 2025954c..5b4df29c 100644
--- a/source/Main.brs
+++ b/source/Main.brs
@@ -188,6 +188,12 @@ sub Main (args as dynamic) as void
             albums = msg.getRoSGNode()
             node = albums.musicArtistAlbumData.items[ptr]
             group = CreateAlbumView(node)
+        else if isNodeEvent(msg, "appearsOnSelected")
+            ' If you select a Music Album from ANYWHERE, follow this flow
+            ptr = msg.getData()
+            albums = msg.getRoSGNode()
+            node = albums.musicArtistAppearsOnData.items[ptr]
+            group = CreateAlbumView(node)
         else if isNodeEvent(msg, "playSong")
             ' User has selected audio they want us to play
             selectedIndex = msg.getData()
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 61b81739..f4ccff69 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -377,9 +377,9 @@ end function
 ' Shows details on selected artist. Bio, image, and list of available albums
 function CreateArtistView(musicartist)
     musicData = MusicAlbumList(musicartist.id)
+    appearsOnData = AppearsOnList(musicartist.id)
 
-    ' User only has songs under artists
-    if musicData = invalid or musicData.Items.Count() = 0
+    if (musicData = invalid or musicData.Items.Count() = 0) and (appearsOnData = invalid or appearsOnData.Items.Count() = 0)
         ' Just songs under artists...
         group = CreateObject("roSGNode", "AlbumView")
         group.pageContent = ItemMetaData(musicartist.id)
@@ -392,9 +392,13 @@ function CreateArtistView(musicartist)
         group = CreateObject("roSGNode", "ArtistView")
         group.pageContent = ItemMetaData(musicartist.id)
         group.musicArtistAlbumData = musicData
+        group.musicArtistAppearsOnData = appearsOnData
+        group.artistOverview = ArtistOverview(musicartist.name)
+
         group.observeField("musicAlbumSelected", m.port)
         group.observeField("playArtistSelected", m.port)
         group.observeField("instantMixSelected", m.port)
+        group.observeField("appearsOnSelected", m.port)
     end if
 
     m.global.sceneManager.callFunc("pushScene", group)
@@ -531,8 +535,6 @@ function CreateArtistMixGroup(artistID)
         songIDArray.push(song.id)
     end for
 
-    songIDArray.shift()
-
     group.pageContent = songIDArray
     group.musicArtistAlbumData = songList.items
 
diff --git a/source/api/Items.brs b/source/api/Items.brs
index a3ff1b85..3c4b9253 100644
--- a/source/api/Items.brs
+++ b/source/api/Items.brs
@@ -78,7 +78,7 @@ function ItemMetaData(id as string)
     if data = invalid then return invalid
     imgParams = {}
     if data.type <> "Audio"
-        if data.UserData.PlayedPercentage <> invalid
+        if data?.UserData?.PlayedPercentage <> invalid
             param = { "PercentPlayed": data.UserData.PlayedPercentage }
             imgParams.Append(param)
         end if
@@ -163,21 +163,55 @@ function ItemMetaData(id as string)
     end if
 end function
 
+' Music Artist Data
+function ArtistOverview(name as string)
+    req = createObject("roUrlTransfer")
+    url = Substitute("Artists/{0}", req.escape(name))
+    resp = APIRequest(url)
+    data = getJson(resp)
+    if data = invalid then return invalid
+    return data.overview
+end function
+
 ' Get list of albums belonging to an artist
 function MusicAlbumList(id as string)
-    url = Substitute("Users/{0}/Items", get_setting("active_user"), id)
+    url = Substitute("Users/{0}/Items", get_setting("active_user"))
     resp = APIRequest(url, {
-        "UserId": get_setting("active_user"),
-        "parentId": id,
+        "AlbumArtistIds": id,
         "includeitemtypes": "MusicAlbum",
-        "sortBy": "SortName"
+        "sortBy": "SortName",
+        "Recursive": true
     })
 
     data = getJson(resp)
     results = []
     for each item in data.Items
         tmp = CreateObject("roSGNode", "MusicAlbumData")
-        tmp.image = PosterImage(item.id, { "maxHeight": "500", "maxWidth": "500" })
+        tmp.image = PosterImage(item.id)
+        tmp.json = item
+        results.push(tmp)
+    end for
+    data.Items = results
+    return data
+end function
+
+' Get list of albums an artist appears on
+function AppearsOnList(id as string)
+    url = Substitute("Users/{0}/Items", get_setting("active_user"))
+    resp = APIRequest(url, {
+        "ContributingArtistIds": id,
+        "ExcludeItemIds": id,
+        "includeitemtypes": "MusicAlbum",
+        "sortBy": "PremiereDate,ProductionYear,SortName",
+        "SortOrder": "Descending",
+        "Recursive": true
+    })
+
+    data = getJson(resp)
+    results = []
+    for each item in data.Items
+        tmp = CreateObject("roSGNode", "MusicAlbumData")
+        tmp.image = PosterImage(item.id)
         tmp.json = item
         results.push(tmp)
     end for
@@ -232,15 +266,18 @@ end function
 
 ' Get Instant Mix based on item
 function CreateArtistMix(id as string)
-    url = Substitute("Users/{0}/Items", get_setting("active_user"), id)
+    url = Substitute("Users/{0}/Items", get_setting("active_user"))
     resp = APIRequest(url, {
-        "UserId": get_setting("active_user"),
-        "parentId": id,
-        "Filters": "IsNotFolder",
-        "Recursive": true,
-        "SortBy": "SortName",
+        "ArtistIds": id,
+        "Recursive": "true",
         "MediaTypes": "Audio",
-        "Limit": 300
+        "Filters": "IsNotFolder",
+        "SortBy": "SortName",
+        "Limit": 300,
+        "Fields": "Chapters",
+        "ExcludeLocationTypes": "Virtual",
+        "EnableTotalRecordCount": false,
+        "CollapseBoxSetItems": false
     })
 
     return getJson(resp)

From f257a3195ae2f328dffa1eaaf49f6e41c109ff01 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Sun, 2 Oct 2022 14:23:42 -0400
Subject: [PATCH 2/2] Adjust album view

---
 components/ItemGrid/GridItem.brs       | 14 +++++++++++
 components/ItemGrid/ItemGrid.brs       | 15 ++++++-----
 components/ItemGrid/LoadItemsTask2.brs | 10 ++++++++
 components/ItemGrid/LoadItemsTask2.xml |  1 +
 locale/en_US/translations.ts           | 35 +++++++++++++++-----------
 source/Main.brs                        |  3 +++
 source/ShowScenes.brs                  | 15 ++++++++++-
 source/api/Items.brs                   | 34 ++++++++++++++++++++++++-
 8 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
index c89dd79c..ba02bb6c 100644
--- a/components/ItemGrid/GridItem.brs
+++ b/components/ItemGrid/GridItem.brs
@@ -80,6 +80,20 @@ sub itemContentChanged()
         m.backdrop.height = 290
         m.backdrop.width = 290
 
+        m.posterText.height = 200
+        m.posterText.width = 280
+    else if itemData.json.type = "MusicAlbum"
+        m.itemPoster.uri = itemData.PosterUrl
+        m.itemText.text = itemData.Title
+
+        m.itemPoster.height = 290
+        m.itemPoster.width = 290
+
+        m.itemText.translation = [0, m.itemPoster.height + 7]
+
+        m.backdrop.height = 290
+        m.backdrop.width = 290
+
         m.posterText.height = 200
         m.posterText.width = 280
     else
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index caa62b99..2ddaaca2 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -303,7 +303,6 @@ end sub
 ' Set Music view, sort, and filter options
 sub setMusicOptions(options)
     options.views = [
-        { "Title": tr("Default"), "Name": "music-default" },
         { "Title": tr("Artists"), "Name": "music-artist" },
         { "Title": tr("Albums"), "Name": "music-album" },
     ]
@@ -590,13 +589,7 @@ sub optionsClosed()
 
     if m.top.parentItem.collectionType = "music"
         if m.options.view <> m.view
-            if m.options.view = "music-artist"
-                m.view = "music-artist"
-            else if m.options.view = "music-album"
-                m.view = "music-album"
-            else
-                m.view = "music-default"
-            end if
+            m.view = m.options.view
             set_user_setting("display.music.view", m.view)
             reload = true
         end if
@@ -787,6 +780,12 @@ sub updateTitle()
         m.top.overhangTitle = m.top.parentItem.title + tr(" (Filtered by ") + m.loadItemsTask.nameStartsWith + ")"
     end if
 
+    if m.view = "music-artist"
+        m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Artists"))
+    else if m.view = "music-album"
+        m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Albums"))
+    end if
+
     if m.options.view = "Networks" or m.view = "Networks"
         m.top.overhangTitle = "%s (%s)".Format(m.top.parentItem.title, tr("Networks"))
     end if
diff --git a/components/ItemGrid/LoadItemsTask2.brs b/components/ItemGrid/LoadItemsTask2.brs
index 7b632d29..1ee17066 100644
--- a/components/ItemGrid/LoadItemsTask2.brs
+++ b/components/ItemGrid/LoadItemsTask2.brs
@@ -83,6 +83,10 @@ sub loadItems()
             UserId: get_setting("active_user")
         })
         params.IncludeItemTypes = ""
+    else if m.top.ItemType = "MusicAlbum"
+        url = Substitute("Users/{0}/Items/", get_setting("active_user"))
+        params.append({ ImageTypeLimit: 1 })
+        params.append({ EnableImageTypes: "Primary,Backdrop,Banner,Thumb" })
     else
         url = Substitute("Users/{0}/Items/", get_setting("active_user"))
     end if
@@ -118,6 +122,12 @@ sub loadItems()
                 tmp = CreateObject("roSGNode", "FolderData")
             else if item.Type = "MusicAlbum"
                 tmp = CreateObject("roSGNode", "MusicAlbumData")
+                tmp.type = "MusicAlbum"
+                if api_API().items.headimageurlbyname(item.id, "primary")
+                    tmp.posterURL = ImageURL(item.id, "Primary")
+                else
+                    tmp.posterURL = ImageURL(item.id, "backdrop")
+                end if
             else if item.Type = "MusicArtist"
                 tmp = CreateObject("roSGNode", "MusicArtistData")
             else if item.Type = "Audio"
diff --git a/components/ItemGrid/LoadItemsTask2.xml b/components/ItemGrid/LoadItemsTask2.xml
index e828e6e3..d9347c03 100644
--- a/components/ItemGrid/LoadItemsTask2.xml
+++ b/components/ItemGrid/LoadItemsTask2.xml
@@ -22,6 +22,7 @@
   </interface>
   <script type="text/brightscript" uri="LoadItemsTask2.brs" />
   <script type="text/brightscript" uri="pkg:/source/api/Items.brs" />
+  <script type="text/brightscript" uri="pkg:/source/roku_modules/api/api.brs" />
   <script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
   <script type="text/brightscript" uri="pkg:/source/api/Image.brs" />
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index e8fe6ee6..69e4045b 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -757,7 +757,7 @@
         <message>
             <source>direct</source>
             <translation>direct</translation>
-        </message>                                 
+        </message>
         <message>
             <source>Total Bitrate</source>
             <translation>Total Bitrate</translation>
@@ -765,7 +765,7 @@
         <message>
             <source>Audio Channels</source>
             <translation>Audio Channels</translation>
-        </message>                               
+        </message>
         <message>
             <source>Stream Information</source>
             <translation>Stream Information</translation>
@@ -781,36 +781,41 @@
         <message>
             <source>Level</source>
             <translation>Level</translation>
-            <extracomment>Video profile level</extracomment>            
-        </message>                                
+            <extracomment>Video profile level</extracomment>
+        </message>
         <message>
             <source>Bit Rate</source>
             <translation>Bit Rate</translation>
-            <extracomment>Video streaming bit rate</extracomment>            
-        </message>                                
+            <extracomment>Video streaming bit rate</extracomment>
+        </message>
         <message>
             <source>Container</source>
             <translation>Container</translation>
-            <extracomment>Video streaming container</extracomment>            
-        </message>  
+            <extracomment>Video streaming container</extracomment>
+        </message>
         <message>
             <source>Size</source>
             <translation>Size</translation>
-            <extracomment>Video size</extracomment>            
-        </message>  
+            <extracomment>Video size</extracomment>
+        </message>
         <message>
             <source>Video range type</source>
             <translation>Video range type</translation>
-        </message>  
+        </message>
         <message>
             <source>Pixel format</source>
             <translation>Pixel format</translation>
-            <extracomment>Video pixel format</extracomment>            
-        </message>  
+            <extracomment>Video pixel format</extracomment>
+        </message>
         <message>
             <source>WxH</source>
             <translation>WxH</translation>
-            <extracomment>Video width x height</extracomment>            
-        </message>                                          
+            <extracomment>Video width x height</extracomment>
+        </message>
+        <message>
+            <source>Unable to find any albums or songs belonging to this artist</source>
+            <translation>Unable to find any albums or songs belonging to this artist</translation>
+            <extracomment>Popup message when we find no audio data for an artist</extracomment>
+        </message>
     </context>
 </TS>
diff --git a/source/Main.brs b/source/Main.brs
index 5b4df29c..db9cf354 100644
--- a/source/Main.brs
+++ b/source/Main.brs
@@ -159,6 +159,9 @@ sub Main (args as dynamic) as void
                 ' Nothing to do here, handled in ItemGrid
             else if selectedItem.type = "MusicArtist"
                 group = CreateArtistView(selectedItem.json)
+                if not isValid(group)
+                    message_dialog(tr("Unable to find any albums or songs belonging to this artist"))
+                end if
             else if selectedItem.type = "MusicAlbum"
                 group = CreateAlbumView(selectedItem.json)
             else if selectedItem.type = "Audio"
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index f4ccff69..84276831 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -383,7 +383,20 @@ function CreateArtistView(musicartist)
         ' Just songs under artists...
         group = CreateObject("roSGNode", "AlbumView")
         group.pageContent = ItemMetaData(musicartist.id)
-        group.albumData = MusicSongList(musicartist.id)
+
+        ' Lookup songs based on artist id
+        songList = GetSongsByArtist(musicartist.id)
+
+        if not isValid(songList)
+            ' Lookup songs based on folder parent / child relationship
+            songList = MusicSongList(musicartist.id)
+        end if
+
+        if not isValid(songList)
+            return invalid
+        end if
+
+        group.albumData = songList
         group.observeField("playSong", m.port)
         group.observeField("playAllSelected", m.port)
         group.observeField("instantMixSelected", m.port)
diff --git a/source/api/Items.brs b/source/api/Items.brs
index 3c4b9253..6c24a933 100644
--- a/source/api/Items.brs
+++ b/source/api/Items.brs
@@ -219,6 +219,33 @@ function AppearsOnList(id as string)
     return data
 end function
 
+' Get list of songs belonging to an artist
+function GetSongsByArtist(id as string)
+    url = Substitute("Users/{0}/Items", get_setting("active_user"))
+    resp = APIRequest(url, {
+        "AlbumArtistIds": id,
+        "includeitemtypes": "Audio",
+        "sortBy": "SortName",
+        "Recursive": true
+    })
+
+    data = getJson(resp)
+    results = []
+
+    if data = invalid then return invalid
+    if data.Items = invalid then return invalid
+    if data.Items.Count() = 0 then return invalid
+
+    for each item in data.Items
+        tmp = CreateObject("roSGNode", "MusicAlbumData")
+        tmp.image = PosterImage(item.id)
+        tmp.json = item
+        results.push(tmp)
+    end for
+    data.Items = results
+    return data
+end function
+
 ' Get Songs that are on an Album
 function MusicSongList(id as string)
     url = Substitute("Users/{0}/Items", get_setting("active_user"), id)
@@ -229,8 +256,13 @@ function MusicSongList(id as string)
         "sortBy": "SortName"
     })
 
-    data = getJson(resp)
     results = []
+    data = getJson(resp)
+
+    if data = invalid then return invalid
+    if data.Items = invalid then return invalid
+    if data.Items.Count() = 0 then return invalid
+
     for each item in data.Items
         tmp = CreateObject("roSGNode", "MusicSongData")
         tmp.image = PosterImage(item.id)