diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 1127b27..b390dc1 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -23,6 +23,8 @@ + + @@ -36,13 +38,26 @@ container.content(episodes) + !String.Contains(Container.folderpath,plugin) container.content(musicvideos) + !String.Contains(Container.folderpath,plugin) - !String.Contains(container.folderpath,musicdb://) | String.Contains(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !String.Contains(Container.folderpath,special://profile/playlists)] | String.Contains(Container.folderpath,plugin://) + + + container.content(artists) + String.Contains(container.folderpath,spotify) + container.content(albums) + String.Contains(container.folderpath,spotify) + + !String.Contains(container.folderpath,musicdb://) | String.Contains(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !String.Contains(Container.folderpath,special://profile/playlists)] | String.Contains(Container.folderpath,plugin://) + container.content(artists) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)] + container.content(albums) + String.Contains(container.folderpath,albumartistsonly) + container.content(albums) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)] + container.content(genres) + String.Contains(container.folderpath,musicdb://) + container.content(songs) + [String.Contains(Container.folderpath,musicdb://) | String.Contains(Container.folderpath,spotify)] + container.content(songs) + [String.Contains(Container.folderpath,.xsp) | String.Contains(Container.foldername,PartyMode) | String.Contains(Container.folderpath,playlistmusic://)] !String.IsEmpty(Window(Weather).Property(WeatherProvider)) + !String.String.IsEmpty(weather.temperature) + !String.String.IsEmpty(weather.conditions) diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index 71c57a7..8164f87 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -28,10 +28,10 @@ - 0 - 0 - col-5-begin - fullscreenHeight + -200 + -200 + 584 + 1500 colors/white.png highlight stretch diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 15d706a..7baea88 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -13,7 +13,8 @@ $LOCALIZE[31012] [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] - $LOCALIZE[31058] + $INFO[container.foldername] [CAPITALIZE][COLOR highlight]$INFO[container.content][/COLOR][/CAPITALIZE] + $LOCALIZE[31058] $INFO[container.foldername] $LOCALIZE[31038] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] $LOCALIZE[31024] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE] diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index dfc3d44..caf8694 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -3,7 +3,7 @@ 9999 fadeInOut Skin.SetString(recentitems,music) - 50,51,52,53,54,55 + 50,51,52,53,54,55,56,57 globalBackground @@ -34,7 +34,9 @@ musicgenre musicartistcatalogue musicartist + musicspotifyartist musicalbum + musicspotifyalbum musicsongs musicPlayList diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml index 351be47..a863dd1 100644 --- a/1080i/View_Artists.xml +++ b/1080i/View_Artists.xml @@ -42,7 +42,7 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] + $INFO[Listitem.art(thumb)] 6 BBffffff @@ -79,7 +79,7 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] + $INFO[Listitem.art(thumb)] 6 diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml index d5d2ef1..56306fd 100644 --- a/1080i/View_MusicFiles.xml +++ b/1080i/View_MusicFiles.xml @@ -6,7 +6,7 @@ col-1-begin row-5-begin - !$EXP[isMusicPlaylist] + $EXP[isMusicList] + !$EXP[isMusicPlaylist] + !$EXP[isMusicSong] + !$EXP[isMusicSpotifyAlbum] + !$EXP[isMusicSpotifyArtist] + !$EXP[isMusicAlbum] + $EXP[isMusicList] 0 0 24-col diff --git a/1080i/View_SpotifyAlbums.xml b/1080i/View_SpotifyAlbums.xml new file mode 100644 index 0000000..b5ef122 --- /dev/null +++ b/1080i/View_SpotifyAlbums.xml @@ -0,0 +1,116 @@ + + + + + + + + $EXP[isMusicSpotifyAlbum] + col-1-begin + row-5-begin + 1800 + 24-row + 9000 + 60 + 50 + 9998 + 60 + 600 + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/black.png + colors/black.png + 6 + overlay + + + !ListItem.IsParentFolder + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[ListItem.Art(thumb)] + 6 + BBffffff + + + String.IsEmpty(listitem.title) + 24 + 3-row + 228 + 6-row + largeTitle + true + textActive + + + + !controlgroup(9000).hasfocus + 12 + 258 + 226 + 2-row + center + thumbTitle + textActive + + + + + + focusThumb + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/black.png + colors/white.png + 6 + FF000000 + + + !ListItem.IsParentFolder + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[ListItem.Art(thumb)] + 6 + + + String.IsEmpty(listitem.title) + 24 + 3-row + 228 + 6-row + largeTitle + true + textActive + + + + !controlgroup(9000).hasfocus + 12 + 258 + 226 + 2-row + center + thumbTitle + textActive + + + + + + + + \ No newline at end of file diff --git a/1080i/View_SpotifyArtists.xml b/1080i/View_SpotifyArtists.xml new file mode 100644 index 0000000..9e013d4 --- /dev/null +++ b/1080i/View_SpotifyArtists.xml @@ -0,0 +1,102 @@ + + + + + + $EXP[isMusicSpotifyArtist] + + dimensionsFullscreen + $INFO[container(56).listitem.art(thumb)] + FF555555 + scale + 250 + + + + $EXP[isMusicSpotifyArtist] + col-1-begin + row-5-begin + 1800 + 25-row + 9000 + 60 + 50 + 50 + 600 + 60 + + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + colors/black.png + colors/black.png + 6 + overlay + + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + $INFO[Listitem.art(thumb)] + 6 + BBffffff + + + 24 + 80 + 372 + 3-row + center + center + menuTitle + textActive + + 99000000 + + + + + focusThumb + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + colors/black.png + colors/white.png + 6 + FF000000 + + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + $INFO[Listitem.art(thumb)] + 6 + + + 24 + 80 + 372 + 3-row + center + center + menuTitle + textActive + + 99000000 + + + + + + + \ No newline at end of file diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 6f47d39..1304e80 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -26,6 +26,18 @@ $INFO[player.art(fanart)] 500 77ffffff + + + !Visualisation.Enabled + string.isempty(player.art(fanart)) + col-10-begin + row-8-begin + 6-col + 6-col + stretch + $INFO[ListItem.Art(thumb)] + colors/black.png + 6 + BBffffff diff --git a/README.md b/README.md index 019a1e4..1690963 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,14 @@ Pellucid Pellucid is a skin for Kodi Media Centre. -Built for the living room, Pellucid is a clean and simple Kodi experience designed for maximum usability and minimum fuss. +Built for the living room, Pellucid is a clean and carefully designed Kodi experience designed for maximum usability and minimum fuss. -Skin Shortcuts addon support is available from the Krypton release onwards. +####Additional features + +- Skin Shortcuts addon support is available from the Krypton release onwards. +- Full PVR / Live TV support Discussion thread: http://forum.kodi.tv/forumdisplay.php?fid=267 -Created by theDeadMan with love from Bristol, U.K. +Created by theDeadMan with, love from Bristol, U.K. diff --git a/changelog.txt b/changelog.txt index 1bfcb47..05260f4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -37,7 +37,7 @@ - check controls for new window: MyGames.xml - Screenshots etc need updating -- SPOTIFY SUPPORT +- SPOTIFY SUPPORT: Titles update and fanart if possible. Artists not working on libreelec [V1.3.3] - [FIXED] Weather label showing on homescreen even if no weather plugin enabled.