From 31e6f01c08f9a353f787bb1fee287b7bd01fa613 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:41:22 -0500
Subject: [PATCH] Add unplayed count to homepage

---
 components/ItemGrid/GridItem.brs     |  8 +++++---
 components/ListPoster.brs            |  8 +++++---
 components/data/HomeData.brs         |  4 ----
 components/home/HomeItem.brs         | 11 +++++++++--
 components/home/HomeItem.xml         |  8 +++++---
 components/tvshows/TVEpisodes.brs    |  8 +++++---
 components/tvshows/TVShowDetails.brs |  8 +++++---
 7 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
index 7ccf90e7..162db0b9 100644
--- a/components/ItemGrid/GridItem.brs
+++ b/components/ItemGrid/GridItem.brs
@@ -43,9 +43,11 @@ sub itemContentChanged()
         m.itemIcon.uri = itemData.iconUrl
         m.itemText.text = itemData.Title
     else if itemData.type = "Series"
-        if itemData.json.UserData.UnplayedItemCount > 0
-            m.unplayedCount.visible = true
-            m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+        if itemData?.json?.UserData?.UnplayedItemCount <> invalid
+            if itemData.json.UserData.UnplayedItemCount > 0
+                m.unplayedCount.visible = true
+                m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+            end if
         end if
 
         m.itemPoster.uri = itemData.PosterUrl
diff --git a/components/ListPoster.brs b/components/ListPoster.brs
index 6374088e..ae04ef18 100644
--- a/components/ListPoster.brs
+++ b/components/ListPoster.brs
@@ -57,9 +57,11 @@ sub itemContentChanged() as void
     itemData = m.top.itemContent
     m.title.text = itemData.title
 
-    if itemData.json.UserData.UnplayedItemCount > 0
-        m.unplayedCount.visible = true
-        m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+    if itemData?.json?.UserData?.UnplayedItemCount <> invalid
+        if itemData.json.UserData.UnplayedItemCount > 0
+            m.unplayedCount.visible = true
+            m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+        end if
     end if
 
     if itemData.json.lookup("Type") = "Episode" and itemData.json.IndexNumber <> invalid
diff --git a/components/data/HomeData.brs b/components/data/HomeData.brs
index 66ecbb82..cae8c1e8 100644
--- a/components/data/HomeData.brs
+++ b/components/data/HomeData.brs
@@ -48,10 +48,6 @@ sub setData()
         imgParams = { "maxHeight": 261 }
         imgParams.Append({ "maxWidth": 464 })
 
-        if datum.UserData.UnplayedItemCount > 0
-            imgParams["UnplayedCount"] = datum.UserData.UnplayedItemCount
-        end if
-
         m.top.posterURL = ImageURL(datum.id, "Primary", imgParams)
 
         ' Add Wide Poster  (Series Backdrop)
diff --git a/components/home/HomeItem.brs b/components/home/HomeItem.brs
index 5b0e081e..938576cd 100644
--- a/components/home/HomeItem.brs
+++ b/components/home/HomeItem.brs
@@ -7,6 +7,8 @@ sub init()
     m.itemIcon = m.top.findNode("itemIcon")
     m.itemTextExtra = m.top.findNode("itemTextExtra")
     m.itemPoster.observeField("loadStatus", "onPosterLoadStatusChanged")
+    m.unplayedCount = m.top.findNode("unplayedCount")
+    m.unplayedEpisodeCount = m.top.findNode("unplayedEpisodeCount")
 
     m.showProgressBarAnimation = m.top.findNode("showProgressBar")
     m.showProgressBarField = m.top.findNode("showProgressBarField")
@@ -24,19 +26,24 @@ sub itemContentChanged()
     if itemData = invalid then return
     itemData.Title = itemData.name ' Temporarily required while we move from "HomeItem" to "JFContentItem"
 
-
     m.itemPoster.width = itemData.imageWidth
     m.itemText.maxWidth = itemData.imageWidth
     m.itemTextExtra.width = itemData.imageWidth
     m.itemTextExtra.visible = true
 
-
     m.backdrop.width = itemData.imageWidth
 
     if itemData.iconUrl <> invalid
         m.itemIcon.uri = itemData.iconUrl
     end if
 
+    if itemData?.json?.UserData?.UnplayedItemCount <> invalid
+        if itemData.json.UserData.UnplayedItemCount > 0
+            m.unplayedCount.visible = true
+            m.unplayedEpisodeCount.text = itemData.json.UserData.UnplayedItemCount
+        end if
+    end if
+
     ' Format the Data based on the type of Home Data
     if itemData.type = "CollectionFolder" or itemData.type = "UserView" or itemData.type = "Channel"
         m.itemText.text = itemData.name
diff --git a/components/home/HomeItem.xml b/components/home/HomeItem.xml
index 3fb36250..74d9f064 100644
--- a/components/home/HomeItem.xml
+++ b/components/home/HomeItem.xml
@@ -3,12 +3,14 @@
   <children>
     <Rectangle id="backdrop" width="464" height="261" translation="[8,5]" />
     <Poster id="itemIcon" width="100" height="100" translation="[190,85]" loadDisplayMode="scaleToFit" />
-    <Poster id="itemPoster" width="464" height="261" translation="[8,5]" loadDisplayMode="scaleToZoom" />
-
+    <Poster id="itemPoster" width="464" height="261" translation="[8,5]" loadDisplayMode="scaleToZoom">
+      <Rectangle id="unplayedCount" visible="false" width="90" height="60" color="#00a4dcFF" translation="[375, 0]">
+        <Label id="unplayedEpisodeCount" width="90" height="60" font="font:SmallestBoldSystemFont" horizAlign="center" vertAlign="center" />
+      </Rectangle>
+    </Poster>
     <Rectangle id="progressBackground" visible="false" color="0x00000098" width="464" height="8" translation="[8,260]">
       <Rectangle id="progress" color="#00a4dcFF" width="0" height="8" />
     </Rectangle>
-
     <ScrollingLabel id="itemText" horizAlign="center" vertAlign="center" font="font:SmallBoldSystemFont" height="64" maxWidth="456" translation="[8,267]" repeatCount="0" />
     <Label id="itemTextExtra" horizAlign="left" vertAlign="center" font="font:SmallBoldSystemFont" height="32" width="456" translation="[8,300]" visible="false" color="#777777FF" />
 
diff --git a/components/tvshows/TVEpisodes.brs b/components/tvshows/TVEpisodes.brs
index cbd6c7ca..486efc18 100644
--- a/components/tvshows/TVEpisodes.brs
+++ b/components/tvshows/TVEpisodes.brs
@@ -17,9 +17,11 @@ sub setSeasonLoading()
 end sub
 
 sub updateSeason()
-    if m.top.seasonData.UserData.UnplayedItemCount > 0
-        m.unplayedCount.visible = true
-        m.unplayedEpisodeCount.text = m.top.seasonData.UserData.UnplayedItemCount
+    if m.top.seasonData?.UserData?.UnplayedItemCount <> invalid
+        if m.top.seasonData.UserData.UnplayedItemCount > 0
+            m.unplayedCount.visible = true
+            m.unplayedEpisodeCount.text = m.top.seasonData.UserData.UnplayedItemCount
+        end if
     end if
 
     imgParams = { "maxHeight": 450, "maxWidth": 300 }
diff --git a/components/tvshows/TVShowDetails.brs b/components/tvshows/TVShowDetails.brs
index 2d0933bd..fc39755b 100644
--- a/components/tvshows/TVShowDetails.brs
+++ b/components/tvshows/TVShowDetails.brs
@@ -15,9 +15,11 @@ sub itemContentChanged()
     item = m.top.itemContent
     itemData = item.json
 
-    if itemData.UserData.UnplayedItemCount > 0
-        m.unplayedCount.visible = true
-        m.unplayedEpisodeCount.text = itemData.UserData.UnplayedItemCount
+    if itemData?.UserData?.UnplayedItemCount <> invalid
+        if itemData.UserData.UnplayedItemCount > 0
+            m.unplayedCount.visible = true
+            m.unplayedEpisodeCount.text = itemData.UserData.UnplayedItemCount
+        end if
     end if
 
     m.top.findNode("tvshowPoster").uri = m.top.itemContent.posterURL