Merge pull request #9 from mluizvitor/custom-bg-v1a

Custom Background v1.a
mluizvitor · Nov 10, 2021 · 3eba114 · 3eba114
2 parents 40b8e26 + e2b8ca9
commit 3eba114
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 64 deletions.
diff --git a/assets/background.png b/assets/background.png
diff --git a/assets/button-hover.png b/assets/button-hover.png
diff --git a/assets/button-normal.png b/assets/button-normal.png
diff --git a/assets/menu.png b/assets/menu.png
diff --git a/assets/ratio169/background.png b/assets/ratio169/background.png
diff --git a/assets/ratio169/custom-bg-fg.png b/assets/ratio169/custom-bg-fg.png
diff --git a/assets/ratio169/menu.png b/assets/ratio169/menu.png
diff --git a/assets/ratio32/background.png b/assets/ratio32/background.png
diff --git a/assets/ratio32/custom-bg-fg.png b/assets/ratio32/custom-bg-fg.png
diff --git a/assets/ratio32/menu.png b/assets/ratio32/menu.png
diff --git a/assets/ratio43/background.png b/assets/ratio43/background.png
diff --git a/assets/ratio43/custom-bg-fg.png b/assets/ratio43/custom-bg-fg.png
diff --git a/assets/ratio43/menu.png b/assets/ratio43/menu.png
diff --git a/settings/colors/commom-dark.xml b/settings/colors/commom-dark.xml
@@ -83,8 +83,8 @@
 
   <view name="system">
     <carousel name="systemcarousel">
-      <color>${backgroundDarkColor}1a</color>
-      <colorEnd>${backgroundDarkColor}cc</colorEnd>
+      <color ifSubset="custom_background:no">${backgroundDarkColor}1a</color>
+      <color ifSubset="custom_background:yes">${backgroundDarkColor}4d</color>
     </carousel>
 
     <!-- System Name -->
@@ -107,6 +107,10 @@
       <color>${backgroundDarkColor}</color>
     </image>
 
+    <image name="custom_bg_fg" extra="true">
+      <color>${backgroundDarkColor}</color>
+    </image>
+
     <!-- System Background -->
     <image name="osdBackground" extra="true">
       <color>${backgroundDarkColor}</color>

diff --git a/settings/colors/commom-hybrid.xml b/settings/colors/commom-hybrid.xml
@@ -90,8 +90,8 @@
 
   <view name="system">
     <carousel name="systemcarousel">
-      <color>${backgroundDarkColor}1a</color>
-      <colorEnd>${backgroundDarkColor}cc</colorEnd>
+      <color ifSubset="custom_background:no">${backgroundDarkColor}1a</color>
+      <color ifSubset="custom_background:yes">${backgroundDarkColor}4d</color>
     </carousel>
 
     <!-- System Name -->
@@ -114,6 +114,10 @@
       <color>${backgroundDarkColor}</color>
     </image>
 
+    <image name="custom_bg_fg" extra="true">
+      <color>${backgroundDarkColor}</color>
+    </image>
+
     <!-- System Background -->
     <image name="osdBackground" extra="true">
       <color>${backgroundDarkColor}</color>

diff --git a/settings/colors/commom-light.xml b/settings/colors/commom-light.xml
@@ -83,8 +83,8 @@
 
   <view name="system">
     <carousel name="systemcarousel">
-      <color>${backgroundLightColor}1a</color>
-      <colorEnd>${backgroundLightColor}cc</colorEnd>
+      <color ifSubset="custom_background:no">${backgroundLightColor}1a</color>
+      <color ifSubset="custom_background:yes">${backgroundLightColor}4d</color>
     </carousel>
 
     <!-- System Name -->
@@ -107,6 +107,10 @@
       <color>${backgroundLightColor}</color>
     </image>
 
+    <image name="custom_bg_fg" extra="true">
+      <color>${backgroundLightColor}</color>
+    </image>
+
     <!-- System Background -->
     <image name="osdBackground" extra="true">
       <color>${backgroundLightColor}</color>

diff --git a/settings/display/commom.xml b/settings/display/commom.xml
@@ -1,3 +1,8 @@
+<!--
+  Theme: Elementerial
+  Author: mluizvitor
+-->
+
 <theme>
   <formatVersion>7</formatVersion>
 
@@ -14,7 +19,7 @@
       <fontSize>${header2F}</fontSize>
       <forceUppercase>0</forceUppercase>
       <alignment>left</alignment>
-      <zIndex>50</zIndex>
+      <zIndex>40</zIndex>
     </text>
 
     <text name="logoText">
@@ -35,6 +40,7 @@
     </image>
 
     <image name="cover_list_fallback" extra="true">
+      <path>./assets/background.png</path>
       <size>1 0</size>
       <origin>0 0</origin>
       <pos>0 0</pos>
@@ -84,7 +90,7 @@
       <fontSize>${header1F}</fontSize>
       <lineSpacing>1</lineSpacing>
       <alignment>left</alignment>
-      <zIndex>90</zIndex>
+      <zIndex>35</zIndex>
     </text>
 
     <!-- Total games per system -->
@@ -94,8 +100,9 @@
       <fontSize>${bodyF}</fontSize>
       <alignment>left</alignment>
       <forceUppercase>0</forceUppercase>
-      <fontPath>${fontLight}</fontPath>
+      <fontPath>${fontRegular}</fontPath>
       <lineSpacing>1</lineSpacing>
+      <zIndex>39</zIndex>
     </text>
 
     <!-- System Logo -->
@@ -113,10 +120,11 @@
 
     <!-- System Background -->
     <image name="cover_fallback" extra="true">
+      <path>./assets/background.png</path>
       <size>1 1</size>
       <origin>0 0</origin>
       <pos>0 0</pos>
-      <zIndex>27</zIndex>
+      <zIndex>25</zIndex>
     </image>
 
     <!-- System Background -->
@@ -125,14 +133,14 @@
       <size>1 0</size>
       <origin>0 0</origin>
       <pos>0 0</pos>
-      <zIndex>28</zIndex>
+      <zIndex>26</zIndex>
     </image>
 
     <image name="osdBackground" extra="true">
       <pos>0 0</pos>
       <origin>0 0</origin>
       <size>1 1</size>
-      <zIndex>30</zIndex>
+      <zIndex>100</zIndex>
     </image>
   </view>
 
@@ -196,6 +204,7 @@
     </menuText>
 
     <menuBackground name="menubg">
+      <path>./assets/menu.png</path>
       <size>1 1</size>
     </menuBackground>
 

diff --git a/settings/display/customBg.xml b/settings/display/customBg.xml
@@ -24,7 +24,18 @@
       <size>1 0</size>
       <origin>0 0</origin>
       <pos>0 0</pos>
-      <zIndex>29</zIndex>
+      <zIndex>27</zIndex>
+    </image>
+
+    <image name="custom_bg_fg" extra="true">
+      <path ifSubset="Ratio:ratio32">./assets/ratio32/custom-bg-fg.png</path>
+      <path ifSubset="Ratio:ratio43">./assets/ratio43/custom-bg-fg.png</path>
+      <path ifSubset="Ratio:ratio169">./assets/ratio169/custom-bg-fg.png</path>
+
+      <size>1 1</size>
+      <origin>0 0</origin>
+      <pos>0 0</pos>
+      <zIndex>28</zIndex>
     </image>
   </view>
 

diff --git a/settings/display/ratio169.xml b/settings/display/ratio169.xml
@@ -33,10 +33,6 @@
       <lineSpacing>1.75</lineSpacing>
     </textlist>
 
-    <image name="cover_list_fallback" extra="true">
-      <path>./assets/ratio169/background.png</path>
-    </image>
-
     <image name="background">
       <path>./assets/ratio169/carousel.png</path>
     </image>
@@ -51,15 +47,15 @@
       <pos>0.75 0.3</pos>
       <origin>0.5 0</origin>
       <maxSize>0.45 0.537500</maxSize>
-      <zIndex>25</zIndex>
+      <zIndex>30</zIndex>
       <roundCorners>0.02</roundCorners>
     </image>
 
     <image name="md_marquee">
       <pos>0.75 0.175</pos>
       <origin>0.5 0</origin>
       <maxSize>0.4 0.225</maxSize>
-      <zIndex>26</zIndex>
+      <zIndex>31</zIndex>
     </image>
 
     <rating name="md_rating">
@@ -69,13 +65,6 @@
     </rating>
   </view>
 
-  <!-- Menu Settings -->
-  <view name="menu">
-    <menuBackground name="menubg">
-      <path>./assets/ratio169/menu.png</path>
-    </menuBackground>
-  </view>
-
   <!-- Carousel Config -->
   <view name="system">
     <!-- Cards position -->
@@ -97,10 +86,6 @@
       <pos>0.11666 0.375</pos>
     </text>
 
-    <image name="cover_fallback" extra="true">
-      <path>./assets/ratio169/background.png</path>
-    </image>
-
     <image name="osdBackground" extra="true">
       <path>./assets/ratio169/osd-bg.png</path>
     </image>

diff --git a/settings/display/ratio32.xml b/settings/display/ratio32.xml
@@ -33,10 +33,6 @@
       <lineSpacing>1.75</lineSpacing>
     </textlist>
 
-    <image name="cover_list_fallback" extra="true">
-      <path>./assets/ratio32/background.png</path>
-    </image>
-
     <image name="background">
       <path>./assets/ratio32/carousel.png</path>
     </image>
@@ -51,15 +47,15 @@
       <pos>0.75 0.3</pos>
       <origin>0.5 0</origin>
       <maxSize>0.45 0.537500</maxSize>
-      <zIndex>25</zIndex>
+      <zIndex>30</zIndex>
       <roundCorners>0.02</roundCorners>
     </image>
 
     <image name="md_marquee">
       <pos>0.75 0.175</pos>
       <origin>0.5 0</origin>
       <maxSize>0.4 0.225</maxSize>
-      <zIndex>26</zIndex>
+      <zIndex>31</zIndex>
     </image>
 
     <rating name="md_rating">
@@ -69,13 +65,6 @@
     </rating>
   </view>
 
-  <!-- Menu Settings -->
-  <view name="menu">
-    <menuBackground name="menubg">
-      <path>./assets/ratio32/menu.png</path>
-    </menuBackground>
-  </view>
-
   <!-- Carousel Config -->
   <view name="system">
     <!-- Cards position -->
@@ -97,10 +86,6 @@
       <pos>0.08333 0.375</pos>
     </text>
 
-    <image name="cover_fallback" extra="true">
-      <path>./assets/ratio32/background.png</path>
-    </image>
-
     <image name="osdBackground" extra="true">
       <path>./assets/ratio32/osd-bg.png</path>
     </image>

diff --git a/settings/display/ratio43.xml b/settings/display/ratio43.xml
@@ -33,10 +33,6 @@
       <lineSpacing>1.75</lineSpacing>
     </textlist>
 
-    <image name="cover_list_fallback" extra="true">
-      <path>./assets/ratio43/background.png</path>
-    </image>
-
     <image name="background">
       <path>./assets/ratio43/carousel.png</path>
     </image>
@@ -51,15 +47,15 @@
       <pos>0.75 0.3</pos>
       <origin>0.5 0</origin>
       <maxSize>0.45 0.537500</maxSize>
-      <zIndex>25</zIndex>
+      <zIndex>30</zIndex>
       <roundCorners>0.02</roundCorners>
     </image>
 
     <image name="md_marquee">
       <pos>0.75 0.175</pos>
       <origin>0.5 0</origin>
       <maxSize>0.4 0.225</maxSize>
-      <zIndex>26</zIndex>
+      <zIndex>31</zIndex>
     </image>
 
     <rating name="md_rating">
@@ -69,13 +65,6 @@
     </rating>
   </view>
 
-  <!-- Menu Settings -->
-  <view name="menu">
-    <menuBackground name="menubg">
-      <path>./assets/ratio43/menu.png</path>
-    </menuBackground>
-  </view>
-
   <!-- Carousel Config -->
   <view name="system">
     <!-- Cards position -->
@@ -97,10 +86,6 @@
       <pos>0.08333 0.375</pos>
     </text>
 
-    <image name="cover_fallback" extra="true">
-      <path>./assets/ratio43/background.png</path>
-    </image>
-
     <image name="osdBackground" extra="true">
       <path>./assets/ratio43/osd-bg.png</path>
     </image>