From 9663bc5376705a4dfbeabdfc83b0340845de62ed Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 7 May 2017 18:43:25 +0200 Subject: [PATCH] Choose a better cell texture depending on screen size --- android/assets/ui/x0.75/cells/basic.png | Bin 0 -> 337 bytes android/assets/ui/x0.75/cells/bubble.png | Bin 0 -> 823 bytes android/assets/ui/x1.0/cells/basic.png | Bin 0 -> 421 bytes android/assets/ui/x1.0/cells/bubble.png | Bin 0 -> 1087 bytes android/assets/ui/x1.0/cells/round.png | Bin 0 -> 302 bytes android/assets/ui/x1.25/cells/basic.png | Bin 0 -> 505 bytes android/assets/ui/x1.25/cells/bubble.png | Bin 0 -> 1388 bytes android/assets/ui/x1.25/cells/round.png | Bin 0 -> 380 bytes android/assets/ui/x1.5/cells/basic.png | Bin 0 -> 655 bytes android/assets/ui/x1.5/cells/bubble.png | Bin 0 -> 1654 bytes android/assets/ui/x1.5/cells/round.png | Bin 0 -> 422 bytes android/assets/ui/x2.0/cells/basic.png | Bin 0 -> 779 bytes android/assets/ui/x2.0/cells/bubble.png | Bin 0 -> 2191 bytes android/assets/ui/x2.0/cells/round.png | Bin 0 -> 491 bytes android/assets/ui/x4.0/cells/basic.png | Bin 0 -> 1528 bytes android/assets/ui/x4.0/cells/bubble.png | Bin 0 -> 4842 bytes android/assets/ui/x4.0/cells/round.png | Bin 0 -> 1063 bytes .../io/github/lonamiwebs/klooni/SkinLoader.java | 2 +- core/src/io/github/lonamiwebs/klooni/Theme.java | 2 +- .../lonamiwebs/klooni/game/BaseScorer.java | 2 +- 20 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 android/assets/ui/x0.75/cells/basic.png create mode 100644 android/assets/ui/x0.75/cells/bubble.png create mode 100644 android/assets/ui/x1.0/cells/basic.png create mode 100644 android/assets/ui/x1.0/cells/bubble.png create mode 100644 android/assets/ui/x1.0/cells/round.png create mode 100644 android/assets/ui/x1.25/cells/basic.png create mode 100644 android/assets/ui/x1.25/cells/bubble.png create mode 100644 android/assets/ui/x1.25/cells/round.png create mode 100644 android/assets/ui/x1.5/cells/basic.png create mode 100644 android/assets/ui/x1.5/cells/bubble.png create mode 100644 android/assets/ui/x1.5/cells/round.png create mode 100644 android/assets/ui/x2.0/cells/basic.png create mode 100644 android/assets/ui/x2.0/cells/bubble.png create mode 100644 android/assets/ui/x2.0/cells/round.png create mode 100644 android/assets/ui/x4.0/cells/basic.png create mode 100644 android/assets/ui/x4.0/cells/bubble.png create mode 100644 android/assets/ui/x4.0/cells/round.png diff --git a/android/assets/ui/x0.75/cells/basic.png b/android/assets/ui/x0.75/cells/basic.png new file mode 100644 index 0000000000000000000000000000000000000000..f242f18cc3003fd58c3ec76cb39fb8b51d0a5796 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSc;uILpXq-h9ji|$mcBZh%9Dc z;PL}uMhUH>tAT=&C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6d{^K@|x ziD-R$!u$W9`6bFlyh>2o_ZaJyEAkTN0pg#-cui*NA6V9K zb#C>31*PHyZjl2kmhUWo!188p@$+l3N}B`)^$(YdPAttS5KLnWIk05;@=Md$!_MvG zb`ZOJL-hc|le0MwM7K!X`;;RoW~kxM@N>r8(zjj{8@KQ*NmbBg&Xn{x?GVLw$!Nkf zkdSC|jghN~HJhxkgHve4pZ9^gesTvIy;=R)LDJyE-|{n4eyxdRcsx(R{FVO`f#fyu aRSduKXRfQ~JQoJ^8H1;*pUXO@geCx`OnlD( literal 0 HcmV?d00001 diff --git a/android/assets/ui/x0.75/cells/bubble.png b/android/assets/ui/x0.75/cells/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..54eb12da0649e3760cc4ec4b4bcff47b26e62d42 GIT binary patch literal 823 zcmV-71IYY|P)3^0B8tsyYkY z$3-Qv$NRt^`)sFmU_nGabp@oV0^9%|0;9kPFcbjQfn8uH2b2Quffpj89RsQA2=ExV z0*o6_IRI)HP!0HPmPgCLGZEQ~bq=?H5#SMU85jd9235vI30%5%Xij0CNL>PkRP{+L zQb}Y0z-=2?#zn?MO#oA76ZUM({7N}syeCH$yh@xWSAVKytwHN`MDe9&sSsXFRnAwokgu{i^ewEb% zuudZcFt4hUBC^>81e_(iFYVxJC&8sIr>{o7B_EU6+{*`nPDh*-mnJ1mTS6MG zFoH#*<24-vI?=*;A6GAR^A98BYph$H^oOL!3tbcsfX(0z|FZ>Q)^JzpOwAMm3c$_-*NC4kGw#4D?$3sm zHonDx0n{WD(fO3`a#8>Q002ovPDHLkV1nn{ BT6q8f literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.0/cells/basic.png b/android/assets/ui/x1.0/cells/basic.png new file mode 100644 index 0000000000000000000000000000000000000000..da45655b15511656ef8b2997b944e610d5efe21a GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=E7)o-U3d z8I5meZuDh#6mb17P{6l<#mk|^|b8MZ^b)zJsWX zAov_^B8a|&h^`ee`?yL#4TgXw;AP`&bS9b1aZ#u2nzFmow@k9g54EW2s-FMruC6+D z3ih<8QZiNCL`3?5v%opv1aKTU1k?cm)`4%pXJ8e02P_+7+GYQ{6o81F0xkiQz;Mp) zzkzvR&KUEdsE0xTA~FVC119ty2K%Ht1$`_6PmD1i^LESyAR+_6b>J#?c=Q1^cNq)N z*0Pz?O9yy~1=+~jDKmhG90zUz&=0Q3_Nuz?--t*rO=^bvSyjQNtKaV7u}ISt$a zj$ogBod}>$@6*9P^)`|D7SPOP->L!JH^wY))o@Dy5jg|g1r7s4*pIbN^cF&ZbuCRT zf3%)gE#RIpW+kmrE$yNXn;Brg8g@_Lfs6qAyfUJ{4-r8QZuLJ2ssl43a?;==Ck4{lIPYk`Dko+l*?Pz6=l}*eCCX)_~WquOI-}g>gC;fX?%m zwQ97T198Q{3@bqRVb_9EMpr~+G&2BpkxKhhVy7yV`(T|>KbZ3Y+;DRMMMLZ) zo%AaqKBaxOL!FZ@lD|0CVAw{{d*Cb+H$Ya%v$icbc>k zKc@O9vWz;w)3^(<0LGX#Y@&6y=y_7+IxQA@0u;{MSEyCsS<=Ns08Mc}!tQr>Nv400+wZ%B1Sj>rR>_zDfGNxe9&29&n^Sd8Z;r zOw+&>s^1KCfEU2iZ8>7{rHR&QqC>ti5?}#)Hnx_xbJ=6oF>JbT3Y&DwqXyA2YvC}y z%7gB4Y|`l@HuZ6kXan8^zGF8`Yrq>|rHX^@J?*Ka{sPj4Fdk>(d^P|8002ovPDHLk FV1i8;=~4gy literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.0/cells/round.png b/android/assets/ui/x1.0/cells/round.png new file mode 100644 index 0000000000000000000000000000000000000000..8555cfd31dae14034617f077ac55262f551a7fb3 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR45nC4~b?cT-JI-l`%8Big&y$S zX;?m2#)9#r#2!|yy5&rl6n98A#LntFa!u~mpSeOEs+ozh)t;*xR(Gkq{loUX;jP|I z6-n(Cs=CZl9znT1op%H|TH_FQ#N3NLH2)*x8v7E5Q~%{NFW)}tb!y_- qzZ=v$8p8nb}TX7F_Nb6Mw<&;$U(0&98z literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.25/cells/basic.png b/android/assets/ui/x1.25/cells/basic.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6141f8c8264842d4e0530792965a0953aa9099 GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8EX7WqAsj$Z!;#Vf4nJ z2wH+Lqx8+mZa_iF64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&%RF5i zLoyoQ-nRBT93bHK(AY%8p)n}n(+!tNTOHdQSsmGRIl>$@CMroec+L7F60Yz(X#(es z&i0>H@zxjT?3waN%BkS!s~D9`?i;LSuk4n&GRZZv8(06kYwYRlDL!dgRITvRNcQfQ zSxbaHH!oGwNmE-nA>{vLjh7`So&UEkTJ`qwYK2UWnDDu;B^aHJcWdjf3yrDp_@1n2 zDif+(H(?8BPvh5VZCSTOUd+7t`nS_RKKTdgVnL_tDi!(f<>gPi_T?0N<%ah6d3ozr zzH&dkmE)UU)86ic_ewW*6T{@c7PKtmT1>FqpDT|PawVtpe|k`TDNRp**?|>%48(KN z^bdq~Gn>BMw1=C2mHBkOhS{r%WrOpJSI)f4l%DH*b%9d<-$|F)K04jKt5COQevW{C z>vz?;+PUlFOM$-rec$xz-jm79HX1H1;j1v~|Ge47HOPko>Es(cp?d>ObUBD>=@GB&WPE&w0k=4TfN zJK@uQH4@lepQ?iY0em7Nzm0SASiq`!5qJl98aIRkaDd*giUYL3JGkDeq8@NVM1C0c z#*u(kRe-C&HDJo8Nz%|+zyY?00}iRGz5~7x5iNT|-eY1w9`;?_oSh^Aw$K4M{E&7y z_o6bTdQZO&bXE1Uve2c0aSPK0(y-H{p}PzMhu#hO@j_PB;kXF=1AJAcaw%XxXD{P= zu-amwP5pGw#c}u0vBe+cT93>~}p&aW)P{qwBB` z?U6VZTfh^49m@J9#ckEC3!Y&>c|H6pgS{I+KdlE9T*hr2XaL?OaV4!U9sdAzYYI4@ zRgedqS($8D>n?8NU_%-PU5De5r%Z-{C0td{kiU7ikR1jciaip?BaDbpKm0J^I<(c4 zUR2e25!tYrSYggWo-zRy##*T&^2|d!#O==Ms3Vd!zBi1j5G?;zHh6O2a z_*dOHl+hyYv}9jdz-7*&g8v)4i*e6~MacpO=r&F%&&C-kV1JZ)x@2R)XxqE?h=-`$ zLO1a!%F?{5PS_*hxQ9<=H@;KwxY{j{lFVAE!#fc^98QJWSu ztd00JY}TSR)+>xds`WS{3;3573~5WNaYh#KPc0bImWBiSH}3;O;RtF?L>|VOd5*{Z zhK*@MnGAWr_h@Io+LU$}1=z<_jQsBP5NRbZE~LnpUgl`_@(yq(uP_(b2aw!s!lH)t zt%z*q6%N}i-NwaK92GqP?iN)j1oqJ~A8|B>b`SV;ScK2e{jiAq4&12Ass{CWnaG|} z2LS%f`mM?)HK&^*@?)8bqnvnr4Xli3Por7^zA0OI+_0sqBO29|mVqxv30oRBFl`CA zPW^F}W!1yY*;2#Us%q%r`?xTJHuV7b*e|9dtFGYEYa~J6P3d5RORaoN#bsR7z*HS= z8tssT59fMNWz|H0_<3A__(H|z)^IzX!xtc)B~_iry{~D literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.25/cells/round.png b/android/assets/ui/x1.25/cells/round.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5b071e1ea443862f438b3cf7e01a9fb2f1b60e GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VORK)Llnx)_T+01}?H9Z3m%N|{S}hx1J!w5ICgI>@CMfctlzYty zUr8Ak2KLko91Btlz`cSrMghfeUbb%-S)M9?XNa5{tBGG$|^f*gY5&k9m$&$o~La8xvx0w|J3-> X&V?rZUO88QfxzJD>gTe~DWM4f%(R4nJ zh#UrCM$rOaC!nBYiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}CJf1F& zAr*7p-r4Ub5-8F3@wxGY4E9z5)oHg9l9L-%3OFl7^O=l+@oqcAx1E|xT@!>WICS{UE^hE^ zV1AJ7@@LL7ZleINOvwt)Jq*+IOyg|*8e$*hy3FyjDok21<&y9N+Yb+3rL8_CxItKO z{x825yiQ#r%y4wPfF>oV5N+qG7=2&A)i=NEd9FCByVuu<+Wy2Vv*M;|%Q! z8Lpl9zgc#!^@_@<+Q-lAR{p!Lx#3dXuBq=9_&(F;d!qiu?RSFag~bokSB5>m<=yzM z&%k4C*ll*NMlm;uC1G>3-&c1<9&Th|7n1QPP&h~vhF4=Szou- zE)aQ<0AyX=S*CyT&tr**-j4lsX+TdzZr*8qEkv~PdLQ%O(}$*?IDP0nzip`MK8F6~ zabov!u5WOTE3toluJQR&3xkKYD{gis%--{&E=-mwT5#k2@nSkt OFnGH9xvX5DbB!XKJw#F5M9ps8BZG%yi)djq%#ECGwac@g=yhMHO#FfSsxrJWlfrPKl7Mc`gw+yp^Ga%JH(&F{Rc$IrmWBJyhXLYJM#~K>eP7@|guz!buhN@`Zx)pfClp$KtfJ|@o3b5bY zXRDD5$pz#>3I!LE-?-b5xAp_CnX*JFiv=A84w>I>^>GUnYeh+ox?eSm&_Upd*vL_t zFoVEny!(7OE+iLJ$Z~u@E)+KurDv5=cf~~PnF(W#FF0`}5JHw@Az4eBq!UgOlrb;u zA~X)X98=X|{!2%IyS;NENFiVrl3TSxP}0&WN(X?sUXfA(DW!IxC!T5Y3laL;@9ulu zQK+8?VLa39)#)S)B@ zvk{5*vYaNJQwD!F??Q5e1yr_X$pGm7$V3}-j$wR%Psp;|hCSpk8wMOmFp4ffW-V(v zGSL>D9>9?Gq&dt&exaePpaT1pQe*xKZpec6CY(=F3*9UEaC-TqZDZ|LwKCfsUlV9Q z*I)igU$NHXO3@xETUTogpdwZ@2GKMTfNmV%0k+y$Kxyk@7EqPcRrU~|$s8W!5A<9M zsU`*A5};t@ZLY=8 z$s|CF{J+|vO%iHN5RmcBc6ryfu@*!mIQ~nUYMd=7GgZ{LNf*)p{QzWo8*7Vd75Fjf zVj>_BX#%H<$Wg`gW!grWUbFdmU@hPLR7z{WnY0M0fJ9^yIF)CPDyEaBjERcz2h9T) z^2tx7^b0+#2O@*AEH2m6z(Rld zsg%wEU&ls{24u|fLm-NLMfE#+b4&ChLMErZnSz`k;5XRY+A#G!y3Of(3wfSfGM}TET{``!8e1}5 znY|A$(fw9_*}8z<)SF9hTg0~TIp7%jCG9e`2Al-WRB~ImEAwH2M}eo%I}?l4DtZt* z-)rL8kIMWs#lz?gEqTcOG{twucU6eW{J6;^8rG~i?jzgBO_tHCEsMZXk`Fm=4g2#r zd(bYv|?Rm0^7zXQYuv8flpN4{|FgC`AgCkN^Mx07*qoM6N<$g8lXI Aod5s; literal 0 HcmV?d00001 diff --git a/android/assets/ui/x1.5/cells/round.png b/android/assets/ui/x1.5/cells/round.png new file mode 100644 index 0000000000000000000000000000000000000000..ae0481b93535c6f7a2a4c9a57ee2b17dfdfefa12 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ zh#UrCM$rOaC!nBYiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?%APKc zAs(Gur}}y^I|{h%FPdDz)Tz+%!ikeb(4>O5d3nL&Nvn5!2zuqzlG5|Y=_AvzyTuoc zgF4S$FrN8un(ybh(2Mp#k0Q>fEzr+Y$W)I1HKim!t-tr|0V@MGqf?U^uRCnl`y*1Z znnC}$sKl{D=NsQkeNZY+5DBgn-ZA~pea^&ZrN@G%i7yB)xIX8x)1|O0GOIVw-K?@R znajreR;HtZ=ggUJJuBH;itmZVOe$+^j&D4qnq|$b|3XzDr;3r2rQ)DF)4|>1HYx%- zMvb1_)7PBX^59o@+3lpS=JjC>dJjWmOpWgZZ`845+85SvzH#!Ydkum6Hgf*a$!a(- z;e*z(G&ULcgL9WK$1q;z`oOYdNzSvb|6jhV%4U7Myx(~9@~F_|C-~=lyb+-!v7{du OrVO60elF{r5}E*0)~Ndc literal 0 HcmV?d00001 diff --git a/android/assets/ui/x2.0/cells/basic.png b/android/assets/ui/x2.0/cells/basic.png new file mode 100644 index 0000000000000000000000000000000000000000..20580540cb314e02f3ce68b2bfaf83e4a9a4d57d GIT binary patch literal 779 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4nJ zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{OIy_w* zLn`LHy=$K*>?qOp@wu|99fJ^`*8d6g>wLwViptjSf43T!x&5wqY=4$L4G3aIx@|O;mhkRi=4s$vz#kKLZ{t61 z`$pjh!UY^ME=QhM&QDp#pt;oUgGdF(nzO%;hux95!9LIBNa5S&Rm@AKykpv3@_wq_ zdcgvFrF++M_JwTLT)KsM&q4A1Zu~d=HEmbjwE4{Ep~>55tCf5+pL2(};Ck=bU5r6q zuMe>QITe3}<3?A<`klO+a^5wW4nV#9b)HWP>aW8Rj63F~&vi`HP>ap{obu2)%k3%{t%xn=2X?t0`( z_FMh%BtC^_41ee1Z5?^Wx8qa8%`#iy1UKqs-k|exO^Ia(d)}RMXz;#hsYLs8K1~qXr8F{ zbX%rc>#Z804+}~@E_~D-;j)KW&VSy8S3Qk$J8sP0S~#z8oAU$Ff8{2pH8;o#vYXCc zUEek1%<;QSaSZ9*b90yWX1e{mw`T8;4L>|Sm(KcF!<;ZVZAsoGZB icgxV&*m(2)zf4C~WTnjCpTY}FxD1}IelF{r5}E)EkvH!E literal 0 HcmV?d00001 diff --git a/android/assets/ui/x2.0/cells/bubble.png b/android/assets/ui/x2.0/cells/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..4f29be6b8855d88dfe35f54dd62ae00fdce8394e GIT binary patch literal 2191 zcmV;A2ypj_P)Vfl$;dt4Tdj(by7NQq%;J;2}-A-N}Bvm>Ku% z$;_<7w@%;w)&s*@`&);Z{r=XR-kCKEMn*oIJHTEM`KpTu zTNgl81-KR1iD|+3#&bk{-xI0F2>2@xh1z`7Ei1g^yx zb~Ve5@AhN4-~yJ{1Ah6Rd-{FD``fNsM_}9;Pm9R6liXyYo~W&GcVUb#oL||_1^Z5r z)xa8WyC(BnC}^%&>ym4L-PQ)RnKaQ40YA6eiir`55LU##QFBexSX_O1cYmX*N9y#LD;Ghw%=;b2ujAjxZ`Y?nOo%dN zeyj%_Ys&T|!g}Dhb?SpUb-*uxtApPp63XU=upS7Tuc@YM%3MOXX;xUK3%l?1RZ z<@*zdVfT$vRg>#)AzSUqJ%ji-Ss$5W709CyT%JL*@8Dmmaj;{SB6_o7+kBy z^=94Q8o54o&!Tj6i2%PWdvYlORCN=uEq98y4TlkPMtAM~1urB%JY!0}We3nm*H(XAqb%mq3gNG_+8GLD9bHHCuDs=s(J~=)m(?fu$_Ybai>h9nn`2bujN3~2_IA$bDW_UEE(~!2VmT;QEDa684AH)m zI-y8_EfphlB7_1sVjj)Zm~d)9J`}{y2}5Ke0m>FXj?jyAuGwiMI>#RbH=ri17?+40*rJ(PJsE& zQnB*+f9gO^faFCZm8m7bm;;)lmH?+(NXV>`v}I0!V=W|PR!Q12CqOTYSFBKywj2fM zhFSuA-a80PS-qcd$r+kC`2h zWg9Fqi2!zW!7&%q=TOngTV=eVe`_c)vq+)s$_Q|f(Jxeod7$v+?Lq-WWF8~JNHq>v z+hr*`AhVCLGOofR#%6_-62LBM`u9mvG-DhTky6ggDnpX5Gv`MUQ}5CyKw1qm@id~7)}E(ib&-~O09`m*1!D{W2*>^4gOened*dW<3!{`%yPc7 z&VCVjzwX78PEFjyYw_0581-49e2Q5|dZPChCZ3!tB4>eTG0XYR z3P*rHG_iwK{QPmrOM_9hV>ohW5pD^*UOC0aUENVK99L5wmtxZsCy@;@%vD$%IbF|4< zU)$s~@Mos|GgdyTdJ*tzj2J_$8x-@6$-Py*nsw>i5UToP%!-0T{FLEqBGPGprne{2 zuB&-BW;NcvUWuJ&>0_R~ypYm+QPA_}Y~K};USCG+T>u}u^7vNF$DFrPZ^5V-$65NI zbK!KsE*X>nA+{O2*@lgn&zcu~()<+WovdTP7r^Ja`S~LwBO@atBO@by@ExnCQ??SL RBeDPh002ovPDHLkV1mD9{gVIy literal 0 HcmV?d00001 diff --git a/android/assets/ui/x2.0/cells/round.png b/android/assets/ui/x2.0/cells/round.png new file mode 100644 index 0000000000000000000000000000000000000000..8574550ee37c6760dd103f40bc29a822827a9baa GIT binary patch literal 491 zcmV_7OdSd#xB(I|x)|LQOHhf# ziE$)2_HWn#4m=K;!WLWmLw7OY&MMWZb5hl*dQV#PSkeyxle8<;5;Akv86TAvsrvOi<2UN1cYrxwKaF-!)kQUwqK5~G&jDSW` zcm;UR5$-Ys*5csCY-b*qEB^a2fs+E^F6}VWLU5BbkhGrYtg>fdW?OEs6q?xc0GFgq zU?)nT@x5zrtgqw>lK zsK=9kO6-$gQQAxe4@p!A%BZaA0_9Bbkc0tkpq~PK2OK6@KUL>KP|3K~Y+2u}*`tE% h)wO1~Y1Uord;vJGUaYXdG0*@2002ovPDHLkV1lkQ$JhV> literal 0 HcmV?d00001 diff --git a/android/assets/ui/x4.0/cells/basic.png b/android/assets/ui/x4.0/cells/basic.png new file mode 100644 index 0000000000000000000000000000000000000000..83c16f91f3b94e8f9b71bf7e4cecc554307e014d GIT binary patch literal 1528 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcalEX7WqAsj$Z!;#Vf4nJ zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6axcmsi%u$ zNX4ADx6iH)O%-YQn9eGeNNrW#Sgog0+Nx7mKtB%ZD;CB8$KDg{JLJJK!-e9=H5W~G@#_{w^DgW5cG3{r(&vd-e`M|*r3)`>lGj$ry#Bkei z*|6O)zFJrsY0345`CfmAaj;Cm7Y3uxVF~;nR5ld7dHk}gK(0c%LRD#>{AY*7tP^Hx zH_Sc2eI_q=$+~mQ`po*SN9HHXBurs2DpuYgf5YO~FRka?4<2^>D0TO7YF@GeVu$X)~^FVa*~cH3FkEEBx%vpJx|LEE9hNblt{g3zWp0(aJK~bqLL-JiQ>y2*p z{m=46H?KAGowbg^Tl%(N5<`^SIp){VW*4@`F_t|zx&CRg>IaY03G*42Jbkip+QM_& z9lZ57|G80QkmD z>y6VG^0H@4TvkvGVy*)-YeCGK{o$vt&RWN;Yu}u9T{2Tk@Z!rk-&n<_rZH%pWeAzY zxWa@vAd_vuB_4;Rk_}$Q45Jb>3KC$nC4TT%zx9rMLf1>@_C%cIhk3aW0uGsbmb?P zfZ+1R^SjP@DqCOr`lS7v{h@o=b0#0VRN`lL_gKoas0S(=Hl@Z%-B8+Kr&RaW>P87` zM~CqNYu(M4IPT?G{#Ies-&xl#Fm-Gk<9du?OSK3zKP%pSoTY&ooA4ZH`U()iDXpMPwe zX(T@5uGoCWeaYMAzY%_r;PS`lJii*E2%Mzy^3zxT&3%_AiM3re2A0wcp00i_>zopr E00b0!00000 literal 0 HcmV?d00001 diff --git a/android/assets/ui/x4.0/cells/bubble.png b/android/assets/ui/x4.0/cells/bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..3521739cf192e655e36c62c5df28222af2e13e7d GIT binary patch literal 4842 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 HKJotmyO0G@ literal 0 HcmV?d00001 diff --git a/android/assets/ui/x4.0/cells/round.png b/android/assets/ui/x4.0/cells/round.png new file mode 100644 index 0000000000000000000000000000000000000000..595f57df50e228beffa1bd5e93b74a011bdd586f GIT binary patch literal 1063 zcmV+?1laqDP)t<88FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11EfhrK~#90?VHVO9aR{{f3MaiO`=GXY?>GXSv0y4s~eltE)A&B z?EMQ0Lg~(ph)Qvz5CXMsOE(q_l;T2hrLlAoV>er80o%X^unH^y z^S})7y_x-6w8kAr(qTyxlBOkXs(Jp9^tq%rBpr_Jt09tlC4C@iy#>>0tV?=dQcrB3 zHAw1`^r57!0*oiwl5}2DXKdd9$Su#60LGKtlJt5^^Zk-;MmAo} zoTOvTc**@YC}{}z5*TXc3k&2H@UodL#4-Z>1gdt^m2c_idoNAW@-N2l~wH@8p5B74Rzi$2>p} zFy=du7QmauX^Do{Q_UqHSHrspJW;fwz-$0LX7*q8pl=1d!2UB2t_b^Fa?lsRNby>t zaVk0B3*hMhLSiwT9PkBjJb;i`)Ohm+&>uiZEC!MTz5w>)58wkHPY(D3*bleAX=DoE zK;a8uE4Yeq+)obp0@w^7Bo>(hSPdW~7AwgCUjXv~gv6r8n=gQ$0tkskrU1SRAS4#w zCI`yxaB^0qC+F)>ssi#=(mbT!2wg5%Oboo94oXqXP3^uPT2)_U$W_BmbP zV_D5Z&YEDQ3GqeX=bXYqunfGEr$-Q)D2kfd5^x&Vind#r#kIxd>Jn`UNp0F4&C;Jr zY71uE6U1whmLnKnlJrV6Gu{)|0d}(xy$UaBD98hZSGNA?{4*Lb5HT`wK;H4qc(7xmqlDzSDJj`0{s-V5qFNQ<`m6u|002ovPDHLkV1gIN-A4cb literal 0 HcmV?d00001 diff --git a/core/src/io/github/lonamiwebs/klooni/SkinLoader.java b/core/src/io/github/lonamiwebs/klooni/SkinLoader.java index 2e84905..485c1dd 100644 --- a/core/src/io/github/lonamiwebs/klooni/SkinLoader.java +++ b/core/src/io/github/lonamiwebs/klooni/SkinLoader.java @@ -59,7 +59,7 @@ public class SkinLoader { } public static Texture loadPng(String name) { - final String filename = "ui/x" + bestMultiplier + "/" + name + ".png"; + final String filename = "ui/x" + bestMultiplier + "/" + name; return new Texture(Gdx.files.internal(filename)); } } diff --git a/core/src/io/github/lonamiwebs/klooni/Theme.java b/core/src/io/github/lonamiwebs/klooni/Theme.java index fe66551..d366851 100644 --- a/core/src/io/github/lonamiwebs/klooni/Theme.java +++ b/core/src/io/github/lonamiwebs/klooni/Theme.java @@ -153,7 +153,7 @@ public class Theme { } String cellTextureFile = json.getString("cell_texture"); - cellTexture = new Texture(Gdx.files.internal("ui/cells/"+cellTextureFile)); + cellTexture = SkinLoader.loadPng("cells/"+cellTextureFile); return this; } diff --git a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java index e8d9900..c5017a6 100644 --- a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java +++ b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java @@ -37,7 +37,7 @@ public abstract class BaseScorer implements BinSerializable { // The board size is required when calculating the score BaseScorer(final Klooni game, GameLayout layout, int highScore) { - cupTexture = SkinLoader.loadPng("cup"); + cupTexture = SkinLoader.loadPng("cup.png"); cupColor = Klooni.theme.currentScore.cpy(); cupArea = new Rectangle();