From 298984d33e9f8fa5c7b4c14023ba7c832c200520 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Wed, 20 Sep 2017 00:10:41 +0100
Subject: [PATCH] album view

---
 1080i/View_Albums.xml       | 226 ++++++++++++++++++++++--------------
 1080i/View_ArtistAlbums.xml |   4 +-
 2 files changed, 144 insertions(+), 86 deletions(-)

diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 9c1f413..02d503a 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -2,21 +2,109 @@
 <includes>
     <!--Album browser-->
     <include name="musicalbum">
-        <control type="group">
-			<!--most recent-->
+        <control type="group" id="9125">
+			<visible>$EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
+			<animation type="Conditional" condition="!controlgroup(9125).hasfocus">
+                <effect type="fade" start="100" end="0" time="100"/>
+            </animation>
+			<animation type="Conditional" condition="controlgroup(9125).hasfocus">
+                <effect type="fade" start="0" end="100" time="300" delay="300"/>
+            </animation>
+			<!--quick link selector-->
+			<control type="list" id="9123">
+                <posx>col-1-begin</posx>
+                <posy>row-4-begin</posy>
+                <width>24-col</width>
+                <height>2-row</height>
+                <onleft>9000</onleft>
+                <ondown>9998</ondown>
+                <onback>9000</onback>
+                <orientation>horizontal</orientation>
+                <itemlayout width="228" height="2-row">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>228</width>
+                        <height>2-row</height>
+                        <font>itemTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textDisabled</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.property(textTitle)]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="228" height="2-row">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>228</width>
+                        <height>2-row</height>
+                        <font>itemTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.property(textTitle)]</label>
+                    </control>
+                </focusedlayout>
+                <content>
+                    <item id="1">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)</visible>
+                        <label>special://skin/extras/playlists/recentMovies.xsp</label>
+                        <property name="textTitle">31176</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="2">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)</visible>
+                        <label>special://skin/extras/playlists/recentEpisodes.xsp</label>
+                        <property name="textTitle">31178</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="6">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)</visible>
+                        <label>special://skin/extras/playlists/inprogressMovies.xsp</label>
+                        <property name="textTitle">31132</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="7">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)</visible>
+                        <label>special://skin/extras/playlists/inprogressTVShows.xsp</label>
+                        <property name="textTitle">31127</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="3">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
+                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
+                        <property name="textTitle">31180</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="4">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
+                        <label>special://skin/extras/playlists/topAlbums.xsp</label>
+                        <property name="textTitle">31187</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="5">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
+                        <label>special://skin/extras/playlists/randomAlbums.xsp</label>
+                        <property name="textTitle">31181</property>
+                        <onclick>noop</onclick>
+                    </item>
+                </content>
+            </control>
+			<!--quick links-->			
 			<control type="panel" id="9998">
-				<visible>$EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-6-begin</posy>
                 <width>24-col</width>
-                <height>5-col-gutter</height>
+                <height>11-row</height>
+				<onup>9123</onup>
                 <ondown>50</ondown>
                 <onleft>9000</onleft>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
                 <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID],return)</onclick>
                 <onclick>Control.SetFocus(50)</onclick>
-                <itemlayout width="366" height="5-col-gutter">
+                <itemlayout width="348" height="5-col-gutter">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -31,26 +119,13 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>2-row</posy>
-                        <width>240</width>
+                        <posy>9-row</posy>
+                        <width>312</width>
                         <height>2-row</height>
-                        <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.title]</label>
-                    </control>
-                    <control type="label">
-                        <visible>!controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>3-row</posy>
-                        <width>240</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.artist]</label>
+                        <font>thumbTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
                     </control>
                     <control type="image">
                         <posx>0</posx>
@@ -64,7 +139,7 @@
                         <colordiffuse>ffffffff</colordiffuse>
                     </control>
                 </itemlayout>
-                <focusedlayout width="366" height="5-col-gutter">
+                <focusedlayout width="348" height="5-col-gutter">
                     <control type="group">
                         <include>focusThumb</include>
                         <control type="image">
@@ -79,29 +154,16 @@
                             <colordiffuse>highlight</colordiffuse>
                         </control>
                         <control type="label">
-                            <visible>!controlgroup(9000).hasfocus</visible>
-                            <posx>12</posx>
-                            <posy>2-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.title]</label>
-                        </control>
-                        <control type="label">
-                            <visible>!controlgroup(9000).hasfocus</visible>
-                            <posx>12</posx>
-                            <posy>3-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.artist]</label>
-                        </control>
+	                        <visible>!controlgroup(9000).hasfocus</visible>
+	                        <posx>12</posx>
+	                        <posy>9-row</posy>
+	                        <width>312</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <font>thumbTitle</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
+	                    </control>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -115,15 +177,31 @@
                         </control>
                     </control>
                 </focusedlayout>
-				<content>special://skin/extras/playlists/recentAlbums.xsp</content>
+				<content>$INFO[control.getlabel(9123)]</content>
             </control>
+		</control>
 			<!--all albums-->
+		<control type="group" id="9124">
+			<animation type="Conditional" condition="controlgroup(9124).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
+                <effect type="slide" start="0,0" end="0,-504" tween="sine" time="400"/>
+            </animation>
+			<control type="label">
+                <visible>!controlgroup(9000).hasfocus + $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
+                <posx>col-1-begin</posx>
+                <posy>row-18-begin</posy>
+                <width>12-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
+                <font>itemTitle</font>
+                <textcolor>textActive</textcolor>
+                <label>All Albums</label>
+            </control>
             <control type="panel" id="50">
                 <visible>$EXP[isMusicAlbum]</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-18-begin</posy>
+                <posy>row-20-begin</posy>
                 <width>1800</width>
-                <height>23-row</height>
+                <height>24-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>50</ondown>
@@ -157,24 +235,13 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>262</posy>
+                        <posy>7-row</posy>
                         <width>240</width>
-                        <height>1-row</height>
+                        <height>2-row</height>
                         <aligny>center</aligny>
                         <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label>[B]$INFO[ListItem.Title][/B]</label>
-                    </control>
-                    <control type="label">
-                        <visible>!controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>286</posy>
-                        <width>240</width>
-                        <height>1-row</height>
-                        <aligny>center</aligny>
-                        <font>thumbTitle</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.artist]</label>
+                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
                     </control>
                     <control type="image">
                         <posx>0</posx>
@@ -224,28 +291,19 @@
                             <bordersize>6</bordersize>
                         </control>
                         <control type="label">
-                            <posx>12</posx>
-                            <posy>262</posy>
-                            <width>240</width>
-                            <height>1-row</height>
-                            <aligny>center</aligny>
-                            <font>thumbTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>[B]$INFO[ListItem.Title][/B]</label>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>286</posy>
-                            <width>240</width>
-                            <height>1-row</height>
-                            <aligny>center</aligny>
-                            <font>thumbTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.artist]</label>
-                        </control>
+	                        <visible>!controlgroup(9000).hasfocus</visible>
+	                        <posx>12</posx>
+	                        <posy>7-row</posy>
+	                        <width>240</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <font>thumbTitle</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
+	                    </control>
                     </control>
                 </focusedlayout>
             </control>
-        </control>
+		</control>
     </include>
 </includes>
\ No newline at end of file
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 1aa807a..0478197 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -42,8 +42,8 @@
                     <visible>$EXP[isMusicArtistCatalogue]</visible>
                     <posx>col-1-begin</posx>
                     <posy>row-11-begin</posy>
-                    <width>21-col</width>
-                    <height>18-row</height>
+                    <width>24-col</width>
+                    <height>19-row</height>
                     <onleft>9000</onleft>
                     <ondown>50</ondown>
                     <onup>50</onup>