merge latest master

Signed-off-by: Sophia Hadash <sophiahadash@gmail.com>
This commit is contained in:
shadash 2021-10-26 22:12:03 +02:00 committed by Sophia Hadash
parent a7c111dc71
commit 3945c813c0
6 changed files with 195 additions and 5 deletions

View file

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
viewBox="0 0 500.00001 500.00001"
xml:space="preserve"
sodipodi:docname="joystick-arcade.svg"
width="500"
height="500"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<defs
id="defs37"/>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="3440"
inkscape:window-height="1355"
id="namedview35"
showgrid="false"
inkscape:zoom="1.276535"
inkscape:cx="48.58107"
inkscape:cy="292.14962"
inkscape:window-x="2560"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Capa_1"/>
<path
d="M 417.24448,321.62887 H 290.46406 V 203.18299 c 29.57004,-15.17253 50.24261,-46.37199 50.24261,-80.88028 0,-49.755484 -40.45648,-90.235295 -90.21352,-90.235295 -49.75392,0 -90.68819,40.479811 -90.68819,90.233755 0,34.50823 20.16054,65.70803 49.73058,80.89243 V 321.63871 H 83.794395 c -8.581537,0 -15.88378,6.9225 -15.88378,15.50404 v 115.31227 c 0,8.58154 7.302243,15.47757 15.88378,15.47757 H 417.24327 c 8.58154,0 14.85787,-6.89761 14.84609,-15.47757 V 337.14275 c 0,-8.57998 -6.26455,-15.50172 -14.845,-15.50248 z m -285.69759,98.90635 c -13.83099,0 -25.04271,-11.21171 -25.04271,-25.04271 0,-13.83255 11.21477,-25.04271 25.04271,-25.04271 13.83256,1.4e-4 25.04427,11.21016 25.04427,25.04271 0,13.831 -11.21171,25.04271 -25.04427,25.04271 z m 76.84164,0 c -13.831,0 -25.04271,-11.21171 -25.04271,-25.04271 0,-13.83255 11.21171,-25.04257 25.04271,-25.04271 13.83255,0 25.04427,11.21016 25.04427,25.04271 0,13.831 -11.21172,25.04271 -25.04427,25.04271 z"
id="path2"
style="stroke-width:1.55632"/>
<g
id="g4">
</g>
<g
id="g6">
</g>
<g
id="g8">
</g>
<g
id="g10">
</g>
<g
id="g12">
</g>
<g
id="g14">
</g>
<g
id="g16">
</g>
<g
id="g18">
</g>
<g
id="g20">
</g>
<g
id="g22">
</g>
<g
id="g24">
</g>
<g
id="g26">
</g>
<g
id="g28">
</g>
<g
id="g30">
</g>
<g
id="g32">
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
viewBox="0 0 499.99999 499.99999"
xml:space="preserve"
sodipodi:docname="joystick.svg"
width="500"
height="500"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<defs
id="defs37"/>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="3440"
inkscape:window-height="1355"
id="namedview35"
showgrid="false"
inkscape:zoom="1.6448465"
inkscape:cx="217.3455"
inkscape:cy="217.3455"
inkscape:window-x="2560"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Capa_1"/>
<path
d="m 409.8255,398.689 v -45.721 c 0,-5.104 -2.754,-9.565 -6.845,-12.012 0.003,-0.148 0.011,-0.295 0.011,-0.443 0,-13.477 -10.964,-24.441 -24.44,-24.441 -10.644,0 -19.715,6.843 -23.061,16.358 -5.972,-5.001 -14.083,-9.527 -24.153,-13.389 -16.805,-6.446 -37.824,-10.647 -60.605,-12.241 v -33.309 c 19.531,-5.52 27.304,-17.778 27.304,-26.281 0,-4.993 -1.962,-8.299 -3.692,-11.216 -1.801,-3.036 -3.356,-5.658 -3.356,-10.939 0,-4.169 1.781,-6.592 4.247,-9.946 3.043,-4.139 6.83,-9.29 6.83,-18.251 0,-8.642 -4.692,-14.203 -8.832,-19.11 -3.907,-4.632 -7.281,-8.632 -7.281,-15.13 0,-6.105 3.786,-10.587 8.17,-15.776 5.14,-6.084 10.965,-12.98 10.965,-23.499 0,-11.115 -5.57,-15.931 -9.638,-19.446 -3.41,-2.948 -5.469,-4.729 -5.469,-9.758 0,-3.827 3.632,-7.536 7.837,-11.831 7.82,-7.988 18.531,-18.928 12.064,-39.046 -1.274,-3.962 -5.17,-10.608 -16.957,-10.608 -26.031,0 -78.07,32.885 -93.398,42.963 -2.58,1.695 -3.23,3.776 -3.322,5.224 -0.121,1.916 0.706,3.779 2.268,5.114 3.893,3.327 17.398,15.599 27.782,33.82 14.315,25.119 3.467,42.3 -14.506,70.764 -4.865,7.705 -10.379,16.438 -15.729,26.04 -8.867,15.914 -10.283,29.225 -4.208,39.563 7.065,12.024 22.884,17.061 37.443,19.048 v 31.611 c -22.776,1.594 -43.79,5.796 -60.592,12.24 -10.07,3.862 -18.181,8.388 -24.153,13.389 -3.345,-9.515 -12.417,-16.358 -23.061,-16.358 -13.477,0 -24.441,10.965 -24.441,24.441 0,0.146 0.009,0.29 0.011,0.435 -4.099,2.445 -6.859,6.91 -6.859,12.02 v 46.01 30.432 27.936 c 0,5.514 4.486,10 10,10 h 42.578 c 5.514,0 10,-4.486 10,-10 V 443.41 h 194.525 v 13.936 c 0,5.514 4.486,10 10,10 h 42.578 c 5.514,0 10,-4.486 10,-10 v -58.367 c 0,-0.098 -0.012,-0.193 -0.015,-0.29 z m -49.59,13.605 h -36.039 c -10.116,0 -18.316,-8.2 -18.316,-18.316 0,-10.116 8.2,-18.316 18.316,-18.316 h 36.039 c 10.116,0 18.316,8.2 18.316,18.316 -10e-4,10.116 -8.201,18.316 -18.316,18.316 z"
id="path2"/>
<g
id="g4">
</g>
<g
id="g6">
</g>
<g
id="g8">
</g>
<g
id="g10">
</g>
<g
id="g12">
</g>
<g
id="g14">
</g>
<g
id="g16">
</g>
<g
id="g18">
</g>
<g
id="g20">
</g>
<g
id="g22">
</g>
<g
id="g24">
</g>
<g
id="g26">
</g>
<g
id="g28">
</g>
<g
id="g30">
</g>
<g
id="g32">
</g>
</svg>

After

Width:  |  Height:  |  Size: 4 KiB

View file

@ -84,8 +84,8 @@ based on: Switch Theme by Lilbud
<pos>1 1</pos> <pos>1 1</pos>
</datetime> </datetime>
<badges name="md_badges"> <badges name="md_badges">
<itemsPerRow>2</itemsPerRow> <itemsPerLine>4</itemsPerLine>
<rows>3</rows> <lines>2</lines>
<itemMargin>0.0028125 0.005</itemMargin> <itemMargin>0.0028125 0.005</itemMargin>
</badges> </badges>
</view> </view>

View file

@ -85,8 +85,8 @@ based on: Switch Theme by Lilbud
<pos>1 1</pos> <pos>1 1</pos>
</datetime> </datetime>
<badges name="md_badges"> <badges name="md_badges">
<itemsPerRow>1</itemsPerRow> <itemsPerLine>4</itemsPerLine>
<rows>5</rows> <lines>2</lines>
<itemMargin>0.005 0.00375</itemMargin> <itemMargin>0.005 0.00375</itemMargin>
</badges> </badges>
</view> </view>

View file

@ -102,6 +102,7 @@ based on: Switch Theme by Lilbud
<color>${secondaryColor}</color> <color>${secondaryColor}</color>
</text> </text>
<badges name="md_badges"> <badges name="md_badges">
<!-- // clang-format off -->
<customBadgeIcon badge="favorite">./../assets/light/badges/favorite.svg</customBadgeIcon> <customBadgeIcon badge="favorite">./../assets/light/badges/favorite.svg</customBadgeIcon>
<customBadgeIcon badge="completed">./../assets/light/badges/completed.svg</customBadgeIcon> <customBadgeIcon badge="completed">./../assets/light/badges/completed.svg</customBadgeIcon>
<customBadgeIcon badge="kidgame">./../assets/light/badges/kidgame.svg</customBadgeIcon> <customBadgeIcon badge="kidgame">./../assets/light/badges/kidgame.svg</customBadgeIcon>
@ -160,6 +161,7 @@ based on: Switch Theme by Lilbud
<customControllerIcon controller="joycon_pair_nintendo">./../assets/light/controllers/joycon-pair.svg <customControllerIcon controller="joycon_pair_nintendo">./../assets/light/controllers/joycon-pair.svg
</customControllerIcon> </customControllerIcon>
<customControllerIcon controller="unknown">./../assets/light/controllers/generic.svg</customControllerIcon> <customControllerIcon controller="unknown">./../assets/light/controllers/generic.svg</customControllerIcon>
<!-- // clang-format on -->
</badges> </badges>
</view> </view>
<view name="detailed, video, grid"> <view name="detailed, video, grid">

View file

@ -11,7 +11,7 @@ based on: Switch Theme by Lilbud
<formatVersion>7</formatVersion> <formatVersion>7</formatVersion>
<!-- includes (hard-coded variant until v1.3) --> <!-- includes (hard-coded variant until v1.3) -->
<include>./variants/light16_9/default.xml</include> <include>./variants/light4_3/default.xml</include>
<include>./navigationsounds.xml</include> <include>./navigationsounds.xml</include>
<!-- variables --> <!-- variables -->
@ -428,6 +428,7 @@ based on: Switch Theme by Lilbud
<pos>0.8423 0.69</pos> <pos>0.8423 0.69</pos>
<size>0.1267 0.17335978655</size> <size>0.1267 0.17335978655</size>
<origin>0 0</origin> <origin>0 0</origin>
<direction>column</direction>
<slots>controller favorite kidgame broken completed altemulator</slots> <slots>controller favorite kidgame broken completed altemulator</slots>
<controllerPos>0.165 0.5</controllerPos> <controllerPos>0.165 0.5</controllerPos>
<controllerSize>0.2</controllerSize> <controllerSize>0.2</controllerSize>