Big Bang update to create the fundemental look/style

jjd-uk · Jul 25, 2021 · c6055b9 · c6055b9
1 parent aec2f4b
commit c6055b9
Show file tree

Hide file tree

Showing 86 changed files with 5,801 additions and 2,107 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.mangrove" version="0.0.1" name="Mangrove" provider-name="jjd-uk">
+<addon id="skin.mangrove" version="0.2" name="Mangrove" provider-name="jjd-uk">
 	<requires>
 		<import addon="xbmc.gui" version="5.15.0"/>
 	</requires>
@@ -15,8 +15,7 @@
 	</extension>
 	<extension point="xbmc.addon.metadata">
 		<summary lang="en_GB">Mangrove skin is based on the Estuary skin</summary>
-		<description lang="en_GB">Mangrove skin is based Estuary the default skin of Kodi, for which credit goes to phil65, Ichabod Fletchman for the original work on Estuary</description>
-		<disclaimer lang="en_GB">Estuary is the default skin for Kodi, removing it may cause issues</disclaimer>
+		<description lang="en_GB">Mangrove skin is based on Estuary which is the default skin of Kodi. Credit for the original work on Estuary goes phil65, Ichabod Fletchman without which a derivative work such as this would not be possible.</description>
 		<platform>all</platform>
 		<license>CC BY-SA 4.0, GNU GENERAL PUBLIC LICENSE Version 2.0</license>
 		<forum>http://forum.kodi.tv/</forum>

diff --git a/colors/defaults.xml b/colors/defaults.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF0E597E</color>
-	<color name="secondary_background">330BAA8E</color>
-	<color name="dialog_tint">FF1A2123</color>
+	<color name="primary_background">FF11375C</color>
+	<color name="secondary_background">334F4F9E</color>
+<!--	<color name="dialog_tint">FF181B1E</color> -->
+	<color name="dialog_tint">C0000000</color>
+	<color name="panel_tint">99000000</color>
+	<color name="button_focus">FF657895</color>
+	<color name="selection_focus">80A0A0A0</color>
+	<color name="dialog_focus">C0A0A0A0</color>
+<!--	<color name="selection_focus">CC585858</color> -->
+<!--	<color name="infolabel">FF0099FF</color> -->
+<!--	<color name="infolabel">FFA0A0A0</color> 
+	<color name="infolabel">FF657895</color> -->
+	<color name="osdlabel">FF808080</color>
+	<color name="selected">FF6c8e74</color>
 	<color name="background">FF000000</color>
 	<color name="bg_image">FF909090</color>
 	<color name="bg_overlay">30FFFFFF</color>
 	<color name="black">FF000000</color>
 	<color name="white">FFF0F0F0</color>
 	<color name="grey">FFA0A0A0</color>
-	<color name="blue">FF7ACAFE</color>
-	<color name="red">FFCE4421</color>
-	<color name="button_focus">FF12A0C7</color>
-	<color name="text_shadow">22000000</color>
+	<color name="dark_grey">FF36454f</color>
+<!--	<color name="blue">FF048598</color>
+	<color name="red">FFCE4421</color> -->
+	<color name="blue">FF657895</color>
+	<color name="green">FF6c8e74</color>
+	<color name="red">FFbc2d29</color>
+	<color name="yellow">FFffff99</color>
+	<color name="text_shadow">FF000000</color>
 	<color name="border_alpha">60FFFFFF</color>
 	<color name="disabled">40FFFFFF</color>
-	<color name="selected">FF11E7B1</color>
-	<color name="invalid">FFFF0000</color>
+	<color name="invalid">FFFF0000</color>	
 </colors>
diff --git a/colors/original.xml b/colors/original.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+	<color name="primary_background">FF0E597E</color>
+	<color name="secondary_background">330BAA8E</color>
+	<color name="dialog_tint">FF1A2123</color>
+	<color name="background">FF000000</color>
+	<color name="bg_image">FF909090</color>
+	<color name="bg_overlay">30FFFFFF</color>
+	<color name="black">FF000000</color>
+	<color name="white">FFF0F0F0</color>
+	<color name="grey">FFA0A0A0</color>
+	<color name="blue">FF7ACAFE</color>
+	<color name="red">FFCE4421</color>
+	<color name="button_focus">FF12A0C7</color>
+	<color name="text_shadow">22000000</color>
+	<color name="border_alpha">60FFFFFF</color>
+	<color name="disabled">40FFFFFF</color>
+	<color name="selected">FF11E7B1</color>
+	<color name="invalid">FFFF0000</color>
+</colors>
diff --git a/extras/backgrounds/background.jpg b/extras/backgrounds/background.jpg
diff --git a/extras/backgrounds/background1.jpg b/extras/backgrounds/background1.jpg
diff --git a/media/ItemSeperator.png b/media/ItemSeperator.png
diff --git a/media/dialogs/vertical-separator.png b/media/dialogs/vertical-separator.png
diff --git a/xml/AddonBrowser.xml b/xml/AddonBrowser.xml
@@ -2,45 +2,15 @@
 <window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
-	<views>50,52,55</views>
+	<views>50,52</views>
 	<menucontrol>9000</menucontrol>
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
 			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_52_IconWall</include>
-			<include>View_55_WideList</include>
 			<include>CommonScrollbars</include>
-			<control type="group">
-				<include>OpenClose_Left</include>
-				<visible>Control.IsVisible(55)</visible>
-				<visible>Container.Content(addons) | Container.Content()</visible>
-				<include>Visible_Left</include>
-				<include content="ListThumbInfoPanel">
-					<param name="fallback_image" value="DefaultAddon.png" />
-				</include>
-				<control type="group">
-					<visible>String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24170]) | String.IsEqual(ListItem.AddonLifecycleType,$LOCALIZE[24171])</visible>
-					<control type="image">
-						<left>64</left>
-						<top>109</top>
-						<width>472</width>
-						<height>472</height>
-						<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
-					</control>
-					<control type="textbox">
-						<left>75</left>
-						<top>110</top>
-						<width>450</width>
-						<height>470</height>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$VAR[AddonLifecycleType]</label>
-						<font>font32_title</font>
-					</control>
-				</control>
-			</control>
 			<include content="TopBar">
 				<param name="breadcrumbs_label" value="$LOCALIZE[24001]" />
 			</include>

diff --git a/xml/Custom_1100_AddonLauncher.xml b/xml/Custom_1100_AddonLauncher.xml
@@ -96,7 +96,7 @@
 							<left>0</left>
 							<right>0</right>
 							<bottom>0</bottom>
-							<texture colordiffuse="button_focus">lists/focus.png</texture>
+							<texture colordiffuse="panel_tint">colors/white.png</texture>
 							<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000)">Conditional</animation>
 						</control>
 						<control type="image">

diff --git a/xml/Custom_1109_TopBarOverlay.xml b/xml/Custom_1109_TopBarOverlay.xml
@@ -1,257 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window type="dialog" id="1109">
-	<visible>Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)</visible>
-	<visible>Window.IsActive(seekbar) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide)</visible>
-	<depth>DepthOSD</depth>
-	<include>Animation_TopSlide</include>
-	<zorder>0</zorder>
-	<controls>
-		<control type="group">
-			<visible>![Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide)] + [!String.IsEmpty(Player.SeekNumeric) | Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused]</visible>
-			<animation effect="fade" start="0" end="100" time="300">VisibleChange</animation>
-			<animation effect="slide" start="0,0" end="0,-80" time="300" condition="Player.Paused + System.IdleTime(5)">Conditional</animation>
-			<control type="image">
-				<left>0</left>
-				<top>0</top>
-				<width>100%</width>
-				<height>55</height>
-				<texture colordiffuse="D0FFFFFF" border="0,55,0,0">frame/osdfade.png</texture>
-			</control>
-			<control type="label">
-				<left>25</left>
-				<top>6</top>
-				<width>700</width>
-				<height>60</height>
-				<label>$VAR[SeekLabel]</label>
-				<font>font30_title</font>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<centerleft>50%</centerleft>
-				<top>0</top>
-				<width>50%</width>
-				<height>55</height>
-				<align>center</align>
-				<label>$VAR[SeekTimeLabelVar]</label>
-				<font>font37</font>
-				<visible>!Player.ChannelPreviewActive | VideoPlayer.HasEpg</visible>
-			</control>
-			<control type="label">
-				<right>25</right>
-				<top>6</top>
-				<width>700</width>
-				<height>60</height>
-				<align>right</align>
-				<font>font30_title</font>
-				<label>$INFO[player.chapter,[COLOR button_focus]$LOCALIZE[21396]:[/COLOR] ]$INFO[Player.ChapterCount,/]</label>
-				<visible>!VideoPlayer.Content(LiveTV) + player.chaptercount</visible>
-			</control>
-			<control type="label">
-				<right>25</right>
-				<top>6</top>
-				<width>700</width>
-				<height>60</height>
-				<align>right</align>
-				<font>font30_title</font>
-				<label>[COLOR button_focus]$LOCALIZE[31026][/COLOR] $INFO[PVR.TimeshiftCur] (-$INFO[PVR.TimeshiftOffset])</label>
-				<visible>VideoPlayer.Content(LiveTV) + PVR.IsTimeShift</visible>
-			</control>
-			<control type="progress">
-				<left>0</left>
-				<top>55</top>
-				<width>100%</width>
-				<height>16</height>
-				<info>Player.ProgressCache</info>
-				<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
-				<midtexture>colors/white50.png</midtexture>
-				<visible>!VideoPlayer.Content(LiveTV)</visible>
-			</control>
-			<control type="progress">
-				<left>0</left>
-				<top>55</top>
-				<width>100%</width>
-				<height>16</height>
-				<info>Player.Progress</info>
-				<texturebg border="3" colordiffuse="60FFFFFF">colors/white50.png</texturebg>
-				<midtexture colordiffuse="button_focus">colors/white.png</midtexture>
-				<visible>!VideoPlayer.Content(LiveTV)</visible>
-			</control>
-			<control type="slider">
-				<left>0</left>
-				<top>50</top>
-				<width>100%</width>
-				<height>26</height>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus>
-				<info>Player.Seekbar</info>
-				<visible>!VideoPlayer.Content(LiveTV) + [Player.Seeking | Player.DisplayAfterSeek]</visible>
-			</control>
-			<control type="group">
-				<visible>VideoPlayer.Content(LiveTV)</visible>
-				<control type="group">
-					<visible>Player.SeekEnabled + VideoPlayer.HasEPG</visible>
-					<include content="PVRProgress">
-						<param name="ts_bar_top" value="55"/>
-						<param name="epg_bar_top" value="63"/>
-						<param name="ts_bar_height" value="8"/>
-						<param name="epg_bar_height" value="8"/>
-					</include>
-				</control>
-				<control type="group">
-					<visible>Player.SeekEnabled + !VideoPlayer.HasEPG</visible>
-					<include content="PVRProgress">
-						<param name="ts_bar_top" value="55"/>
-						<param name="ts_bar_height" value="16"/>
-					</include>
-				</control>
-				<control type="group">
-					<visible>!Player.SeekEnabled + VideoPlayer.HasEPG</visible>
-					<include content="PVRProgress">
-						<param name="epg_bar_top" value="55"/>
-						<param name="epg_bar_height" value="16"/>
-					</include>
-				</control>
-			</control>
-			<control type="slider">
-				<left>0</left>
-				<top>50</top>
-				<width>100%</width>
-				<height>26</height>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">colors/white.png</textureslidernibfocus>
-				<info>PVR.TimeShiftSeekbar</info>
-				<visible>VideoPlayer.Content(LiveTV) + [Player.Seeking | Player.DisplayAfterSeek] + !Player.ChannelPreviewActive</visible>
-			</control>
-			<control type="ranges">
-				<left>0</left>
-				<top>55</top>
-				<width>100%</width>
-				<height>8</height>
-				<texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
-				<lefttexture>colors/white.png</lefttexture>
-				<midtexture colordiffuse="FFFF0000">colors/white.png</midtexture>
-				<righttexture>colors/white.png</righttexture>
-				<info>Player.Cutlist</info>
-			</control>
-			<control type="ranges">
-				<left>0</left>
-				<top>67</top>
-				<width>100%</width>
-				<height>4</height>
-				<texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
-				<righttexture>colors/white.png</righttexture>
-				<info>Player.Chapters</info>
-			</control>
-		</control>
-		<control type="group">
-			<animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
-			<animation effect="slide" start="0,-200" end="0,0" time="300" tween="cubic" easing="out">VisibleChange</animation>
-			<visible>Player.ShowInfo | Window.IsActive(fullscreeninfo) | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(PVR.ChannelNumberInput) | Window.IsActive(pvrosdchannels) | Window.IsActive(pvrchannelguide) + ![Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.Paused]</visible>
-			<depth>DepthBars</depth>
-			<control type="image">
-				<left>0</left>
-				<top>0</top>
-				<width>100%</width>
-				<height>170</height>
-				<texture>frame/osdfade.png</texture>
-			</control>
-			<control type="group">
-				<animation effect="slide" end="90,0" time="0" condition="Skin.HasSetting(touchmode)">conditional</animation>
-				<control type="grouplist">
-					<visible>!String.IsEmpty(Player.Art(tvshow.clearlogo)) | !String.IsEmpty(Player.Art(clearlogo))</visible>
-					<top>10</top>
-					<left>20</left>
-					<right>400</right>
-					<height>100</height>
-					<itemgap>10</itemgap>
-					<orientation>horizontal</orientation>
-					<control type="image">
-						<width>300</width>
-						<texture>$VAR[PlayerClearLogoVar]</texture>
-						<aspectratio aligny="center" align="center">keep</aspectratio>
-					</control>
-					<control type="label">
-						<align>left</align>
-						<aligny>center</aligny>
-						<font>font13</font>
-						<label>$VAR[OSDSubLabelVar]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-						<scroll>true</scroll>
-					</control>
-				</control>
-				<control type="group">
-					<visible>!Window.IsActive(pvrosdchannels) + !Window.IsActive(pvrchannelguide)</visible>
-					<visible>String.IsEmpty(Player.Art(clearlogo))</visible>
-					<visible>String.IsEmpty(Player.Art(tvshow.clearlogo))</visible>
-					<animation effect="fade" time="150">VisibleChange</animation>
-					<left>20</left>
-					<right>400</right>
-					<control type="label">
-						<label>$VAR[NowPlayingBreadcrumbsVar]</label>
-						<font>font45</font>
-						<shadowcolor>text_shadow</shadowcolor>
-						<top>7</top>
-						<height>50</height>
-					</control>
-					<control type="label">
-						<top>60</top>
-						<label>$VAR[OSDSubLabelVar]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-						<height>60</height>
-					</control>
-				</control>
-			</control>
-			<control type="group">
-				<visible>!Window.IsVisible(extendedprogressdialog)</visible>
-				<animation effect="fade" time="150">VisibleChange</animation>
-				<control type="label">
-					<font>font_clock</font>
-					<shadowcolor>text_shadow</shadowcolor>
-					<top>0</top>
-					<right>20</right>
-					<height>200</height>
-					<width>600</width>
-					<align>right</align>
-					<label>$INFO[System.Time]</label>
-				</control>
-				<control type="grouplist">
-					<right>24</right>
-					<top>74</top>
-					<width>800</width>
-					<height>100</height>
-					<align>right</align>
-					<itemgap>5</itemgap>
-					<orientation>horizontal</orientation>
-					<usecontrolcoords>true</usecontrolcoords>
-					<control type="label">
-						<label>$INFO[Player.FinishTime,$LOCALIZE[31080]: ]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-						<height>100</height>
-						<width>auto</width>
-						<visible>!String.isempty(Player.Duration)</visible>
-						<visible>Player.HasVideo + ![Player.HasGame | VideoPlayer.HasEpg]</visible>
-					</control>
-					<control type="label">
-						<label>$INFO[PVR.EpgEventFinishTime,$LOCALIZE[31080]: ]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-						<height>100</height>
-						<width>auto</width>
-						<visible>VideoPlayer.HasEpg</visible>
-					</control>
-					<control type="image">
-						<top>2</top>
-						<left>0</left>
-						<width>60</width>
-						<height>40</height>
-						<fadetime>300</fadetime>
-						<aspectratio aligny="center" align="right">keep</aspectratio>
-						<texture>dialogs/volume/mute.png</texture>
-						<visible>Player.Muted</visible>
-					</control>
-				</control>
-			</control>
-		</control>
-	</controls>
+
 </window>