From dec1b15b799313a6a5e776d37605d2fb783cf8de Mon Sep 17 00:00:00 2001
From: candry7731 <83685828+candry7731@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:04:07 -0500
Subject: [PATCH 1/5] Fix Episode Image errors

---
 components/data/HomeData.brs      | 2 +-
 components/home/LoadItemsTask.brs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/data/HomeData.brs b/components/data/HomeData.brs
index a5d1489b..de82c422 100644
--- a/components/data/HomeData.brs
+++ b/components/data/HomeData.brs
@@ -37,7 +37,7 @@ sub setData()
         imgParams.Append({ "maxHeight": 261 })
         imgParams.Append({ "maxWidth": 464 })
 
-        m.top.thumbnailURL = ImageURL(datum.SeriesId, "Primary", imgParams)
+        m.top.thumbnailURL = ImageURL(datum.Id, "Primary", imgParams)
 
         ' Add Wide Poster  (Series Backdrop)
         if datum.ParentThumbImageTag <> invalid
diff --git a/components/home/LoadItemsTask.brs b/components/home/LoadItemsTask.brs
index d9207e13..338f570e 100644
--- a/components/home/LoadItemsTask.brs
+++ b/components/home/LoadItemsTask.brs
@@ -37,7 +37,7 @@ sub loadItems()
             tmp = CreateObject("roSGNode", "HomeData")
             item.ImageURL = ImageURL(item.Id, "Primary", params)
             if item.type = "Episode"
-                item.ImageURL = ImageURL(item.SeriesId)
+                item.ImageURL = ImageURL(item.Id)
             end if
             tmp.json = item
             results.push(tmp)

From 9c33c6b580198ef633b8dc4cc5055af2c7b1a2a2 Mon Sep 17 00:00:00 2001
From: candry7731 <83685828+candry7731@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:06:05 -0500
Subject: [PATCH 2/5] Move Alpha to left of item grid

---
 components/ItemGrid/Alpha.xml    | 2 +-
 components/ItemGrid/ItemGrid.brs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ItemGrid/Alpha.xml b/components/ItemGrid/Alpha.xml
index 743061be..64c48a22 100644
--- a/components/ItemGrid/Alpha.xml
+++ b/components/ItemGrid/Alpha.xml
@@ -2,7 +2,7 @@
 <component name="Alpha" extends = "Group">
   <children>
     <LabelList 
-        translation="[1872, 185]"
+        translation="[50, 185]"
         vertFocusAnimationStyle="floatingFocus" 
         drawFocusFeedback="true"
         id = "Alphamenu"
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 2c8d0f51..ed373db3 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -526,12 +526,12 @@ function onKeyEvent(key as string, press as boolean) as boolean
             photoPlayer.control = "RUN"
             return true
         end if
-    else if key = "right" and topGrp.isinFocusChain()
+    else if key = "left" and topGrp.isinFocusChain()
         topGrp.setFocus(false)
         alpha = m.Alpha.getChild(0).findNode("Alphamenu")
         alpha.setFocus(true)
         return true
-    else if key = "left" and m.Alpha.isinFocusChain()
+    else if key = "right" and m.Alpha.isinFocusChain()
         m.Alpha.setFocus(false)
         m.Alpha.visible = true
         topGrp.setFocus(true)

From 8e0493de7d3282e8dbb315208f0204d4a289ea7e Mon Sep 17 00:00:00 2001
From: candry7731 <83685828+candry7731@users.noreply.github.com>
Date: Fri, 3 Jun 2022 00:25:00 -0500
Subject: [PATCH 3/5] Resize item poster base on alpha/grid focus

---
 components/ItemGrid/GridItem.brs | 20 +++++++++++++-------
 components/ItemGrid/ItemGrid.brs |  4 +++-
 components/ItemGrid/ItemGrid.xml |  1 +
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
index e9a9e642..9be3231f 100644
--- a/components/ItemGrid/GridItem.brs
+++ b/components/ItemGrid/GridItem.brs
@@ -17,16 +17,16 @@ sub init()
     if m.alwaysShowTitles then m.itemText.maxWidth = 250
 
     'Parent is MarkupGrid and it's parent is the ItemGrid
-    topParent = m.top.GetParent().GetParent()
+    m.topParent = m.top.GetParent().GetParent()
     'Get the imageDisplayMode for these grid items
-    if topParent.imageDisplayMode <> invalid
-        m.itemPoster.loadDisplayMode = topParent.imageDisplayMode
+    if m.topParent.imageDisplayMode <> invalid
+        m.itemPoster.loadDisplayMode = m.topParent.imageDisplayMode
     end if
 
 end sub
 
 sub itemContentChanged()
-
+    
     ' Set Random background colors from pallet
     posterBackgrounds = m.global.constants.poster_bg_pallet
     m.backdrop.blendColor = posterBackgrounds[rnd(posterBackgrounds.count()) - 1]
@@ -74,20 +74,26 @@ end sub
 '
 'Use FocusPercent to animate scaling of Poser Image
 sub focusChanging()
-    scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
-    m.posterMask.scale = [scaleFactor, scaleFactor]
+    if m.topParent.alphaActive = "true"
+        m.posterMask.scale = [0.85, 0.85]
+    else
+        scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
+        m.posterMask.scale = [scaleFactor, scaleFactor]
+    end if
 end sub
 
 '
 'Display or hide title Visibility on focus change
 sub focusChanged()
-
     if m.top.itemHasFocus = true
         m.itemText.visible = true
         m.itemText.repeatCount = -1
+        scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
+        m.posterMask.scale = [scaleFactor, scaleFactor]
     else
         m.itemText.visible = m.alwaysShowTitles
         m.itemText.repeatCount = 0
+        m.posterMask.scale = [0.85, 0.85]
     end if
 
 end sub
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index ed373db3..fedf8684 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -255,7 +255,7 @@ end sub
 '
 'Handle loaded data, and add to Grid
 sub ItemDataLoaded(msg)
-
+    m.top.alphaActive = "false"
     itemData = msg.GetData()
     m.loadItemsTask.unobserveField("content")
     m.loadItemsTask.content = []
@@ -530,11 +530,13 @@ function onKeyEvent(key as string, press as boolean) as boolean
         topGrp.setFocus(false)
         alpha = m.Alpha.getChild(0).findNode("Alphamenu")
         alpha.setFocus(true)
+        m.top.alphaActive = "true"
         return true
     else if key = "right" and m.Alpha.isinFocusChain()
         m.Alpha.setFocus(false)
         m.Alpha.visible = true
         topGrp.setFocus(true)
+        m.top.alphaActive = "false"
         return true
     end if
     return false
diff --git a/components/ItemGrid/ItemGrid.xml b/components/ItemGrid/ItemGrid.xml
index fd7f3172..67964ee8 100644
--- a/components/ItemGrid/ItemGrid.xml
+++ b/components/ItemGrid/ItemGrid.xml
@@ -39,6 +39,7 @@
     <field id="quickPlayNode" type="node" alwaysNotify="true" />
     <field id="imageDisplayMode" type="string" value="scaleToZoom" />
     <field id="AlphaSelected" type="string" alias="AlphaMenu.itemAlphaSelected" alwaysNotify="true" onChange="onItemAlphaSelected" />
+    <field id="alphaActive" type="string" value="false" />
   </interface>
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />

From 35c31b0161aa5740bbc17823bb3899b8cdb28bd0 Mon Sep 17 00:00:00 2001
From: candry7731 <83685828+candry7731@users.noreply.github.com>
Date: Fri, 3 Jun 2022 00:25:43 -0500
Subject: [PATCH 4/5] formatting/validation

---
 components/ItemGrid/GridItem.brs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
index 9be3231f..4e627b9b 100644
--- a/components/ItemGrid/GridItem.brs
+++ b/components/ItemGrid/GridItem.brs
@@ -26,7 +26,7 @@ sub init()
 end sub
 
 sub itemContentChanged()
-    
+
     ' Set Random background colors from pallet
     posterBackgrounds = m.global.constants.poster_bg_pallet
     m.backdrop.blendColor = posterBackgrounds[rnd(posterBackgrounds.count()) - 1]

From f15913ebe5e3b4ffa1929ff517d3972a82527632 Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Fri, 3 Jun 2022 21:29:22 -0600
Subject: [PATCH 5/5] Smoother animation

---
 components/ItemGrid/GridItem.brs | 16 ++++++----------
 components/ItemGrid/ItemGrid.brs |  6 +++---
 components/ItemGrid/ItemGrid.xml |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/components/ItemGrid/GridItem.brs b/components/ItemGrid/GridItem.brs
index 4e627b9b..69b2e65b 100644
--- a/components/ItemGrid/GridItem.brs
+++ b/components/ItemGrid/GridItem.brs
@@ -74,12 +74,8 @@ end sub
 '
 'Use FocusPercent to animate scaling of Poser Image
 sub focusChanging()
-    if m.topParent.alphaActive = "true"
-        m.posterMask.scale = [0.85, 0.85]
-    else
-        scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
-        m.posterMask.scale = [scaleFactor, scaleFactor]
-    end if
+    scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
+    m.posterMask.scale = [scaleFactor, scaleFactor]
 end sub
 
 '
@@ -88,14 +84,14 @@ sub focusChanged()
     if m.top.itemHasFocus = true
         m.itemText.visible = true
         m.itemText.repeatCount = -1
-        scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
-        m.posterMask.scale = [scaleFactor, scaleFactor]
+        m.posterMask.scale = [1, 1]
     else
         m.itemText.visible = m.alwaysShowTitles
         m.itemText.repeatCount = 0
-        m.posterMask.scale = [0.85, 0.85]
+        if m.topParent.alphaActive = true
+            m.posterMask.scale = [0.85, 0.85]
+        end if
     end if
-
 end sub
 
 'Hide backdrop and text when poster loaded
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index fedf8684..0622108f 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -255,7 +255,7 @@ end sub
 '
 'Handle loaded data, and add to Grid
 sub ItemDataLoaded(msg)
-    m.top.alphaActive = "false"
+    m.top.alphaActive = false
     itemData = msg.GetData()
     m.loadItemsTask.unobserveField("content")
     m.loadItemsTask.content = []
@@ -527,16 +527,16 @@ function onKeyEvent(key as string, press as boolean) as boolean
             return true
         end if
     else if key = "left" and topGrp.isinFocusChain()
+        m.top.alphaActive = true
         topGrp.setFocus(false)
         alpha = m.Alpha.getChild(0).findNode("Alphamenu")
         alpha.setFocus(true)
-        m.top.alphaActive = "true"
         return true
     else if key = "right" and m.Alpha.isinFocusChain()
+        m.top.alphaActive = false
         m.Alpha.setFocus(false)
         m.Alpha.visible = true
         topGrp.setFocus(true)
-        m.top.alphaActive = "false"
         return true
     end if
     return false
diff --git a/components/ItemGrid/ItemGrid.xml b/components/ItemGrid/ItemGrid.xml
index 67964ee8..1e1a0fb3 100644
--- a/components/ItemGrid/ItemGrid.xml
+++ b/components/ItemGrid/ItemGrid.xml
@@ -39,7 +39,7 @@
     <field id="quickPlayNode" type="node" alwaysNotify="true" />
     <field id="imageDisplayMode" type="string" value="scaleToZoom" />
     <field id="AlphaSelected" type="string" alias="AlphaMenu.itemAlphaSelected" alwaysNotify="true" onChange="onItemAlphaSelected" />
-    <field id="alphaActive" type="string" value="false" />
+    <field id="alphaActive" type="boolean" value="false" />
   </interface>
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />