mirrors
/
FunKey-OS
mirror of https://github.com/FunKey-Project/FunKey-OS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

corrected few defects in themes

This commit is contained in:
Vincent-FK 2020-11-12 18:41:06 +01:00
parent f4e93b7c25
commit ac96e59a83
7 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/Classic/layout.xml
View File

@ -8,8 +8,6 @@
<!--Background Image-->
<!-- <image src="images/bkgnd.png" x="0" y="0" height="stretch" width="stretch" layer="0"/> -->
<image src="images/background.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<!--Battery-->
@ -65,6 +63,10 @@
<!--This image is the main menu bar background Notice that it has its animations set to menuIndex="0". as it is only shown for the top most menu -->
<image src="images/barbkgrnd.png" alpha="0.8" x="center" y="center" yOffset="0" xOrigin="center" yOrigin="center" layer="5">
<onEnter> <set duration=".3"><animate type="alpha" to="1"/></set></onEnter>
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></oneGameExit>
<onMenuExit menuIndex="0">
<set duration=".2">
<animate type="yOffset" from="0" to="-104" algorithm="easeinquadratic"/>
@ -95,6 +97,8 @@
<item xOffset="-300" alpha="0"/>
<item xOrigin="right" xOffset="-80">
<onEnter> <set duration=".3"><animate type="alpha" to="1"/></set></onEnter>
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onMenuEnter menuIndex="0">
<set duration=".4">
<animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
@ -109,8 +113,11 @@
<!-- This is the Selected item of the menu we override the width and alpha here to make it more clear that it is indeed selected -->
<!-- we also have animations inplace so that this logo stays visable and moves to another location when entering the sub menu -->
<item selected="true" layer="7" alpha="1">
<onEnter> <set duration=".3"><animate type="alpha" to="1"/></set></onEnter>
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></oneGameExit>
<onMenuExit menuIndex="0">
<set duration=".2">
<animate type="yOffset" from="0" to="-104" algorithm="easeinquadratic"/>
@ -124,6 +131,8 @@
</item>
<item xOrigin="left" xOffset="80">
<onEnter> <set duration=".3"><animate type="alpha" to="1"/></set></onEnter>
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onMenuEnter menuIndex="0">
<set duration=".4">
<animate type="alpha" from="0" to="0.5" algorithm="easeincircular"/>
@ -143,6 +152,20 @@
<!-----------------SUB MENU----------------->
<!--Sub Menu index 1-->
<menu type="custom" imageType="artwork_front" scrollTime=".24" scrollAcceleration=".04" orientation="horizontal" x="0" y="center" yOrigin="center" algorithm="easeincircular">
@ -159,8 +182,10 @@
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onMenuEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></onMenuEnter>
<onMenuExit menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></oneGameExit>
<!-- <onIdle menuIndex="1">
<set duration=".4">
<animate type="alpha" from="1" to=".6"/>
@ -187,6 +212,9 @@
<!--Sub Menu Bar Background-->
<!--This image is the sub menu bar background Notice that it has its animations set to menuIndex="0". as it is only shown for the top most menu -->
<image src="images/barbkgrnd.png" x="0" xOrigin="left" xOffset="0" y="center" yOrigin="top" yOffset="120" alpha="0.5" layer="4">
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></oneGameExit>
<onMenuExit menuIndex="0">
<set duration=".1">
<animate type="yOffset" from="120" to="87" algorithm="easeinquadratic"/>

6
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/Classic/splash.xml
View File

@ -2,13 +2,11 @@
<!--backgroundImage-->
<image src="images/background.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<image src="images/Funkey_S_gray.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<!-- logo -->
<image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
<!-- <image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/> -->
<text value="Loading..." x="center" y="bottom" xOrigin="center" xOffset="0" yOrigin="center" yOffset="-20" height="33" width="stretch" fontSize="32" layer="3">

6
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/Flat/splash.xml
View File

@ -2,13 +2,11 @@
<!--backgroundImage-->
<image src="images/background.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<image src="images/Funkey_S_gray.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<!-- logo -->
<image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
<!-- <image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/> -->
<text value="Loading..." x="center" y="bottom" xOrigin="center" xOffset="0" yOrigin="center" yOffset="-20" height="33" width="stretch" fontSize="32" layer="3">

6
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/FunKey/splash.xml
View File

@ -2,13 +2,11 @@
<!--backgroundImage-->
<image src="images/background.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<image src="images/Funkey_S_gray.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<!-- logo -->
<image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
<!-- <image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/> -->
<text value="Loading..." x="center" y="bottom" xOrigin="center" xOffset="0" yOrigin="center" yOffset="-20" height="33" width="stretch" fontSize="32" layer="3">

BIN
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/TFT/Roboto-Bold.ttf Normal file
View File

Binary file not shown.

32
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/TFT/layout.xml
View File

@ -44,15 +44,15 @@
<reloadableImage mode="layout" type="controller_h120" alpha="0" x="center" y="104" yOrigin="center" xOrigin="center" layer="2" alpha="1" >
<onEnter><set duration=".2"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onEnter>
<onExit><set duration=".4"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onMenuEnter menuIndex="0"><set duration=".4"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onMenuEnter>
<onMenuExit menuIndex="0"><set duration=".1"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onMenuExit>
<onEnter><set duration=".2"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onEnter>
<onExit><set duration=".3"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onMenuEnter menuIndex="0"><set duration=".4"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onMenuEnter>
<onMenuExit menuIndex="0"><set duration=".1"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onMenuExit>
<onHighlightEnter menuIndex="0"><set duration=".1"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onHighlightEnter>
<!-- <onHighlightExit menuIndex="0"><set duration=".1"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onHighlightExit> -->
<!-- <onHighlightExit menuIndex="0"><set duration=".1"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onHighlightExit> -->
<onMenuScroll menuIndex="0">
<set duration=".1">
<animate type="alpha" to="0.0" algorithm="easeinquadratic"/>
@ -81,7 +81,9 @@
<!-- This is the Selected item of the menu we override the width and alpha here to make it more clear that it is indeed selected -->
<!-- we also have animations inplace so that this logo stays visable and moves to another location when entering the sub menu -->
<item selected="true" layer="7" alpha="1">
<onExit><set duration=".2"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onExit><set duration=".3"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></onGameEnter>
<onMenuExit menuIndex="0">
<set duration=".1">
<!-- <animate type="yOffset" from="0" to="-150" algorithm="easeinquadratic"/>
@ -138,7 +140,7 @@
<item yOffset="-240" alpha="0"/>
<item yOffset="0" selected="true">
<onExit> <set duration=".3"><animate type="alpha" to="0" algorithm="easeincubic"/></set></onExit>
<onExit> <set duration=".3"><animate type="alpha" to="0" algorithm="easeincubic"/></set></onExit>
<onMenuEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></onMenuEnter>
<onMenuExit menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onGameEnter>
@ -152,7 +154,9 @@
<!-- Repeat tft bg with transparency -->
<image src="images/background_tft.png" x="-51" y="0" height="stretch" width="stretch" alpha="0" layer="5">
<onExit><set duration=".4"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onExit><set duration=".3"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></onGameEnter>
<onMenuExit menuIndex="0"><set duration=".2"><animate type="alpha" to="0.9" algorithm="easeinquadratic"/></set></onMenuExit>
<onMenuEnter menuIndex="0"><set duration=".01"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onMenuExit>
</image>
@ -160,7 +164,9 @@
<!-- System name -->
<reloadableImage mode="systemlayout" type="logo_h20" alpha="0" x="15" xOrigin="left" y="32" yOrigin="center" layer="6">
<onExit><set duration=".4"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onExit>
<onExit> <set duration=".3"><animate type="alpha" to="0" algorithm="easeincubic"/></set></onExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onGameEnter>
<onGameExit menuIndex="1"><set duration=".3"><animate type="alpha" to="1"/></set></onGameEnter>
<onMenuExit menuIndex="0"><set duration=".001"><animate type="alpha" to="1" algorithm="easeinquadratic"/></set></onMenuExit>
<onMenuExit menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuExit>
<!-- <onMenuEnter menuIndex="0"><set duration=".001"><animate type="alpha" to="0" algorithm="easeinquadratic"/></set></onMenuExit> -->
@ -180,7 +186,7 @@
<!--Game cover idx -1 -->
<reloadableText type="title" selectedOffset="-1" alpha="0" x="20" xOrigin="left" xOffset="0" y="65" yOrigin="center" yOffset="-16" width="155" menuScrollReload="true" fontSize="16" loadFontSize="16" fontColor="AE9A53" layer="14" textFormat="uppercase" >
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onMenuEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuEnter>
<onMenuExit menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>
@ -216,7 +222,7 @@
<!--Game cover idx 0 -->
<reloadableText type="title" selectedOffset="0" alpha="0" x="20" xOrigin="left" xOffset="0" y="65" yOrigin="center" yOffset="0" width="155" menuScrollReload="true" fontSize="16" loadFontSize="16" fontColor="C9C9C9" layer="14" textFormat="uppercase" >
<onExit> <set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onExit><set duration=".3"><animate type="alpha" to="0"/></set></onExit>
<onMenuEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuEnter>
<onMenuExit menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></onMenuExit>
<onGameEnter menuIndex="1"><set duration=".3"><animate type="alpha" to="0"/></set></oneGameEnter>

7
FunKey/board/funkey/rootfs-overlay/usr/games/layouts/TFT/splash.xml
View File

@ -1,14 +1,13 @@
<layout width="240" height="240" font="Roboto-Bold.ttf" loadFontSize="18" fontColor="FFFFFFF">
<!-- <layout width="240" height="240" font="Roboto-Bold.ttf" loadFontSize="18" fontColor="FFFFFFF" minShowTime="2"> -->
<!--backgroundImage-->
<image src="images/background.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<image src="images/Funkey_S_gray.png" x="0" y="0" height="stretch" width="stretch" layer="0"/>
<!-- logo -->
<image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/>
<!-- <image src="images/logo.png" x="center" y="center" xOrigin="center" yOrigin="center" layer="1" alpha="1"/> -->
<text value="Loading..." x="center" y="bottom" xOrigin="center" xOffset="0" yOrigin="center" yOffset="-20" height="33" width="stretch" fontSize="32" layer="3">