From 1054a575db26ae71026c0f44062e94c8ba24bbff Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 5 Nov 2019 19:40:34 +0100 Subject: [PATCH] Display in overview if equipment is two handed --- Habitica/build.gradle | 2 +- .../drawable-hdpi/equipment_two_handed.png | Bin 0 -> 3687 bytes .../drawable-mdpi/equipment_two_handed.png | Bin 0 -> 2310 bytes .../drawable-xhdpi/equipment_two_handed.png | Bin 0 -> 4969 bytes .../drawable-xxhdpi/equipment_two_handed.png | Bin 0 -> 7597 bytes .../drawable-xxxhdpi/equipment_two_handed.png | Bin 0 -> 10350 bytes .../res/layout/equipment_overview_item.xml | 10 +++- .../res/layout/equipment_overview_view.xml | 6 ++- .../layout/fragment_equipment_overview.xml | 45 ++++++++++-------- Habitica/res/values/strings.xml | 6 +-- .../equipment/EquipmentOverviewFragment.kt | 25 ++++++++-- .../views/equipment/EquipmentOverviewItem.kt | 20 ++++++-- .../views/equipment/EquipmentOverviewView.kt | 6 +-- 13 files changed, 82 insertions(+), 38 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/equipment_two_handed.png create mode 100644 Habitica/res/drawable-mdpi/equipment_two_handed.png create mode 100644 Habitica/res/drawable-xhdpi/equipment_two_handed.png create mode 100644 Habitica/res/drawable-xxhdpi/equipment_two_handed.png create mode 100644 Habitica/res/drawable-xxxhdpi/equipment_two_handed.png diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 347904ab9..5ba600fcd 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -151,7 +151,7 @@ android { multiDexEnabled true resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2287 + versionCode 2289 versionName "2.3" } diff --git a/Habitica/res/drawable-hdpi/equipment_two_handed.png b/Habitica/res/drawable-hdpi/equipment_two_handed.png new file mode 100644 index 0000000000000000000000000000000000000000..beae6793ab38c55520794c6aa05401a440d70dc4 GIT binary patch literal 3687 zcmV-t4w&(YP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91N}vM(1ONa40RR91NB{r;07MPeC;$Kr(Md!>RCod9Tzild#ToCO*?Vx@ ziJ-vU?#}L^SVl>qnE1ftEF#1gK4Pp;MzMTE%hIHjXo#q>Oe{5E643HVg_yF`2uTzX zwTRT2C{iLIXc=RSuiKs7J2>Q2kbCV;cYfd8_U!E5-rnu*+`8cWvHkw~>)(7|_xE-8 zEN5kWB9WbkF_!o>XL2^W9WN#SFK28M*K6-Gj6>sPWToJ)z-M_LGh$vP8DA!)96Pv2 zzE@+~HAb`l$-!lnky93+Ow*ht1%DYJ8!;tj5jI+noKUV%%t}zfTK%`Kc+z9 zjBnC?eCC+Cng*`vr!dC1r+TfDg01kL18*qid&5Qd08pwp=LsSZkH=>u6Ji_1IcM?u zhOyHoOqlQmrRnMD=$M%3xBi1Rhf9?yUR zAV(&X@=hk@91P}Q40$Ie?N+9-&mbv3r2#^k9u74JugxB8Bw{|nB)izI!}$jYrz#0d z?JAWpMl5~0B?3Ai}Ad4XvScNoUFt^zw_6#-PCOr!qizAFChKpg8f?s60(-{~Mz0Lw7!it|N1$;h?bx!{MHb zUOuLBsAqj2Pp)v+9WK6Ksvfi{tx)a}!Z}n)fd7sW3Z4sd!S*?k|03M1kKlK{jd%^v zI+a$)rlzJg)h1uKUjmhHKu#IwD_tPj*-+Q_qY-m6RK0~VlF8)J(dbScj>L&Vh)J51 zX8pMO*74)Vf9}vpMJfWQg6F90QRGbX9XYcZhrc->kdVLou;Y5T5CfhCiR0cq`?}4x z_)WpE|3SC$S`l+p?g5Q{E?!W^E(P_7`KwMaaX);@m2M6y0;obKbN2vBjYDcI_+QUs zJ$absHAN4A&4b%?sY)Nfs;7pSH|)m_#hh@+zkzB291W862ZRgkR+8O=_!9)?*IS}E zTMon128n$>w?d{X4tRjFKoynYrm;ccj-;!MeU?s2t@s`TRYS={a ziU3M6RqhabX??l-5H_j8po5R)jx_rnv3MVKHy}i9tusnu!Cc6c%d9RpbZ5%nR z#qQ%tQu+i=Ns0yv$5xMFXYylB6MKR|gSJY_`eXnFE#dKKd@k&Z1>O64XAf{97}Bus zdl`J6H?e89EEsNjimcd?a_ZF$6}J^V(!RZ_=ct}(ej0$E^QtA~S~xu^kg~eLxf)=5 z0>?sIv5#|jR_Otqv?VIu7C+e%y=x#*_Kgx6F(f7lF`~1y4hUKp@o9*sPH5!}Df_qJ zsPT>T3`?yJ+{Xu}@2Et=dLHY@_|!1_afH33y4v?ZV`HOpCfC)~HE!?To|~~Te?98e zQhk7Q#(@h>=E!`Bgm~Nq(hgshb{4iw)#WaycIp&(Q7jgF%1X+0C}?yFzXlNvcbLYh zaYEhR@%#OGSCn8d_%<$keHV3Os@;ATb}N42?K*LlH&lp=BiaoZv^~{ej{1Hq+WxDd zDy#fZX!1w!spk#MV=8z52)X84ik-~O;C)pf6j(n}u6<18!QqI(2)tL*^)s=ZdTuBbST$Vz6n%~taUbTnm+@8> z zlyTFHUyYUXI!It^Rka?*OKQ+`-z@aK0bb$hQpRn`9x1(Y)pHC^G6i&|Ir9!wkgfsZ zwurY6z?efXrlFzk0xTR+#3fvtS9GZ@qMq<_=6l^i07#~v%e9(8;KRo}3+44t!S_kZvfF;u=?te>G1D-v{_;J0zB~qRcM9?j#?23! zuTI7QoK1ICw~#Oez@RM>>@FN(3Au!5ajDY^Tyf7Ji6Rc^k^<-YJVXb8firBHv87&f z5Ab!I^W**{-;R^oqoDS8RO*LAIe{WTu%)pTUp(EYz@e`XU^o3prArNAe#|tZvF&uu z56S%qXKXFuuyK2-bVsZGkU&v~Mswf+EaQK7I+t>VX?9L^(nUt1ZSh~gZh95X0~*t> zGQxr5?1iLAdgW-A7bs$&zJAP4Fu{J9V&))W_0xP+TP$;s%6XEB-$9DD){d!}231>u zxy#-gES9Efhdtu7-zvlxD&LE6SfJ=ANz*y0T<<`K@>nwxd$8EfVIC|5Fx^b6nm=jM zq#ec5$=OcYw}0&-?&Hq)H96}Rn3;3c%ccRp?kz~d0$78OP#MdQ!E)us!+Xinyz=BG^HM%+fO^fHMS8U#hfFj~x zemR`ynPBKrN(;&E$7cU_n)E3>lBcI9F%w{8cY_@Uunx=FM%woQ3I+GJR^R;~Yxj?ZVtqL5f6e1=io5m`3Wii;)1SWJz%@y93YI9zD%d`(Rwf^hVfFK!^(M!>H{mpYQqTJuF@rj0oC4D=dIW~P7Tez+AhZuwxTamG4oy4-N->O;=oA=$*TK@lr~b}S zy(%s`1UR39-dd(%UQCUw;XO{j55&$}r1WT!#VS0P-W6NHs~1?gJK zgZXnMt?a5igK3pn&JaL`V6bj<#2r>YPIJ%1$;{?*@j+LZa64xMq^W73Prf}A4jk`( zDJ7W)UJQhsSFBj4fhqfbIXSlYG`|)9&@tBw`oqzn6Kf{>H!F}}?(C|n*3Nf>L^Qr~ ziBbcJMmvs|BDo%EXY&o*Jy~7t`#HYSq!rWChc3=Z+4CEy`DKu1+R-4(z8iNjPS526 zRSZzXC^@&%>VF#Z)^tkKGr&B15#cj1XWp%;sp-TYPjsQE5ZjF7PU?hYchZl)4Vr=7 zh4TQ;X`tb@#bQ3Go#$`%Z=-&*pNayCn8Tb^hdW!#Vat^5#27DOZB1>}Rg))Aw%wI% zkSJYoKq)3;k=Sh9riF>Y&ZgB<<$D@(z7c=qbqh?5SBIlpu|O%tJMblWqR+YnTf|3T zzdf9~PfAW}A>fgkc0rHZLBr%sYt^gx8n1Uj70+Mm@c(BRTp}MNE42Us002ovPDHLk FV1mC__jUjP literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/equipment_two_handed.png b/Habitica/res/drawable-mdpi/equipment_two_handed.png new file mode 100644 index 0000000000000000000000000000000000000000..d1807c26627d4782820288e740cbde8f3d96fc1a GIT binary patch literal 2310 zcmV+h3HkPkP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91F`xqg1ONa40RR91FaQ7m09=u$PXGW2a7jc#RA>d&SqqF@RT)12xwAX_ z=%&r$F5Q{?7zHG)H26q^ja0>8QY1#9P^hUiX*A#i5*roJhKFfr0{AFYtYC>miKU<+ z0!FB>SVE*}sVIUKtvmPLnXS8~b=kJEGjq@J`|s}E>~>!F?#`rgGI!3s=lza)fy4-q|v{$jAS1n&+>Ep9h+=5HdnR`iLO@bZNlvG{M- z+FgkBDl2FGG+LCK_kRw!k4Mk5dufQZmSz2H_Si!1W2=+r9bEwizQx2yihHFnHo$G8YVytf|nE^uA{c6ZociSd5mJVdhdo0c{B_p13Z24e4qCVf8R z!-Qx-Fas))(1#k+p~7kJr=GRA4V!Wqu8Y9b4Jw#C===WrPlJv17+Vsg1#A*~PBNH{ zSraLUWcE9s z)N$Q^oddtt50BW>+nfGle}DgY#LyX&M6`ga-VlB?1_`mXg^ob0(gCe1`&Cf+-HC}) z|IX*VJ6TE$`~Sy8#6fkx1XB11uHT2R;N9S+zs&b<9VUpLux#^u+p#``MXzBgk)SP* zhJ5QVA?QIYJaq4-WBwX?b{GsS8W|aRXB(M-vt&{0sh;l_(hNhNm@}WmNq#PuMQ_`@ zlhpK(LWJz;>)AJlcpDzt#st#sXRuzr+TL2BPILTy(-ofc zb{!4)M}Uj3mbH)xBv`9UljYrTTbU`$Q4*k6RLbgl1eI+_668Fy)s`)`9wM2~7e1<0 zznfy0!I?oaylt3H3wldj~ScM-dS>A)u6|7sXZ9 zK0oj8QAAI2U^yd;Mb$MoRjghG3LOeh9&loCA)?=mjYOav9Z^)T1#@BWipCrD$B!R} z;i8mnL6ZWGK+qpjsnnn9p_AR+ou5Mm^;f9V1?6(>yd4F}b1?Fo!HADa>tH=(C@(L; zQO!T!7(X$J(~eWPc5-f04?fPgEslMLSJlQ7&3IL*7h z7NDKW-fKIiWt!&SYQ4u|(<%^8W9PO4t|ukrhXJ<%PU9o!+uFii8ghnSg%N)?q@?wB zJ|Ig25fTi^-6Cqp^1NGfXf6=-*~Y*){ ztbXF;6B2v}B&Sk6DX$u$@krgM3WOyDud7rAhA#9P&n;{Ps;|{UhwOA4-tm>VO-@$$ zD^nM)=LZG`CXynkD+xw~z~;-8xQ2}ryL>AG;l`u{n!&Rz!5(f4;gG*IgRk|zArm|S zjQkeX`31g*$N53{d5a%f)NsOwqe}5EK2x%+Y<#!Qr2$$8)TAjB3&ur7s>$dZmeN5=9COAuLF&8-1%TSbOgFXk70A;Hzag-v0CvA5PS;REl#$l z&Q0TD!TdC&xdt`L9dH^P;Y&E;--wv9J1!3PmRe1W0#|@MZBZg7m=>8z!mSOI6Z9;i$#0JO7Jl|;U>F->(un8ySyFmAscFwviF%ygs zUdvQU-;8eu>#&LaYGXn>fT+4~Oz(G^cG$LtN6* zQ$=?;hR<0jb@Lc&=m_Bc3~a#Ja0ts`KU4V^=1Q4bKkJk7G|Grt8+#;zcDbxSkA;5* zJ9}1AQqcbcq~#-~li_$3oyN?dX}ct5DB%VSNH~HFRmct`4MvV&HcWI6*Z_wTqd4U_ gf`V%_8n4y=5BQCK5T>Ja_y7O^07*qoM6N<$f_ghq`~Uy| literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/equipment_two_handed.png b/Habitica/res/drawable-xhdpi/equipment_two_handed.png new file mode 100644 index 0000000000000000000000000000000000000000..1884e60bbef672f46057b385d43ba21650f49dbf GIT binary patch literal 4969 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png new file mode 100644 index 0000000000000000000000000000000000000000..e6370374afd2465880e0f00fdbc49bd3dabb33cb GIT binary patch literal 7597 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 P00000NkvXXu0mjfZmx!q literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxxhdpi/equipment_two_handed.png b/Habitica/res/drawable-xxxhdpi/equipment_two_handed.png new file mode 100644 index 0000000000000000000000000000000000000000..f7160d97267dfa89254bfd67efea25046109e6ca GIT binary patch literal 10350 zcmZWvRa{$7u!ayI1Pc({-QC^Y3q=YPD^T2Bg9R<_8oWTUQlPkdu@)=d;%>zX^zy$C z_vJp!&g_}l{q1?!bLN|GVs*5XvB6|uBqStkRTYI-FM9ArdO>I}qlxfj@QXtBe5EXh zR5wL&@G?=bF;cbF)I?%?u|Y`4aC;=+e<3eI_993~D8wD@`)KnK850Z{bAv9;Ae(+X~(D6li|uSAT*#X4G4g&%Y`he zsKYg2$wNa82q)XY*A)eLC;)({z!Hi$l{SnLNO+ZLJHKQg11)k>o|COz`_bRUw>bp` zb*F^~q5&-rw<`sw0rhpE^EFrV>}uP;!LX^Rse(zUXgZ!JuAdWQWDCzQ8B4h%$Wk&P zxs|X&N(*JTNDeV0W(ZT?O{JGnF9c9CAQ5)6Q5}gz;Q1i03o@%lhh;}L+UPT8Ip(&E z$5M~!1pv!rmeOJC2x|LR9@v)e$jKLK-+|D!V;(=uM*F9X8c@HpN&R3G5e5atm&j-r zAI?tI=;RR_HMDtE=vG%L!v{F)+pbxb<72|0F&q~1B-MY69&r;=z8a6-i(t#J;9$T_ zibk0s2d!=(mMF}hJ+w!&cfSB26!fwBgm>AKmxMsPwQwB@uXix!e*4a=6 z$B;-8|A%ZMmky)J&rx7R40^VQNM!%gFR>f!3%0Q`_eZ0}M)OU?9cF@ehIy2n3{Fm% z6UTxeJZJc`0nL@#r>bqes%=-33!|^fr3F31ua4{uyds~_uf^c*V)b_ll9c+Dg@Kw+dqwfJ~SHbu}%t{k=#?=svqd3sIXLGxN$6WvGePNk`wPX zpv*13-p~esOXSS);NDoVe3;DbRH%@5V$WC2N2RjOflzGa`&up zw_qa6b^t~iBe_LKfer9JsVBY|$J=1)zt=xZ$Z zNRmir7^c#uJjr|IX-xA)*21msly|`E%|O^@+N;_F?!mZk7oC?oI?>c}A`6x=m%Qvf zL87l6UAso&T=uBq4_#>8DKfG9*u;`8!2ejjx(&vT8ctY`a(Pr)rv(NvLOSP52Ol}Xrl0l!W!s_p2+Z); zha6653!C-TEp_ctY~zhaf^HS;iescp-?PnTMF?p;yMH1p*7)*fl2Br!&Qwb!oz%i- zd!J2s({VL3wBP|~Q?%L2*7)7d$PJU?D(mDl-!KI~In%DA^8t?gZqM$hZ;W@XKA%wu zVCnJuDM{bE&GDcK`X-Tir*pS}wwpBU$=}nGw70j@jUh*z%^AcGRJtMss-BuzPtJmy3Oo+e;A4eui z$CzCXp0OYk#CnDUDg+4>=H@#9rix*#{ql-$#ud=hY zR8ycrK5mgM}})NtsSnqr@u21+(1BEOI)MiKlX|hUE{*%lm1o&`Y01Q4sXuR zfjNbk7*>N^% ziaAK(gMZpO7=}bI+&`1M!_W=UCF0j$g$yZl0Dkr7EAV1Bk)SsrjM-C(gFuaSb%Hu<~VS=0^c1oGG~|-_!+FrSVQ|Q86A#!=;rfek>0fri(!9^}cW3 zEi@lKl3X(3y(iA}>?jtxLeovR$z8Yv5b-B?{o6U`LM;&~r!gYp)B?;|k?OFRDWq4E z3poGmus`K#X=ur48f;Bo!fY_4m9Ps3OJ}VV^*@hY%6`c$YeWhpU;0fFs819Wfg8eu z`|dG+7*@A#XYJRpIMhUyj#E*I*(1NoBr_A`#0^6q-Q&iQxJ9slvR1jH z+gX#FLJ_R6)xepT%=#KJSFpk#{BZrn*C0|ztM70@ON1&A z@0sEt(emsUy5mBv{V3=B*T1QMAz!Wc$ctcMDU*VY5HzBbnfn|N^F#@X2wDdX)TN7c z;$8kx{HH;k{WoT3k5rkap$t?+jrOt63_Zv<@UIn;#Gy^_QB=VLW^#aP#$1Fu)=e}= zKhHSs8$Jr0Cm`V&2_E$=((mcYgaD4YcxVhAvf05b3sh2`Vf(I_z>m7O;XQ(cn25E7 zm68?m3qM7l8KiT`Ev4bnpF35`f?(&}*w^r#2(m+y6!`urdE*rgIQA5Xk;iAl8!cT& z_$ONH?<^x-HqUf6V@aT9TAD*W-lxg)Di#y9FiF;u`1fFXZMjsgrfmerk-ciSf0hcv z8_nrhtDVfwwj#^-7>x9hlKMND|MT-^OW7=${G3eIqP8NJ#&k%I5!^eu zJZc%lQ6c<4Cdy?%v#Eox=)+uP-_5mT&(nk0%FufU0$)#QO?EX)*Y~aFEI$SGdg1!~(wkJ#qh1S7oK$ z8@j&SFXsvWWLQj1IwpiE=XywxSs_+I5|vZgyb-tsO*lmoNg8PTWXPiLJg{@Fb;dv{ zu&V9341dqW7l^Z%tcshF@PcI2xXf~d7himC|3643n!n?*3b9j~t)bF-ZNva5{dHab zs;@~aG{wRLng|8;M(P;{eV@FMZzeQf771#G#kSecn$QCOqEA!*GBT{BW} z>spdp<`wd-6_E==Nia9jky1e7*KFv#_1o)LBC8LhBDAcwB|#)vb^yHiPtPQ@AI*3b zoe>E_{Tdc1v}%HsN}hX7&9Xy6YlrhZh@hV&bZyL%vS zqU+J@6v^@Rzov?c!^Q6vngr`g2a2{fB>2eUKnm^ZuewIfrxO|xwKCYF{8$~e(lm)~ztHohvsSE&Aq)-VZt{H3hRp3>K$%R!WuPU&CD;ER6_72H2N|A}aXRsqz zm3u)L=x%81@)mI33Vc64--oR>_>N%OrWP|9(Tl z5)2N+XcZLrAthup4pqnW0u}ivclfHk`fUUnAyqkHfU_1Vko>Kce>-MC0yO2QC1ye% z0(VjDU5zVhhXW4Iz~@7nb2TC;6oVzL0x4xV_DPQN&=n3D4Hg}c$cb?q0-L5uAVFEyMTpP;uhf|`NGw1*$xMlueZBLfmH`A>|g zqgXSWYpE{1^xbd}=xc+GH}Z4~@5?4PJWm!SetT`3y+B&@tXR{77-PPBGFWbVH6|kQ zT+WtBhdDGNz|Ev0khTY1cvtQOQCVymfI-(T2POT%+d{pR-$^Jj5`WiOvc;DYkJxTy z{uT98*@G5SRkE;daGvKnBbWVB zykW*>cvVj?n^{e@dDN)k2E(}U3u?)sW0pJFab(d?R2CM%9GrAi*n;&%-Q>=GxMPc& z3yhdQOl)JevWBJY)@=G4)Ay;v|EXo(^c6TziQ^BFksbBGFmR;ba|gL)@9kBAIxur2 z=&a`EVS@$MgcNgY=!B{6Yo7>v3{R^b=NmuVO}mAkzt(?3rSG>Ol-du94Qv^ktijLI z`xoVdB<;;o#3yf|Pvh6#=0SBs(Xe6B0VP*ZY{Qjn^ya-p>5y0FxiC*BB__5K=*PUH zbjfL!3n^W681_HUf}_%+Yw8GLuZ?txXg{yXRp>>ZP{DWseO=a3c7#IAZ9>)OTbw01 zR=&T5;b2-UF?QYf=7LWURCeuaMo{>No}S*er9Mcex!oTf8s+slTr3iGTCAcmBGj|S znc~jawWv9HxUC4|AEk}%En7jbFOYEcXNia-ft=JV)bU_ z>s}DQvw~UfCiXhw7${O{5u;7P&!8Jl3C-~C7)L+tk=s%IKo$}uDZ(V5Z_`+MAz5h1 z>aa~z@>(#3bEQ%r9J17GLKgqYnNyP}j@XedMGXHwO0l047r1S&iCHkf{!FxZ?D|Hb zgRpDjTaG?fA(zQ#+i%%!{Qld%?vMs3h)U9YOPBQNq0PYA^yeLe`<3hcxdp|?CW`Kq zoC2AQOXt9#mb>at_1zH3Gm=EhO@pFiZQFu0rwi7NI9QktjUS-F{+1=g$v5GCmvneh znpLSp9Z%WN(2&vqcX$$cM!dEkoW*XIx4XOhHX$d|Znv-4X+%T#-Yf{{gc{C_u}8zT zBahOt4ciO%Q+}NA2?{C8t00wA$H`F%gkHj%xku{vb%)K}`eTl1Dd>$vl#~H5fIzil z#E6yDETU)3g+odgmEPCgP@* zN-xw?hKu6nVxQvIidQ@Z{iX;m?qiicUP>z^IL>|7u%FL6*qGWl;95!}8Ti1soMBC| zt*i=hV}wXVHMF=hCg7h%0e0+)IjOH9SKeJm#+r`7qp4%cz;zOuuaDgI@Vq^N#AkQ% zKqlhnT$idV3Pz>lYAdtymOuI(giKa_^!xEp8q? z-+WMKP&4;5;d=&gg=g*89MN8_ zTl@DGPQo{QPh+lUc%!N`eta}gb_?wTxef*d;5hsVWB)>96&+g+d-tuc+ z7YaBd$)p=Rv&{LnN1z(Z4BRj>_leY``MZjpKbrFk+XabVPo{ zX1iq>^!&J&nk937EF>hDAN~~kZ`p>jy1Es2P2XX}nA9u804U787VSwt(Rg?>HficU zq&hit^UGF}-~O`03$)D%Nn_T2hWsT6lH#qtbV?~;8b;eAm?yf9a~nPf8G`rs$j}1O zg}H;-O)7ZI+X$jJb}g1jr5ckHcvQxvL1W}oc|PJ>5CY{l%elf>MoAjr8sO6^7Xee^?XnF8=Mm|Quh{yB`uzRJVjT~fKcHQ?BGN1_HJ7{}`qBiM zGN%g9BMxVY)|ogvF*33*FWcOWAUXsYUqAEf^hR;E7NfS1=x_&=Mo3DL-;mc;fI&HGdN<11|uHegc(2A28eyq`_n;w=uRb2!6Aw zZC$=Q>`|}4+P_=sA!A}Q5#c^-oT9Qq-P)$VK)$P=b7w3HtqNK9h-o@ zzK)|*hq8HWF~rQ0xzcfXqX`|yyoX{?%*#|Ar^>tVlIyUXS=Pp>7I3s!z^n zdGlC0DdopHo@@_9pJWb+2q(q_X47K9_XGA6>7Uh};;+vUuS`CE*Ui0KrqJ!=>83%I z113`@Ry*6tvKTC1AeirYo0V~!ch~_ab>lyYvUWb^Xq0& z1+j))p%b&_XJ&b`2ZYz{q;Ip99-7J_t(jdBcX{;f>IVkyqf&6F!y7BYPHklj0>Y8mMdRVVj!{(>J0HJkq$s0joJ8iQ zW@7@L^6;er!=L1O8rT4cDwP^q8+u45(%rX8qqSzU@d1Xwk;LF9+~Sd{Dsh&`j0VtP z-G{mYylE{u&Gws}9-T=551Jg(Ue@@+!rwK!%Wk?J6f64?^^hIVx}E4^u$ zp;AVrFilQ`u4*VOuwcfxdm;Sg7#Kb<=6X{WH=bqfoWxWD(VqPyB8*BOMK{u3rTja- z!K$&cz&DBov+X0Tc(+FhJFBAU2rF!Pi!&+PAJcqxqap3dZhSvSi!K^_{&R!-ts_Wr zd3QurO05rNb!wonU-;zLE_v0Pz#~bYpdBS`*0Q(hOtm|%8kJezsB=G8T;Si9CcYCm z-A|2vWHAl-(C^_pKX(RXM5^a++;B^bICiB`JJ&}KvKa~QGT+K^!{Qju$KZB^ZSGs` z9KdJ%+rQz>CFF<2-W0k0a$#3~BuI}HCVNSk6DQxrpS$$1$R5~loqGiml-tBGqha^+ zZyEJoyj<4=#FbYCf&6&HPTx`pxzx|L5`3o-qLPq<2W7pP_m8BW_5ND@BRckYSgfmi zk*yN`O>bfOg+FlTq{qAAo3TUNKYNGQ-2MC+Brg`uoGR=Yp0|W+!WQl?q5&(0pR>Pi zxn|3R&Kk#fi3Yq!Xr+C2QyYoW9M0)qI#}Z0>V|*{X}gt?5u1TfZ4iH36ewbRSdyo! zhk@+L?UHCO_BPs5mv9%8cz|YAT1QrD7Yq5}jlA{AR0RvVm?K)_a32X(JH} zsyy$#)@wduhm4&q2D@XPRIz_n^tW}GCxM;s{FDTX#eBIEZ#4DGXZf5X0KLvjm~ou> z&aoq@#nknx+dm1CUws85WIbVRZ@W$CfsOY7qgvGYAFpE^7 z3X3>VIM0x?7;NG*cH$rSgY(rlwjv|d4x)JUjV~ovDN1FM*E?SAuBcWF1dnLcOK9yl zgmfcM=s#gLYkRY5onfCqqf*$`R^~ERx3UhN z<}SncXxI6b^c#eTA+aTkVX@M?FA{7>9RqvTs8>I)U)^-coKK#26z9mE$ve*E7k-sk z7cRA`Rb=nLuyg{bp!i4bBpQzEkIK?-r@IPhD*dGRhJH+^TtA~-YO;R63!G*UdYPS0cRVCald-yxB(}Me_17gm=K_M8 zaGKX1eHVAd_5+a3c0Ow3zBXzFXK<|JbF%7s)5HiF3>(b2Ase++jvqz)9}}6$&|_N= zJV^!h@U7r+dyc~c6_OUpdOZmv*dL+oQr)TgEmuf|>sHde^ii+NhP=yc#W_o!z#FAC z>_b}WmcP}XsFlES8BqO1#^pI3Uik{AocN)3Uz^D`fcmSyHl^A$tw7+`2a7KO-sD@@)>0M2;o~AitMEdt%-G8I1%s;oUe~z$cnvS|I+MIva z{OBPrrI^k0FO8eqa1kwQQ!Tvkf+AxtRgE`Jyb5g#VY+G9P#IXhDcmBS59xpW2km=Gyrf(J6SRyuU$C z=1}x8T~n~N>QWbpUyr-Q6j4X($0Dgz)+KI<+7ISKQgff(Tqs`rT~D;}h3DZ&O$IVJ z1*s+XH!`?LXxH~!pnDqqVi5N6nHmsu;{M&ix#ENQH!kXY1sisFRO?KmwHAWsVS65!$ zuJ;7a>;qq#QEty?xh|tT1b-kEFyo`0_LO9rDTYDwqBHj$!a_frb+YIXW-W53*a;se zk88o-{M9sK!CUtj3@&kR9~;Y811tFCOS%s!Z7nZR`2XN)z(e$^wz&ShPVk2Zx8fypXuiB~)n+Xlv=v-$u$ag~}^W zoPgRZ%cbJ38DyeZB)ue9|8Dl@?*`9hGDft&Q^afYT(QtHBJK*q(rDb1_fp^M_mBgA zInbRk9II_^8P+TXYosy`0|4d^Q`M}5guQ4s%zcgB+j1qr|38S7}Vc2<{Gl}N-` zXD$Fn(Jm^Dr{D8HeDVmM)poYXtDndTvaEY{OhFN)8M@b_6U}b>DpF3~5%K>m_wTJa zI&0Nrm-^Js|#S)};2D2BRATkYRq3;7#R<@56ZR;GOFR8t{Zfe}$ke z!VAh|L=>0hr8K~H*SEM5fbxN9F>Io!3Fl-kgxb9J9cP`^(|rnVxDG+mP!G=Q9ZWMp zicyZpt=Q_rO~d9^#kt``nU>seJi~?2X2q8 zH|p$_h51}kWm^|S`uESqEdFsf(%&tA!{EioGqxNS35~JJ@XPeOOGb*u4?&j4u(P8T zcmJ8dbfMTBr)_EcyyH;OEiB0=84ccYSUqN-tM|X78|V!aCHN(o$Lnd%^7S}EGAjSr z?m`J5{%jc4|7m0I?7r+ZSV3yvf18-xd z{f(F02@G$x$b?io*}#xs;dx$wi-g&_?^AqmTb^y?uItS<6v zHlv8l7vNQ-w_wwK?6<1`il=DCz@S zq#vMkU9!F`&}DhQSX;b-Iq&E~y6#f@xn-8YAb+~6Qtr&%l~@)R28)p>f|iK F{|6BGUt0hG literal 0 HcmV?d00001 diff --git a/Habitica/res/layout/equipment_overview_item.xml b/Habitica/res/layout/equipment_overview_item.xml index 38d2a0a05..f7c08d05c 100644 --- a/Habitica/res/layout/equipment_overview_item.xml +++ b/Habitica/res/layout/equipment_overview_item.xml @@ -17,11 +17,18 @@ android:layout_height="@dimen/gear_image_size" android:layout_gravity="center"/> + \ No newline at end of file diff --git a/Habitica/res/layout/equipment_overview_view.xml b/Habitica/res/layout/equipment_overview_view.xml index 2dc8c09bf..eebc13b54 100644 --- a/Habitica/res/layout/equipment_overview_view.xml +++ b/Habitica/res/layout/equipment_overview_view.xml @@ -9,7 +9,8 @@ + android:orientation="horizontal" + android:layout_marginBottom="19dp"> + android:orientation="horizontal" + android:layout_marginBottom="6dp"> + android:scrollbars="vertical"> - + android:orientation="vertical" + android:layout_marginTop="@dimen/spacing_medium"> + + android:layout_height="wrap_content" /> + - - + + Armor Back Body - Shield - Weapon + Off-Hand + Main-Hand Wear Costume Equipped Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll. @@ -852,7 +852,7 @@ You invited a friend (or friends) who joined you on your adventure! Keep Challenges Leave Challenges - Auto-equip new gear + Auto-equip new Accept Reject Complete diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt index 0933717a1..8bfaaad52 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt @@ -9,6 +9,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler +import com.habitrpg.android.habitica.models.user.Gear import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import io.reactivex.functions.Consumer @@ -33,8 +34,7 @@ class EquipmentOverviewFragment : BaseMainFragment() { super.user = value if (this::binding.isInitialized) { value?.items?.gear?.let { - binding.battlegearView.updateData(it.equipped) - binding.costumeView.updateData(it.costume) + updateGearData(it) } } } @@ -56,8 +56,7 @@ class EquipmentOverviewFragment : BaseMainFragment() { binding.costumeSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.costume", isChecked).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) } user?.items?.gear?.let { - binding.battlegearView.updateData(it.equipped) - binding.costumeView.updateData(it.costume) + updateGearData(it) } } @@ -74,4 +73,22 @@ class EquipmentOverviewFragment : BaseMainFragment() { MainNavigationController.navigate(EquipmentOverviewFragmentDirections.openEquipmentDetail(type, isCostume ?: false, equipped ?: "")) } + private fun updateGearData(gear: Gear) { + if (gear.equipped?.weapon?.isNotEmpty() == true) { + compositeSubscription.add(inventoryRepository.getEquipment(gear.equipped?.weapon ?: "").firstElement() + .subscribe(Consumer { + binding.battlegearView.updateData(gear.equipped, it.twoHanded) + }, RxErrorHandler.handleEmptyError())) + } else { + binding.battlegearView.updateData(gear.equipped) + } + if (gear.costume?.weapon?.isNotEmpty() == true) { + compositeSubscription.add(inventoryRepository.getEquipment(gear.costume?.weapon ?: "").firstElement() + .subscribe(Consumer { + binding.costumeView.updateData(gear.costume, it.twoHanded) + }, RxErrorHandler.handleEmptyError())) + } else { + binding.costumeView.updateData(gear.costume) + } + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt index f0de979dc..eb5591fdd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.ui.views.equipment import android.content.Context +import android.graphics.drawable.BitmapDrawable import android.util.AttributeSet import android.view.View import android.widget.LinearLayout @@ -9,6 +10,7 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils +import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper class EquipmentOverviewItem @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -27,17 +29,27 @@ class EquipmentOverviewItem @JvmOverloads constructor( var identifier: String = "" - fun set(key: String) { + fun set(key: String, isTwoHanded: Boolean = false, isDisabledFromTwoHand: Boolean = false) { identifier = key + binding.twoHandedIndicator.setImageDrawable(null) if (key.isNotEmpty() && !key.endsWith("base_0")) { DataBindingUtils.loadImage(binding.iconView, "shop_$key") - binding.noEquippedView.visibility = View.GONE + binding.localIconView.visibility = View.GONE binding.iconView.visibility = View.VISIBLE binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white) + if (isTwoHanded) { + binding.twoHandedIndicator.setImageDrawable(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfTwoHandedIcon())) + } } else { - binding.noEquippedView.visibility = View.VISIBLE + binding.localIconView.visibility = View.VISIBLE binding.iconView.visibility = View.GONE - binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10) + if (isDisabledFromTwoHand) { + binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_white) + binding.localIconView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.equipment_two_handed)) + } else { + binding.iconWrapper.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_10) + binding.localIconView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.equipment_nothing_equipped)) + } } } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt index a233d6b2d..88df381d6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt @@ -32,9 +32,9 @@ class EquipmentOverviewView @JvmOverloads constructor( } - fun updateData(outfit: Outfit) { - binding.weaponItem.set(outfit.weapon) - binding.shieldItem.set(outfit.shield) + fun updateData(outfit: Outfit, isWeaponTwoHanded: Boolean = false) { + binding.weaponItem.set(outfit.weapon, isWeaponTwoHanded) + binding.shieldItem.set(outfit.shield, false, isWeaponTwoHanded) binding.headItem.set(outfit.head) binding.armorItem.set(outfit.armor) binding.headAccessoryItem.set(outfit.headAccessory)