From 07cc783624eea61efccb82ab7e050ae34b053e43 Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 27 Nov 2017 18:37:10 -0600 Subject: [PATCH] aesthetic rework --- android/assets/uiskin.atlas | 26 +++++++------- android/assets/uiskin.png | Bin 11456 -> 11847 bytes .../graphics/ui/components/ScrollText.java | 2 +- .../graphics/ui/pages/MusicSelectionPage.java | 32 ++++++++++++------ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index 7f7fd97..977afe2 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -22,7 +22,7 @@ check-on index: -1 check-disabled rotate: false - xy: 192, 20 + xy: 68, 14 size: 14, 14 split: 3, 3, 3, 3 orig: 14, 14 @@ -340,26 +340,26 @@ loading index: -1 holo-pane rotate: false - xy: 68, 8 - size: 20, 20 - split: 9, 9, 9, 9 - orig: 20, 20 + xy: 105, 17 + size: 8, 8 + split: 2, 2, 2, 2 + orig: 8, 8 offset: 0, 0 index: -1 holo-pane-down rotate: false xy: 133, 8 size: 20, 20 - split: 9, 9, 9, 9 + split: 4, 4, 4, 4 orig: 20, 20 offset: 0, 0 index: -1 -large-pane +corner-panel rotate: false - xy: 182, 5 - size: 9, 27 - split: 4, 4, 13, 13 - orig: 9, 27 + xy: 182, 1 + size: 32, 32 + split: 15, 15, 15, 15 + orig: 32, 32 offset: 0, 0 index: -1 rect @@ -389,8 +389,8 @@ rect-disabled side-bars rotate: false xy: 221, 35 - size: 5, 14 - split: 2, 2, 0, 0 + size: 15, 14 + split: 7, 7, 2, 2 orig: 5, 14 offset: 0, 0 index: -1 \ No newline at end of file diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 43c957641d18a0ffe74ec20af3276bc83ed65149..8c65acaf57a7f3ad57e9e224337cea351e64fdf6 100755 GIT binary patch literal 11847 zcmb7qXIK+k)b1okA)=IkqM#C5=%93v-djM5(u)P@p!7~CY7nF&AP7iTno3h@RFtZK z^dca=_YNUnA2S_$86EGFqPKCovI~ zfQZ4pYxCe&=bh#CoV6Y9I=kI;Gzae8w6b^Rwl{Z1@^fG2z9Q1m_4W<`aJ^BMlh$!J znSXwI$;VK?d-1r(6=EiO`g0i+K{@@{Ygz{JGA^sU0&>bSmZ4R=v3Gf_(U*g}msPGw zCorPW)lUYb+K~EdG{%cc8TptXFa>Tyup+7QtttJk6uRj#3yqVhXP$Qlaq+9mG z)sV%UAA(HWvwTITAwTq@^$N5_l4WTxedXM$5Ii~*UN^@1UM!eGo?F zzAxfGNf%oeU!!bIiPMsY63?^N&)=@^=Hm#z;un1(5g1$!b6fI6n9l?c{y3Zu!w`NllR70bi;v}r}H*rKRa`&p4pu$sJCX&(?*KAn~5sf+<-(nBu4SAh)qYW7^!b9r<$QDcThQBBfb)-$GS>b}lwa10zDKwXJL`MDrc z=i}AUK*A;7^tZm>*(?pQu-9qNvQ7#1Pr8{an?3ekNmo??(pt!?)aHAckSca{RPbT- zNI=DN9Ibt#KL@w!72vJUs1&WwvVKJwS#nXE33C+NJA78>vFM)y=$QoWBsR2>jJZ8zX% zjtq&9;Xcl^79>cER#&boB4sL2?Px#$r>%y%?M9YRpe2Pw&okORSWp!x&!fl)&L@1) z=hRH%fFMg@J!+8xIx6+`0eGcoh6QKez(<71`XPu&LY*LAX` zUH+`+^K_8OBrQY(5Zn&;DW)B9`5OO%G+Jbn%jzn_mS37_9+eBd!)}{OCMZSpg(UM% ztcs=(0@GJ2rXb*Mcc?kHD5OKpS33c=bys4;tlw~G=Z5};p{I}94f^39cxDWfhypVR;4loV)#wHb;nmW&w<| z8d{>1lR0>_rN0JUsP79cIkUw$@tPBXgS?^KaWsxk%JZ@@$M>w9>l`k*ISmFz`CSAs zv@t#=G;VnO948}0N!GuC^D*pR=vfrN|2IT7C9*&pWZ3~ zM78P%&cMMixYbGMp*Mty-GjQ60HHzm+XkWmN`UISR@gO0vjbK8I3ahUoplU|+WsOW7Z_TlDgfKUOSrMxopw#T zr$)riyYpqHRf|50s;*DsaSq<2w4aT-HZpm9raPNV_g6Tc-Y7UY)vQYGTYeO-KL44* zf}!festwRNE^xEcXW+=sEg9<>V=i8HZ@ZOm+gV3RiEN|Qnx9oH<`ms9MEO-W!;I3J zY6~LW*e+96C=6!e)aGbTb05Fa-_BaBf3YiMtF;#lZA!utSHtcyC^i%JI!n)jK4bi!3T#U6R`N3}_yoUmlgplvuuQ@HC=dN^Z>(Td#+_c|(!>Ac;mOP&<%k`@ z4e8w=-uScTF|M<`Ditp0pXYzdvf|fao$rcmEqg=O$8rj)kL#LcpYJ+cB5L>u-ENt4 ztuLSBg~M&SVvTdKx0w9y>wWo6;1+Y|Qqsh%wreknqYW6sRbyJyd|D-Ll4B!wt?x8% zTi*%Y4y~-bejYqI^jp`>c77W6wUN7R?-0}Ixd$8YK&hYsUB=trz^mC}Y&=<_X?dP2 zz1T3Wtyk3cnS$&ClL1Z|U52XQs^5eTwEH3O;%(x5LxaCsG4=Ut+I{Bli9ICqlqdX& z-xn%;Ndm9<|()%*_wT z3v&1P>p@pA5uczz{ocX^Cg3ue-QM`Rt5sU@X zXII;RKcvIw8McKbyA!rVB){jdUp8eS&w~)x3!z*Q)%~-D9#HqRDRZJCA~M;nbcRAa z4X;YS4hk4`NvoT#v5t}LgayvarWI1Z@$lBo*LqUi0EW?xt8lAtLK62W=?dPr*g$0p{ z372O~j!~V~`Aj<+RRAY6<`!}(hwv8i@&;YsUd9xPB3rt!`&E(B4u=8@29xi6077t|A!#1gkgH- zSX2pQnxx0(AEXHs(p^^Rk72=(g_t0Bo~+HZJ6CY*6wWGT61h8`KGssL?}x4}zr^vX zk0!$NJ(wldol2C|>(eR1SR!n=aInye&a1Vb36D0LcE9~}x@qjK{v`^wq#;jmWUNw% z`LsKM-(ze`FCiEOQ}viwrd%eLtM?J$o$wam{o<`)vS7stiI1NeqGzwUsdS17D-cF@ zF4L}&64x?Kc)%6umni1*eL-bsl8wlX#)x3DMlE+rj8p>Rd+AHvogE`P-p3t>zR8t& z{aKXkTnnYozJh0Y{V;~P z;&Kc5GC|$Y{B8691+NJNCKz7FEd{SQImhd6XANeARRnO#SPu(XcJ5n+ZxU+mO za#L~`AE)dP3wzD{os0q-~2ujRQWCTPZeuG+YWm9iO=r6r3lDONkX({ zUsf9o7`e?cmMB-F^59gd!8yGM1V-@1S08x|^7~^6KAMefEOL^ZJGa_~ZT+_nH8RSG zPv6apTW=3vS0>a-i*0t!bSxq;!*&mreLaQ-?OT|cFm+gaN}rM(>U3$&1cX8HVezGK zG<^~(0$x{ABICS71tF<#@EU@n)o5pj$ZmTz1*=39C5GPIs0He z)yPc`8PJfE*;8{l{n}jz&eccsd)<5<1*oYBbDv|cNe~9s1sDpSu%s8GufuT>qGH*} z?aCtdP+-{!x$uHvLvpoWXGT?YxlOaUqj>JfsR# z7Sa|svT9{-!>-9*ie`Nwznkjw5lK$J*;yaI+F5^Y^}NUXY-TvFR)QmrJg!oH%{{Uk z6$iQ@9f6^D5vjkE{Y(J_VSLWbsde^lxeG-kQa*icgDBovbNm`#0&#|z z22e>hsL|gCUB2bT)x!Cfs|1*qL)0}q#uiFxgJe$Q#kb7TU2M5hm zk$5$|Owg$7EC8Fu$o;rpo@*kv`5{;WciIqYM?0RhVi%vU}YAtr@%{S8WCM%JDL;Jm4Vwt zcwZGAr`Ez4Fe+Zbkmg3lU-C1z+gv}Pfss+QFLY9s`_rt%|7JC4X_5CfJ;5Kea3rJ<(yuN z50Xt}D5qMDgEim>EVGBu1D9!IHHS zmCrS30Z*x$w0d5G09uZ1HPOEGz66+FzQD1~m*##67kX3z!OneKh%i8J;JJE;fd_Oe z6|3mo8+66irncW!sHfu_UGWE|5$B89Y1SHF$HDy1z0Qc<%F6Z|d9950uI-(FX1Pv! z|IO78yW>8SOYfJ!N$NZo9c--XEypL}F}TwBDv8sdgBzS$xO;wniE;Fc{_w7AzUCmj z$Kkk9BKa!mWT%|(fx8QY66}vhEoY4juUkZx9~!Gj|5eyY`a-R&(S{L*6fCokw`|=B z+QrWR;lvLMBozWeFDr=N+)=S?1LySrHf%Nxz&m}6s1_rK+nyAl1GE}h?b`LAN@WbQ zN2AkF7(u_*=VVe=-cDCbq~PI+Ec9QM3u@&-Q|-nrV>L4xd$f~MJ7Ktl$jRW5m$<`; z_Hdf@fU+uYc7#;A+JIuU6M(QEG&lL8vu7{&_*P(xPMC<}3&XV!M^7%98?xTD%9XXo z>({QmtegBP{`qCY|5C15cp$cT@>VS{HaH=#1wJk`yfI`+$9Z08)&R^lIjH*s%kccj+jkD=1}fs- zR^`?J`1JAd?-W7_@YbH&mPLY&0?CiX>}xBU(`P*I7g-twuc7`lE$%sYEV6rh{fo>{ z3x#}%RdTq+bHH}~RqY(E|4OK;-s$rf$azwFy#Tvc#BtlIg8wkC|K|c~3Zb7b5i^5e z+g*_|h}HZztNO_>f)cwf^8@UTGMAKc4~fn%RLV$hAShcU$BVAGMU`=6Fb?ab=xn_Z zxZzJ*V<@ZUFDz#Fo0)QYuLJQSN@Q)>g4c0`>M zUUzdH;&4C>LEfkSKfKRtYPQv!fh^;Q${j)5dH^lRAeqMve_Uz1qqML*CKlSYCn-! z+f?|=+z{26YnvOb-7lJI|3W_b`%|*ryh8}VC*q>$^cOPVG-|ER;Bt=7&v$5yEU7r?JR<8ONYUxtPvA$S11R_`(Nz&tKoGH$n%w)LBQEk}p7q@+Wz-_68NCXrk zS1KNFy@?3Np7MRa<$#qi%)NNpPF{nmH#)*kHl+MrlcPDZDgs(kZfpX)ABq1IhFIWu_Zn7=u< zHhap+=ED7z*&34{`FDPCQ)@`#gJHD z<3;(r)pDKhGZ&`**XYGJ!(Nh19jx;|1dcMb>xiho$O?(U>qp|LddWhze7+1Zc?y#H z!@Y}cq{z<y}b5rZ(SeGr=zrwab@!@#0<4ngzSgB z(*G`~*f)7ln7I^gxKL9pSF0L#HkX{KX*;3Uze8)zYB-JhOglZoN&XNAfwk>P$gh#Fk2lOc< zqLci9LzeLv$)XLHX~7)K5s}&pKhsNH+tl%czS;qyzpdRN9@0^jh~-IGQB?O+{xd8N z)PTf`rVGC8p{A!dx{Bl!tl~xziS+iPrtY>?$?wq7D)!^r?3{8^8o=V_iuj&%&}GZr zOWYAJb${GwNc?M(L20uKeDMoED5_L%03dcBRS^1eTo?%8~o4Yq|8 zs8*IkxEG$)ybD&7!&Lt}Q#Gu(AvhNK@nwGjKkflgiE%(^OJsf#Aug3csFE0wd~ZkU z!h1l#UPYqTR0)A8FkNsmk9pp4WdE6(eu8#d$_>fHsnYQMx@8Zg^OBcuQ*Q5qo+b&Gth#qTE~NLZcT}l|>dKVAq`u?5rA@QIp5HYI zQwAQ|kxo>qInRW<(PSE1TO(-Iuzrl5dHb}KD?4MQB3e%m$ycz>D24{FhBiqT3Lal? zush8a2tLv3xMM{$F1+x`S8`8^JxOY2k1LWnoK}8g{@dBHS-Cx`i*;JE$0?8~%9U5Q9NcZVS7EQvQw9uQRgd-C*_qyQ&R z6U4ewwBA#eGOjk>gIbDyYTFAL>chc&)!37yXL^I~3VrlV+eQ|=_tnqPFbhGM)g(~)HN^e|OR$J9mFkA4vxV_vsX z+||}cY&O7w+I{^-D!0`E*_lD(T8K(|*_q=bqf(~6s~T5;oH?#kFMkPB3+{U}m0E?8)4Id>XWwxxuqiBKVPt{`UC`a>e;!_0`hP6-;?r0_+w zwhXY&rfQ?0lvCqr%yxA2=ES}XU8i5Be9OFzR1G&cSI%y4EUuQ)!;4;{~7|=xX^$Rlg>vJK~~PhFBx%! zV>8oT8<@CZw-=bK%i}6Jl9B9Bke>$xEM^Os(YN%I2TJ9dPJsO}dOR*)VE&1^Q+l9jbFR_~j;| zZ8F0zBek05gq>4u3df6mxmW!DI@=d0W(&g<6S=Ju)6E0HM$r(JPinT($AqR{P@{KQ z;CQ<;Aa1F+?aSDa7tpacxb?PKj!FUexW606*?+$ z4*W5`+N1gud(DsG`YWkd5~^~3PD4|H%AD2F{Q-wQMX6TYTFhtYKl6_9j5^ZgU27d` zO;%pg`LZ^{PX_w1;L7ulaQ+`9k#AKKhSGDV>3y|je)P+lKH{bflsfx*yrQl5S#d5Mueej(`IH;^G9jt=JPGFjJcMOJd-kJ=8dw)!W_7a?4*o! z39hU?5_zfbFBZbFCi$OZe%Ioe3NZLpa^T$CwTTq1qmt3ca%BjWq%aazyGD2>Gm|tR z_-F@AOpOc`7KX3EkKU~~tTn*Ql&WTq^mxp%UTwNIx+QI!e4IF`!mSKi+p+-Ndpos1 z^QGlJM3B&H_mhA-`}tUjFnuAHeKNCD+7{+dJ+wg;NczaJx!PTcFVi_n^&X2cgw`#O zYF1+-oxqN(U>CLHW$s8(iam?WMRJcYs*lWHdLp1`XSmFA;i~fd5SOQsCp{Kl!qCsP zb;89B8_uH83#nPSVIu2&fo!-Ly1uf$qBG1A+{lv{Zh2-V{x_#IQUZdB79vTFKj}%e zbyv8qAL*f_Mlf2tD&L*$r^T$=H=)#T1Yc*-%6w37{mvC59K1<6Q;?RGzeO4Lod01= z?*r+%NlBR>TOudcJWs-^@ju!BWWhko*nwsqip_NQW(SdTwQ6+*< z$R7fo0rFbEY?91BMrF#vKE}mBhasG{!iB#>8tm~GBrJD+)&soC<(EAQSID#~623+`9t4AR{NvCBbx$FLT} z5>g@5^t0P_3}FJ!b%ED`cGuZ-uN&j z)I(Ip?%ys8dnk%cl;>z{*!yoe1>XrCw2I=KgWfP}nL|x^#8(e{S^Y7q13FyrZ}qF< z-@!Fv{~|+jf6>t zLcs8?Hfe8=zyHi+C4MGDGy%Tg)1$=>In8o+oJ+Ul%SBqAycn^J{eIKyF&S1^BEnZn=BXmvuP0c4E+QmzJoD7)Imd*d zqjIT1GP;%oq_R1i(Nult%Q;nOt1fmNo4r3l<~cn5c8IH7xwh!%{N}!j1_IJC3WdS}m0<^i@kA zvkM*2W&hO%l`FmTi79YnJkzj2rQrKQonN&XzxB3XLbAzzCH&^NQ{#CK4t&~^{@EL~N8sO?&H_H^T~mNeJOOWu80Arq9McxDq_LsF4l7ZL@k@nr{lnzw)6`$nx|Cy28aL zI&#;s_q|^Mu+}IPskyV#J#lo}SYYQy!({5bp6p{`O zMn?-QL{4DVR>#VQ94LI^ww;bkYaeR3b5HZDrsv;_3duj%TR={>@sQW0iv8{AwCu-U zP;9=9n|a}(-yQn!q8J$-1mymy#=yUV_0(nzhtU7~)C8_sTVc{eP^*gxO?^xZ0gIt+Z@Wm1*#Yh-eK?!>T&pLwU1*Rmjyk z_P3=6Y1!O9D({*PF@)O8lfLeC7~0EA@vZa}KLYef)864x>5WL?8EtG)OhmAfZY+2?KWs>^3Y*)yp5(bxv+cm zxPcBijCKTF{uC7R&^@|<8Qe}km|+8Mv&9Nc8|ae5IDVpEcY(I4xKrl2fVUBYFdJiO z^1L9S58R-%B&^Vj|LrpmBlMnI8eIRM&$%EWNDBz1>&HaQBnaizpJ<#D2<7u7)bM-o zICXc*r2)_=mP)w0J$NkTAWRJOL=W5nnhbj4pY64YL6e{n7GDzMy+BO(M$yexpfL%{ zs0kC$6V2|FPCTF|?p6lBj|)Iro^nXD&qNZ_d`iqQ1ebqVLe1Pb8IXFVGPpbz{IOBM gusY7A8}BDY{`$$Tt+yBW3vWPKUR|z0#w_6f0ONDpKL7v# literal 11456 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 OfVrw7mvzO!?|%T*D1uD@ diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java index e720cc2..cc987a5 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/ScrollText.java @@ -106,7 +106,7 @@ public class ScrollText extends Widget { clipBounds.setSize(getWidth()-2, getHeight()*1.5f); if (text1Width + text2Width > clipBounds.getWidth()) { if (scrollOnHover) { - if (scroll || text1Offset < 0 || text1Offset > 5) { + if (scroll || text1Offset < 0 || text1Offset > 2) { scroll(delta); } } else { diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java index 096db78..fa6696e 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java @@ -23,6 +23,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; import com.badlogic.gdx.scenes.scene2d.ui.Skin; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; +import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable; import com.badlogic.gdx.utils.Array; @@ -44,6 +45,7 @@ public class MusicSelectionPage extends Page implements Observer { private TextButton back; private Table musicInfoTable; + private Table musicSubInfo; private ScrollText songTitle; private Label author; private Label songLength; @@ -58,6 +60,8 @@ public class MusicSelectionPage extends Page implements Observer { private boolean down, up; private int musicSelectableIndex; + + private TextButton beginButton; private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer; public MusicSelectionPage(Skin skin, MusicListController musicList, AssetManager assetManager, Vector3 cameraTarget) { @@ -113,17 +117,19 @@ public class MusicSelectionPage extends Page implements Observer { }); musicInfoTable = new Table(); - musicInfoTable.defaults().center().space(5f); + musicInfoTable.defaults().center(); musicInfoTable.setPosition(musicTableScrollPane.getWidth() + musicTableScrollPane.getX(), 0); musicInfoTable.setSize(getWidth()-musicTableScrollPane.getWidth(), getHeight()); addActor(musicInfoTable); - + musicSubInfo = new Table(skin); + musicSubInfo.setBackground("corner-panel"); songTitle = new ScrollText("", null, skin, true, true); author = new Label(null, skin, "sub-font", skin.getColor("default")); songLength = new Label(null, skin, "sub-font", skin.getColor("default")); previousTop = new Label(null, skin, "sub-font", skin.getColor("default")); ratedDifficulty = new Label(null, skin, "sub-font", skin.getColor("default")); albumCover = new Image(assetManager.get("defaultCover.png", Texture.class)); + beginButton = new TextButton("Begin", skin); } @Override @@ -174,6 +180,7 @@ public class MusicSelectionPage extends Page implements Observer { musicTable.clear(); selectables.clear(); musicInfoTable.clear(); + musicSubInfo.clear(); for (int i = 0; i < selectables.size; i++) { selectables.get(i).dispose(); @@ -200,17 +207,22 @@ public class MusicSelectionPage extends Page implements Observer { } extraInfoDone = true; - musicInfoTable.add(songTitle).width(musicInfoTable.getWidth()*0.7f).spaceBottom(10f); + musicInfoTable.add(songTitle).width(musicInfoTable.getWidth()*0.7f).spaceBottom(30f); musicInfoTable.row(); - musicInfoTable.add(author); - musicInfoTable.row(); - musicInfoTable.add(songLength); - musicInfoTable.row(); - musicInfoTable.add(previousTop); - musicInfoTable.row(); - musicInfoTable.add(ratedDifficulty); + musicSubInfo.add(author); + musicSubInfo.row(); + musicSubInfo.add(songLength); + musicSubInfo.row(); + musicSubInfo.add(previousTop); + musicSubInfo.row(); + musicSubInfo.add(ratedDifficulty); + musicSubInfo.pack(); + musicInfoTable.add(musicSubInfo).spaceBottom(20f); musicInfoTable.row(); musicInfoTable.add(albumCover).size(musicInfoTable.getWidth()/2f); + musicInfoTable.row(); + musicInfoTable.add(beginButton).spaceTop(20f).fillX(); + if (currentlySelected != null) { updateInformation(); }