Merge branch 'master' into addmusic

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"

components/ItemGrid/GridItem.brs

@@ -17,10 +17,10 @@ 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
@@ -84,15 +84,17 @@ 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
+        m.posterMask.scale = [1, 1]
     else
         m.itemText.visible = m.alwaysShowTitles
         m.itemText.repeatCount = 0
+        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

components/ItemGrid/ItemGrid.brs

@@ -272,7 +272,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 = []
@@ -543,12 +543,14 @@ 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()
+        m.top.alphaActive = true
         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.top.alphaActive = false
         m.Alpha.setFocus(false)
         m.Alpha.visible = true
         topGrp.setFocus(true)

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="boolean" value="false" />
   </interface>
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />

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

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)