lgladsden/jf-roku
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/artist-design-update' into artist-design-update

Browse Source
This commit is contained in:
1hitsong 2022-08-05 19:59:29 -04:00
commit 2e76997947
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/music/AlbumGrid.xml
View File

@ -1,19 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<<<<<<< unstable:components/music/AlbumRow.xml
<<<<<<< unstable:components/music/MusicAlbumSongList.xml
<component name="MusicAlbumSongList" extends="MarkupList">
=======
<component name="AlbumRow" extends="RowList">
>>>>>>> Improve Object Names:components/music/AlbumRow.xml
<interface>
<field id="MusicArtistAlbumData" type="assocarray" onChange="getData" />
<field id="doneLoading" type="boolean" value="false"/>
=======
<component name="AlbumGrid" extends="PosterGrid">
<interface>
<field id="MusicArtistAlbumData" type="assocarray" onChange="getData" />
<field id="infocus" type="boolean" />
>>>>>>> Update Artist view:components/music/AlbumGrid.xml
</interface>
<script type="text/brightscript" uri="AlbumGrid.brs" />
</component>

4
components/music/AlbumView.xml
View File

@ -15,11 +15,7 @@
<LayoutGroup id="infoGroup" layoutDirection="vert" itemSpacings="[15]">
<Label id="overview" wrap="true" height="310" width="1250" ellipsisText=" ... (Press * to read more)" />
<Rectangle id='songListRect' translation="[-30, 0]" width="1260" height="510" color="0x202020ff">
<<<<<<< unstable:components/music/MusicAlbumDetails.xml
<MusicAlbumSongList itemComponentName="SongItem" id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
=======
<AlbumTrackList id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
>>>>>>> Improve Object Names:components/music/AlbumView.xml
</Rectangle>
</LayoutGroup>
</LayoutGroup>