From bb008d9982ef12cba1ee5643e80411f1df83132e Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sat, 9 Sep 2017 13:32:25 +0200 Subject: [PATCH] Add a new winter theme --- android/assets/themes/theme.list | 1 + android/assets/themes/winter.theme | 26 ++++ android/assets/ui/x0.75/cells/snowflake.png | Bin 0 -> 811 bytes android/assets/ui/x1.0/cells/snowflake.png | Bin 0 -> 1104 bytes android/assets/ui/x1.25/cells/snowflake.png | Bin 0 -> 1345 bytes android/assets/ui/x1.5/cells/snowflake.png | Bin 0 -> 1619 bytes android/assets/ui/x2.0/cells/snowflake.png | Bin 0 -> 2196 bytes android/assets/ui/x4.0/cells/snowflake.png | Bin 0 -> 4424 bytes original-resources/buttons.svg | 140 +++++++++++++++++++- original-resources/gen-ui-png.py | 7 +- themes/create-theme.html | 3 +- 11 files changed, 169 insertions(+), 8 deletions(-) create mode 100644 android/assets/themes/winter.theme create mode 100644 android/assets/ui/x0.75/cells/snowflake.png create mode 100644 android/assets/ui/x1.0/cells/snowflake.png create mode 100644 android/assets/ui/x1.25/cells/snowflake.png create mode 100644 android/assets/ui/x1.5/cells/snowflake.png create mode 100644 android/assets/ui/x2.0/cells/snowflake.png create mode 100644 android/assets/ui/x4.0/cells/snowflake.png diff --git a/android/assets/themes/theme.list b/android/assets/themes/theme.list index d840edc..4c026ff 100644 --- a/android/assets/themes/theme.list +++ b/android/assets/themes/theme.list @@ -1,6 +1,7 @@ default dark darcula +winter solarized-light solarized-dark underwater diff --git a/android/assets/themes/winter.theme b/android/assets/themes/winter.theme new file mode 100644 index 0000000..8924a3f --- /dev/null +++ b/android/assets/themes/winter.theme @@ -0,0 +1,26 @@ +{ + "name": "Winter", + "price": 50, + "colors": { + "background": "81b9b7ff", + "foreground": "ffffffff", + "buttons": [ + "1e9dc8ff", + "00e0ffff", + "2fdbdbff", + "51a0e9ff" + ], + "empty_cell": "4085bfff", + "cells": [ + "d0defbff", "bddedcff", "d9ecf8ff", + "d9f7fcff", "cbe6f1ff", "dfeff2ff", "d9eaf0ff", + "c1dfeaff", "ccdeeaff" + ], + "current_score": "165456ff", + "high_score": "633ad2ff", + "bonus": "103caaff", + "band": "0c2e3cff", + "text": "ffffffff" + }, + "cell_texture": "snowflake.png" +} diff --git a/android/assets/ui/x0.75/cells/snowflake.png b/android/assets/ui/x0.75/cells/snowflake.png new file mode 100644 index 0000000000000000000000000000000000000000..eb6414957a210e1d43ac07cf5c71989a1d063097 GIT binary patch literal 811 zcmV+`1JwM9P)_|BUbOQar+Pq`s7H|~!MXXt%r`kZTS+0@1W7Y%)ZUe@EufPPb z!8EP6T-%L*FYpTZ3|s|*;sgu0Ze?P|d^? z0Gogdz#+i?2A4V31J4r!z6Cax36%!Z56mb0hJ8T09Rt7jK;3lsF9JgznD3VV0??2K z)RQt>CzR>))AD_m0R~_WU(p1vWr4y`7&E{u0w+>oOy^o)!~@lp1qj&ZfjQ%1h)l;l zk`7B+V{AJV7d~6Fk{%|W4{CXF{V3_Nxv!HnAgSIl&Pz$t=Dr|lIEtbvNs53zNfRpG z23AsEBy~qoRH#ur%WA?%QnRE!DNgsB>azS*%mFk4w~1>)H8c-gF2VyEfEM5Y?v(-Y zmeP{A>{a%}YEN6S?||*bXH{y>aQ|E_>Ab_g)Ux+&Gc!P^52h9P6bcgp6ae+KRCcn! z>>@63NzJ-uT>@%#8qhk5UsoE;en)neVFxDRac z0+muAj2Eh6$_Vpsp@5xbz$BsCDh+hc5onR(>Rw2Jx)d5K^jv2DLLg~K(r?Q?C27>r z-#)+P6Rw*8(>ZwhusiMS)E4F5oz@IboZ#fW{MTy}%Kmwc;=yNPF`f pT(RIOKuyGj?hbGY-@)&H)gRfv{0`<4ul)c3002ovPDHLkV1hCpPkR6W literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.0/cells/snowflake.png b/android/assets/ui/x1.0/cells/snowflake.png new file mode 100644 index 0000000000000000000000000000000000000000..a162b55d87780d35ffde9b14608efc1c77b85249 GIT binary patch literal 1104 zcmV-W1h4yvP)uzcafe*QX7(ND8kjjeHi+rHo zB~%*-f+)Tb^A9L}5lB#Pf`agsSfYY!A}zECYC%-X(h3WrC_bXsL~m)4>3(`KGdO#l zIdkUBoqN;ot2^h+?{_}md+t5+J7=Vl1dIVX%F17wfHvSW;4bh0I0?*cHJ7u1k9btW zKwGQXoCKUnFaWT$jPWWyLBLzU5Ksg9fd#Sd87X12!q|4;Q{XCa1^5J*;KSi1U`6=b zj;jVN3;XY;%)r|~CvYO6?~7&{_$CGL4zSWN-&WL56lGK%soTEdjv~jq&_SwL};uNSz|RK$ zN*HtinA!jnF7P{2Vz;>%=&=m$V&ZE{{Ivq`0DUe7)>sk%3~%5F zMo^@Ao4`^F6@Y&LbY~g}lXU^-eNE&w-~c}YY;l5*C7lCY%t$-{OfF&o_|O4HUmk{})}9)NPEpBuN!ul^!2>Nt!L`7~}OcsKrH6mw4oTY;tU}TG%@_ryrdX2Qlr&h^_F5QQuOUg**!6Tt z3oW_thq-I9wsVp`H^!W@#7U%|9>i4z<|M>AJqG{-9LgA@1}wM2CICz%{q!IXpIE26 z8VK)o+1cFzR^~B~wL!6##CZ(FOk|CD8|ZR@?=Au#=1AI4q#DR!;!76;>kGnfwZ#8I zv7KGNi-8vi3Me1=tf~@1GeS-ktDAYobzu2Y}II9 z_((20yEVX0U<1%@yVqNu@R6)DQMwAkx7Gy7uaSzF@H(0Hgc)pVLc|VY}-<6~hNt+Z@kxAMi=~7CcQE~;FDIWs|6WWlp*%%pJm;;^zeu%Xn2WB=6J_gze%mc>NwO>v#@Os^S z&jPcWOYIl0` W9xSX+GH58Nn}x~Ttvq9R30tq58~ zD@uwHQx^rh75CystSBv5bY;7+Xu%(}NtM`y`m6N^D5A6~S_KhT724XQn!JyTnR!m1 z^X{DcX68*A`d#JSIdkv%;Nt= z>SrkemIGgAMC~77G-Y?j6X8Enc3Xjk44aRD%j%&_3E1WVnNOfCz#iB{Tgvdc=p%ib z=UShnz3E7I60lX$t2zGo#xkoY@cEqUeUkP{>i5_zS3ay|ER%`?A2HbUNgDKAUupEi zGFG($`hY{8_pU6x1-QC-CADVisS05a0lp`s_X381!xg|z00VXNWvT+`-opX|z#5>> zXkQkz85ZaVZUB}Q0UZI}0RE00_zQR*!)m7lXcH_^Fm?g6@qOokJ-`*Aunpjo4$i!5 z`A^dQL}r?xfI;B>4t-1!GNThM-hHw{hep~OSs!eoTSI`KHaHgoeZbJ){t{sUwubkbDn-q8T}dn4jO%XCUWQoVR#ta+}@Ho&c3%Uq! zAnXG0a1d;2peOL}Pt)=~-rWKd_82b!k97r`8gLu-NWTMQZUegkj$uP0J7!^OeXodC zQ+G;Q(`K_y(rDV&qXUu-X0-2=)aeO0E$OL@_RW&+GK`6&*CZWlYyUyght9cXy3t7z zuv*eSNw*jVxR`WA(x`Lp_oTrAjrhXtwYgQTrX_7~&LKsahV@#yuu{Z#bMm7hX?1O` z^iHjLsUhjt8Xf7CP9}deB+W?rygpwl*Nmjkk{=D{+`ObmBz;kvOV#OPNn^=`C0+O( z?w7Pd(pp`ZR=r8m1G0UG4@;WLXn#ghr{(8aNzZ1q-z(c>+LZLBq_0zLbCSN3G~NCk z_KN)SM_Lnf$cS{g(i+6RpKg_Px)#wk(F*I$RCEIz-!}w&5CHvXx3FUYu(_FvZh=$K zA(7r33VR*@CB_QF76tAC`V4S&r@pdkIveG$1toe<(u2-9Z;^{Aq2^2T<|YuFbLS-8 zr)W~l(+WkKpiE@}Te1a{lJ0lT&H0Ro-s`s&RR}w21lUJT5+R1(q-brNr)v#1Ehq0T z=`jw;R6x1ePf#JM+eVq;gYcU=uDFHSJIv#Twa3j4gsg?*E4Bc~80K0gh>3)K;$~2Mn zL_{-sm9UBSvlz~J09$$hn`l!RJ{LW<)Nu)yQd80Xw3AN9HhH?k;!vK70_ROAO-bXD z<~=sElC~>KsQXmPXQwFeQO~ueq;comp1e++bGs!yDL?e5fxeY5qSek<8SmRXslpca z)3lvxSw~q6r)eb#7zSPjPR3v}!1^{D^L`k(hv>NQS>Pw&B|;CX)Ge0MiFl(XJ=Z3B zLmmfSShBE}RHOa{0rUO8DLlnW00000NkvXXu0mjf DGe~Qp literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.5/cells/snowflake.png b/android/assets/ui/x1.5/cells/snowflake.png new file mode 100644 index 0000000000000000000000000000000000000000..c76c5c9e7cfb4e1fd005bc0a9aa345a9367befcd GIT binary patch literal 1619 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 BD}w+4 literal 0 HcmV?d00001 diff --git a/original-resources/buttons.svg b/original-resources/buttons.svg index 3bb5be3..0111607 100644 --- a/original-resources/buttons.svg +++ b/original-resources/buttons.svg @@ -15,7 +15,7 @@ viewBox="0 0 500.00001 500.00001" id="svg2" version="1.1" - inkscape:version="0.92.1 r" + inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="buttons.svg"> @@ -152,9 +152,9 @@ borderopacity="1" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.5" - inkscape:cx="-85.026722" - inkscape:cy="8.3628693" + inkscape:zoom="0.70710678" + inkscape:cx="262.74365" + inkscape:cy="334.23276" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -1241,5 +1241,137 @@ inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/original-resources/gen-ui-png.py b/original-resources/gen-ui-png.py index cd66144..8b64f41 100755 --- a/original-resources/gen-ui-png.py +++ b/original-resources/gen-ui-png.py @@ -43,7 +43,8 @@ cells = [ 'basic', 'bubble', 'ghost', - 'drop' + 'drop', + 'snowflake' ] inkscape_default_dpi = 90 @@ -54,7 +55,7 @@ gen_only = sys.argv[1:] for multiplier in multipliers: folder = os.path.join(root, f'x{multiplier}') os.makedirs(folder, exist_ok=True) - + dpi = int(inkscape_default_dpi * multiplier) print('Generating assets for', folder) for objectid in ids: @@ -68,7 +69,7 @@ for multiplier in multipliers: # -d to specify the DPI run(f'inkscape -z -i{objectid} -j -e{filename} -d{dpi} {svg}', shell=True, stdout=DEVNULL) - + folder = os.path.join(folder, 'cells') os.makedirs(folder, exist_ok=True) for cellid in cells: diff --git a/themes/create-theme.html b/themes/create-theme.html index 40e3e84..b700387 100644 --- a/themes/create-theme.html +++ b/themes/create-theme.html @@ -56,9 +56,10 @@ code {