Skip to content

Commit

Permalink
more tweeks and a release
Browse files Browse the repository at this point in the history
  • Loading branch information
@im85288
im85288 committed Oct 21, 2018
1 parent 0e9d92c commit 834912f
Show file tree
Hide file tree
Showing 38 changed files with 223 additions and 261 deletions.
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<addon id="service.upnext" name="Up Next" provider-name="im85288" version="0.0.4">
<addon id="service.upnext" name="Up Next" provider-name="im85288" version="0.0.5">
<requires>
<import addon="xbmc.python" version="2.20.0"/>
<import addon="script.module.requests" version="2.9.1" />
Expand Down
11 changes: 6 additions & 5 deletions resources/lib/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,22 @@ def loadTestData():
test_episode = {}
test_episode["episodeid"] = 12345678
test_episode["tvshowid"] = 12345678
test_episode["title"] = "episode title"
test_episode["title"] = "Garden of Bones"
test_episode["art"] = {}
test_episode["art"]["tvshow.poster"] = "https://fanart.tv/fanart/tv/121361/tvposter/game-of-thrones-521441fd9b45b.jpg"
test_episode["art"]["thumb"] = "https://fanart.tv/fanart/tv/121361/showbackground/game-of-thrones-556979e5eda6b.jpg"
test_episode["art"]["tvshow.fanart"] = "https://fanart.tv/fanart/tv/121361/showbackground/game-of-thrones-4fd5fa8ed5e1b.jpg"
test_episode["art"]["tvshow.landscape"] = "https://fanart.tv/detailpreview/fanart/tv/121361/tvthumb/game-of-thrones-4f78ce73d617c.jpg"
test_episode["art"]["tvshow.clearart"] = "https://fanart.tv/fanart/tv/121361/clearart/game-of-thrones-4fa1349588447.png"
test_episode["art"]["tvshow.clearlogo"] = "https://fanart.tv/fanart/tv/121361/hdtvlogo/game-of-thrones-504c49ed16f70.png"
test_episode["plot"] = "the amazing plot for this episode goes in here, making this a long string so that layouts can be tested"
test_episode["showtitle"] = "tv show title"
test_episode["plot"] = "Lord Baelish arrives at Renly's camp just before he faces off against Stannis. Daenerys and her company are welcomed into the city of Qarth. Arya, Gendry, and Hot Pie find themselves imprisoned at Harrenhal."
test_episode["showtitle"] = "Game of Thrones"
test_episode["playcount"] = 1
test_episode["season"] = 2
test_episode["episode"] = 4
test_episode["rating"] = "8.6"
test_episode["firstaired"] = "16/10/2018"
test_episode["seasonepisode"] = "2x4."
test_episode["rating"] = "8.9"
test_episode["firstaired"] = "23/04/2012"
return test_episode


Expand Down
158 changes: 61 additions & 97 deletions resources/skins/default/1080i/script-upnext-stillwatching-simple.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,130 +6,94 @@
<controls>
<control type="group">
<animation type="WindowOpen" reversible="false">
<effect type="fade" start="0" end="100" time="400" />
<effect type="slide" start="0,-115" end="0,0" time="400" />
<effect type="fade" start="0" end="100" time="600" />
<effect type="slide" start="0,-115" end="0,0" time="600" />
</animation>
<animation type="WindowClose" reversible="false">
<effect type="fade" start="100" end="0" time="400" />
<effect type="slide" start="0,0" end="0,-115" time="400" />
</animation>
<control type="group">
<height>115</height>
<height>80</height>
<!-- Background -->
<control type="image">
<top>0</top>
<width>100%</width>
<height>115</height>
<texture colordiffuse="ff000000">bg.png</texture>
<height>80</height>
<texture colordiffuse="dd000000">bg.png</texture>
</control>
<!-- Labels -->
<control type="group">
<top>20</top>
<top>12</top>
<left>20</left>
<width>75%</width>
<!-- Time -->
<control type="label">
<width>auto</width>
<height>35</height>
<aligny>center</aligny>
<font>font25_title</font>
<textcolor>ffffffff</textcolor>
<shadowcolor>00000000</shadowcolor>
<label>$ADDON[service.upnext 30024] [COLOR red]$INFO[Player.TimeRemaining(mm:ss),-][/COLOR]</label>
<visible>Integer.IsGreater(Player.TimeRemaining,59)</visible>
</control>
<control type="label">
<width>auto</width>
<height>35</height>
<aligny>center</aligny>
<font>font25_title</font>
<textcolor>ffffffff</textcolor>
<shadowcolor>00000000</shadowcolor>
<label>$ADDON[service.upnext 30024] [COLOR red]$INFO[Player.TimeRemaining(ss),-, $ADDON[service.upnext 30035]][/COLOR]</label>
<visible>!Integer.IsGreater(Player.TimeRemaining,59)</visible>
</control>
<!-- Details -->
<!-- buttons -->
<control type="grouplist">
<orientation>horizontal</orientation>
<height>35</height>
<top>40</top>
<itemgap>0</itemgap>
<control type="label">
<width>auto</width>
<height>35</height>
<height>56</height>
<itemgap>10</itemgap>
<align>left</align>
<control type="button" id="4012">
<label> $ADDON[service.upnext 30010] $ADDON[service.upnext 30036] [COLOR FFFF4081]$INFO[Player.TimeRemaining(ss),,][/COLOR] $ADDON[service.upnext 30035]</label>
<height>56</height>
<width min="50">auto</width>
<font>font20_title</font>
<textoffsetx>55</textoffsetx>
<textcolor>ddffffff</textcolor>
<focusedcolor>eeffffff</focusedcolor>
<selectedcolor>ddffffff</selectedcolor>
<shadowcolor>22000000</shadowcolor>
<aligny>center</aligny>
<font>font12</font>
<textcolor>ffffffff</textcolor>
<shadowcolor>00000000</shadowcolor>
<label>$INFO[Window.Property(tvshowtitle),, - ]$INFO[Window.Property(season),S,:]$INFO[Window.Property(episode),E, - ]$INFO[Window.Property(title)] </label>
<visible>!String.IsEmpty(Window.Property(title))</visible>
<align>center</align>
<texturefocus border="10" colordiffuse="FF172A91">button.png</texturefocus>
<texturenofocus border="10" colordiffuse="FF212121">button.png</texturenofocus>
<alttexturefocus border="10" colordiffuse="FF172A91">button.png</alttexturefocus>
<alttexturenofocus border="10" colordiffuse="FF212121">button.png</alttexturenofocus>
<pulseonselect>no</pulseonselect>
</control>
<control type="label">
<width>auto</width>
<height>35</height>
<control type="button" id="4013">
<label>$ADDON[service.upnext 30034]</label>
<height>56</height>
<width min="50">auto</width>
<font>font20_title</font>
<textoffsetx>15</textoffsetx>
<textcolor>ddffffff</textcolor>
<focusedcolor>eeffffff</focusedcolor>
<selectedcolor>ddffffff</selectedcolor>
<shadowcolor>22000000</shadowcolor>
<aligny>center</aligny>
<font>font12</font>
<textcolor>ffffffff</textcolor>
<shadowcolor>00000000</shadowcolor>
<label>$INFO[Window.Property(year),, ]</label>
<visible>!String.IsEmpty(Window.Property(year))</visible>
<align>center</align>
<texturefocus border="10" colordiffuse="FF172A91">button.png</texturefocus>
<texturenofocus border="10" colordiffuse="FF212121">button.png</texturenofocus>
<alttexturefocus border="10" colordiffuse="FF172A91">button.png</alttexturefocus>
<alttexturenofocus border="10" colordiffuse="FF212121">button.png</alttexturenofocus>
<pulseonselect>no</pulseonselect>
</control>
<!-- Label -->
<control type="label">
<width>auto</width>
<height>35</height>
<height>56</height>
<aligny>center</aligny>
<label>$INFO[Window.Property(rating),, ]</label>
<font>font12</font>
<textcolor>ffffffff</textcolor>
<font>font32_title</font>
<textcolor>eeffffff</textcolor>
<shadowcolor>00000000</shadowcolor>
<visible>!String.IsEmpty(Window.Property(rating))</visible>
<label>[CAPITALIZE]$ADDON[service.upnext 30024][/CAPITALIZE]</label>
</control>
</control>
</control>
<!-- Buttons -->
<control type="grouplist">
<orientation>horizontal</orientation>
<height>56</height>
<top>30</top>
<right>20</right>
<width>25%</width>
<itemgap>10</itemgap>
<align>right</align>
<control type="button" id="4012">
<label>$ADDON[service.upnext 30010]</label>
<height>56</height>
<width min="50">auto</width>
<font>font20_title</font>
<textoffsetx>15</textoffsetx>
<textcolor>ffffffff</textcolor>
<focusedcolor>ffffffff</focusedcolor>
<selectedcolor>ffffffff</selectedcolor>
<shadowcolor>22000000</shadowcolor>
<aligny>center</aligny>
<align>center</align>
<texturefocus border="10" colordiffuse="FF12A0C7">button.png</texturefocus>
<texturenofocus border="10" colordiffuse="FF171717">button.png</texturenofocus>
<alttexturefocus border="10" colordiffuse="FF12A0C7">button.png</alttexturefocus>
<alttexturenofocus border="10" colordiffuse="FF171717">button.png</alttexturenofocus>
<pulseonselect>no</pulseonselect>
<control type="image">
<width>46</width>
<height>46</height>
<aspect>keep</aspect>
<texture colordiffuse="ddffffff">nextupicons/30.png</texture>
<animation effect="slide" end="13,5" time="0" condition="true">Conditional</animation>
<visible>Integer.IsGreater(Player.TimeRemaining(ss),30)</visible>
</control>
<control type="button" id="4013">
<label>$ADDON[service.upnext 30034]</label>
<height>56</height>
<width min="50">auto</width>
<font>font20_title</font>
<textoffsetx>15</textoffsetx>
<textcolor>ffffffff</textcolor>
<focusedcolor>ffffffff</focusedcolor>
<selectedcolor>ffffffff</selectedcolor>
<shadowcolor>22000000</shadowcolor>
<aligny>center</aligny>
<align>center</align>
<texturefocus border="10" colordiffuse="FF12A0C7">button.png</texturefocus>
<texturenofocus border="10" colordiffuse="FF171717">button.png</texturenofocus>
<alttexturefocus border="10" colordiffuse="FF12A0C7">button.png</alttexturefocus>
<alttexturenofocus border="10" colordiffuse="FF171717">button.png</alttexturenofocus>
<pulseonselect>no</pulseonselect>
<control type="image">
<width>46</width>
<height>46</height>
<aspect>keep</aspect>
<texture colordiffuse="ddffffff">$INFO[Player.TimeRemaining(ss),nextupicons/,.png]</texture>
<animation effect="slide" end="13,5" time="0" condition="true">Conditional</animation>
<visible>!Integer.IsGreater(Player.TimeRemaining(ss),30)</visible>
</control>
</control>
</control>
Expand Down
Loading

0 comments on commit 834912f

Please sign in to comment.