4_3 and 16_9 variants for placeholders

Signed-off-by: Sophia Hadash <sophiahadash@gmail.com>

themes/modern-DE/settings/16_9.xml

@@ -23,6 +23,13 @@ based on:       Switch Theme by Lilbud
 
 	<!-- system specific styles -->
 	<view name="system">
+		<image name="logoPlaceholderImage">
+			<size>0.225 0.3975</size>
+		</image>
+		<text name="logoPlaceholderText">
+			<size>0.18 0.32</size>
+			<fontSize>0.035</fontSize>
+		</text>
 		<image name="selection_bottom" extra="true">
 			<pos>0.5 0.7025</pos>
 			<size>0.23 0.003</size>
@@ -72,8 +79,8 @@ based on:       Switch Theme by Lilbud
 			<pos>1 1</pos>
 		</datetime>
 		<badges name="md_badges">
-			<itemsPerLine>4</itemsPerLine>
+			<itemsPerRow>2</itemsPerRow>
-			<lines>2</lines>
+			<rows>3</rows>
 			<itemMargin>0.0028125 0.005</itemMargin>
 		</badges>
 	</view>

themes/modern-DE/settings/4_3.xml

@@ -23,21 +23,28 @@ based on:       Switch Theme by Lilbud
 
 	<!-- system specific styles -->
 	<view name="system">
+		<image name="logoPlaceholderImage">
+			<size>0.235 0.313</size>
+		</image>
+		<text name="logoPlaceholderText">
+			<size>0.18 0.32</size>
+			<fontSize>0.035</fontSize>
+		</text>
 		<image name="selection_bottom" extra="true">
-			<pos>0.5 0.7025</pos>
+			<pos>0.5 0.66</pos>
-			<size>0.23 0.003</size>
+			<size>0.24 0.003</size>
 		</image>
 		<image name="selection_top" extra="true">
-			<pos>0.5 0.2975</pos>
+			<pos>0.5 0.34</pos>
-			<size>0.23 0.003</size>
+			<size>0.24 0.003</size>
 		</image>
 		<image name="selection_left" extra="true">
-			<pos>0.385 0.5</pos>
+			<pos>0.38 0.5</pos>
-			<size>0.0016875 0.408</size>
+			<size>0.0016875 0.3208</size>
 		</image>
 		<image name="selection_right" extra="true">
-			<pos>0.615 0.5</pos>
+			<pos>0.620 0.5</pos>
-			<size>0.0016875 0.408</size>
+			<size>0.0016875 0.3208</size>
 		</image>
 	</view>
 
@@ -73,8 +80,8 @@ based on:       Switch Theme by Lilbud
 			<pos>1 1</pos>
 		</datetime>
 		<badges name="md_badges">
-			<itemsPerLine>5</itemsPerLine>
+			<itemsPerRow>1</itemsPerRow>
-			<lines>1</lines>
+			<rows>5</rows>
 			<itemMargin>0.005 0.00375</itemMargin>
 		</badges>
 	</view>

themes/modern-DE/settings/dark.xml

@@ -19,6 +19,7 @@ based on:       Switch Theme by Lilbud
 		<secondaryColor>f4f4f4</secondaryColor>
 		<tertiaryColor>858585</tertiaryColor>
 		<systemColor>3aa5ab</systemColor>
+		<placeholderColor>505050</placeholderColor>
 	</variables>
 
 	<!-- generic styles -->
@@ -29,6 +30,9 @@ based on:       Switch Theme by Lilbud
 			<iconColorDimmed>${secondaryColor}</iconColorDimmed>
 			<textColorDimmed>${secondaryColor}</textColorDimmed>
 		</helpsystem>
+		<text name="logoPlaceholderText">
+			<color>${secondaryColor}</color>
+		</text>
 		<image name="background">
 			<color>${backgroundColor}</color>
 		</image>
@@ -42,6 +46,9 @@ based on:       Switch Theme by Lilbud
 
 	<!-- system specific styles -->
 	<view name="system">
+		<image name="logoPlaceholderImage">
+			<color>${placeholderColor}</color>
+		</image>
 		<text name="system_name_1" extra="true">
 			<color>${mainColor}</color>
 		</text>

themes/modern-DE/settings/light.xml

@@ -18,6 +18,7 @@ based on:       Switch Theme by Lilbud
 		<highlightColor>23caca</highlightColor>
 		<secondaryColor>222222</secondaryColor>
 		<systemColor>3aa5ab</systemColor>
+		<placeholderColor>ffffff</placeholderColor>
 	</variables>
 
 	<!-- generic styles -->
@@ -41,6 +42,12 @@ based on:       Switch Theme by Lilbud
 
 	<!-- system specific styles -->
 	<view name="system">
+		<image name="logoPlaceholderImage">
+			<color>${placeholderColor}</color>
+		</image>
+		<text name="logoPlaceholderText">
+			<color>${secondaryColor}</color>
+		</text>
 		<text name="system_name_1" extra="true">
 			<color>${systemColor}</color>
 		</text>

themes/modern-DE/theme.xml

@@ -11,7 +11,7 @@ based on:       Switch Theme by Lilbud
 	<formatVersion>7</formatVersion>
 
 	<!-- includes (hard-coded variant until v1.3) -->
-	<include>./variants/dark16_9/default.xml</include>
+	<include>./variants/dark4_3/default.xml</include>
 	<include>./navigationsounds.xml</include>
 
 	<!-- variables -->
@@ -59,17 +59,12 @@ based on:       Switch Theme by Lilbud
 		</image>
 		<image name="logoPlaceholderImage">
 			<pos>0.5 0.5</pos>
-			<size>0.225 0.3975</size>
-			<color>505050</color>
 			<path>./assets/box.png</path>
 		</image>
 		<text name="logoPlaceholderText">
 			<pos>0.5 0.5</pos>
 			<origin>0.5 0.5</origin>
-			<size>0.18 0.32</size>
-			<fontSize>0.035</fontSize>
 			<fontPath>${mainFont}</fontPath>
-			<color>f4f4f4</color>
 			<forceUppercase>false</forceUppercase>
 			<text>${system.fullName}</text>
 		</text>
@@ -435,8 +430,7 @@ based on:       Switch Theme by Lilbud
 			<pos>0.8423 0.69</pos>
 			<size>0.1267 0.17335978655</size>
 			<origin>0 0</origin>
-			<direction>column</direction>
+			<itemPlacement>top</itemPlacement>
-			<align>start</align>
 			<slots>favorite kidgame broken completed altemulator</slots>
 		</badges>
 	</view>