diff --git a/components/home/Home.xml b/components/home/Home.xml index fb710f52c..724d3be03 100644 --- a/components/home/Home.xml +++ b/components/home/Home.xml @@ -11,56 +11,56 @@ - - + + - - - - - - + + + + + + - + - + - + - + - - - - - - + + + + + + - + - - - + + + - - - - - + + + + + - + @@ -78,7 +78,7 @@ itemComponentName="HomeItem" numRows="2" rowLabelOffset="[[0,20]]" - focusBitmapUri="pkg:/images/hd_focus.9.png" /> + focusBitmapUri="pkg:/images/posterFocus.9.png" /> diff --git a/components/home/HomeItem.bs b/components/home/HomeItem.bs index 776f6e80b..7483bd2b4 100644 --- a/components/home/HomeItem.bs +++ b/components/home/HomeItem.bs @@ -50,6 +50,7 @@ sub findNodes() m.showProgressBarAnimation = m.top.findNode("showProgressBar") m.showProgressBarField = m.top.findNode("showProgressBarField") m.scaleGroup = m.top.findNode("scaleGroup") + m.posterMask = m.top.findNode("posterMask") end sub sub initItemText() @@ -102,7 +103,7 @@ sub itemContentChanged() ' Reposition played indicator to top-right corner of poster if isValid(m.playedIndicator) - m.playedIndicator.translation = [itemData.imageWidth - 42, 3] + m.playedIndicator.translation = [itemData.imageWidth - 50, 10] end if m.itemText.maxWidth = itemData.imageWidth @@ -368,7 +369,7 @@ end sub sub drawProgressBar(itemData) if not isValid(itemData.LookupCI("imageWidth")) then return - m.itemProgressBackground.width = itemData.LookupCI("imageWidth") + m.showProgressBarField.keyValue = [0, m.itemProgressBackground.width * (itemData.PlayedPercentage / 100)] m.itemProgressBackground.visible = true m.showProgressBarField.keyValue = [0, m.itemPoster.width * (itemData.PlayedPercentage / 100)] m.showProgressBarAnimation.control = AnimationControl.START @@ -481,6 +482,22 @@ sub onPosterLoadStatusChanged() if m.itemPoster.loadStatus = PosterLoadStatus.READY and m.itemPoster.uri <> string.EMPTY m.backdrop.visible = false m.itemIcon.visible = false + + posterW = m.itemPoster.width + + if posterW = 180 + m.posterMask.maskUri = "pkg:/images/posterVertMask.png" + m.posterMask.maskSize = [180, 270] + else if posterW = 464 + m.posterMask.maskUri = "pkg:/images/posterWideMask.png" + m.posterMask.maskSize = [464, 270] + else if posterW = 261 + m.posterMask.maskUri = "pkg:/images/posterSquareMask.png" + m.posterMask.maskSize = [261, 270] + else + m.posterMask.maskUri = "" + m.posterMask.maskSize = [0, 0] + end if else m.backdrop.visible = true m.itemIcon.visible = true diff --git a/components/home/HomeItem.xml b/components/home/HomeItem.xml index 4ed47ad11..14175c633 100644 --- a/components/home/HomeItem.xml +++ b/components/home/HomeItem.xml @@ -4,14 +4,18 @@ - - - + + + + + + + - + diff --git a/components/home/HomeRows.bs b/components/home/HomeRows.bs index a9eb39790..6aba3654a 100644 --- a/components/home/HomeRows.bs +++ b/components/home/HomeRows.bs @@ -162,7 +162,7 @@ sub updateSize() m.top.itemSize = [1703, itemHeight] ' spacing between rows (increased to prevent bottom text from being cut off) - m.top.itemSpacing = [0, 110] + m.top.itemSpacing = [0, 60] ' spacing between items in a row m.top.rowItemSpacing = [20, 0] diff --git a/images/posterFocus.9.png b/images/posterFocus.9.png new file mode 100644 index 000000000..f1fcb3ce4 Binary files /dev/null and b/images/posterFocus.9.png differ diff --git a/images/posterSquareMask.png b/images/posterSquareMask.png new file mode 100644 index 000000000..54ac43adb Binary files /dev/null and b/images/posterSquareMask.png differ diff --git a/images/posterVertMask.png b/images/posterVertMask.png new file mode 100644 index 000000000..4f39bd44a Binary files /dev/null and b/images/posterVertMask.png differ diff --git a/images/posterWideMask.png b/images/posterWideMask.png new file mode 100644 index 000000000..29a4d035f Binary files /dev/null and b/images/posterWideMask.png differ diff --git a/images/postermask.png b/images/postermask.png deleted file mode 100644 index 1984f9a77..000000000 Binary files a/images/postermask.png and /dev/null differ diff --git a/source/constants/HomeRowItemSizes.bs b/source/constants/HomeRowItemSizes.bs index 5a5e4977d..a4bb0361c 100644 --- a/source/constants/HomeRowItemSizes.bs +++ b/source/constants/HomeRowItemSizes.bs @@ -1,7 +1,7 @@ ' @fileoverview Constants for rowItemSize on the home view namespace homeRowItemSizes - const WIDE_POSTER = [464, 335] + const WIDE_POSTER = [464, 270] const MOVIE_POSTER = [180, 270] - const MUSIC_ALBUM = [261, 335] + const MUSIC_ALBUM = [261, 270] end namespace