From 8c0e52dbcba12dadb7adfb568315f10ca3b78824 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 20 Jul 2017 19:59:59 +0200 Subject: [PATCH] Improve currency display --- Habitica/res/drawable-hdpi/currency_gem.png | Bin 0 -> 1183 bytes Habitica/res/drawable-hdpi/currency_gold.png | Bin 0 -> 1303 bytes .../res/drawable-hdpi/currency_hourglass.png | Bin 0 -> 1417 bytes Habitica/res/drawable-hdpi/ic_header_gem.png | Bin 1111 -> 0 bytes Habitica/res/drawable-hdpi/ic_header_gold.png | Bin 1177 -> 0 bytes .../res/drawable-hdpi/ic_header_silver.png | Bin 992 -> 0 bytes .../res/drawable-hdpi/item_count_bubble.png | Bin 0 -> 1422 bytes .../res/drawable-hdpi/item_limited_bubble.png | Bin 0 -> 2145 bytes .../res/drawable-hdpi/item_locked_bubble.png | Bin 0 -> 1764 bytes Habitica/res/drawable-hdpi/item_pinned.png | Bin 0 -> 784 bytes Habitica/res/drawable-hdpi/shop_gem.png | Bin 0 -> 15442 bytes Habitica/res/drawable-mdpi/currency_gem.png | Bin 0 -> 743 bytes Habitica/res/drawable-mdpi/currency_gold.png | Bin 0 -> 766 bytes .../res/drawable-mdpi/currency_hourglass.png | Bin 0 -> 850 bytes Habitica/res/drawable-mdpi/ic_header_gem.png | Bin 701 -> 0 bytes Habitica/res/drawable-mdpi/ic_header_gold.png | Bin 716 -> 0 bytes .../res/drawable-mdpi/ic_header_silver.png | Bin 620 -> 0 bytes .../res/drawable-mdpi/item_count_bubble.png | Bin 0 -> 862 bytes .../res/drawable-mdpi/item_limited_bubble.png | Bin 0 -> 1255 bytes .../res/drawable-mdpi/item_locked_bubble.png | Bin 0 -> 1048 bytes Habitica/res/drawable-mdpi/item_pinned.png | Bin 0 -> 537 bytes .../drawable-mdpi/shop_empty_hourglass.png | Bin 0 -> 1895 bytes .../res/drawable-mdpi/shop_empty_seasonal.png | Bin 0 -> 2472 bytes Habitica/res/drawable-mdpi/shop_gem.png | Bin 0 -> 527 bytes Habitica/res/drawable-xhdpi/currency_gem.png | Bin 0 -> 1571 bytes Habitica/res/drawable-xhdpi/currency_gold.png | Bin 0 -> 1720 bytes .../res/drawable-xhdpi/currency_hourglass.png | Bin 0 -> 1911 bytes Habitica/res/drawable-xhdpi/ic_header_gem.png | Bin 1478 -> 0 bytes .../res/drawable-xhdpi/ic_header_gold.png | Bin 1564 -> 0 bytes .../res/drawable-xhdpi/ic_header_silver.png | Bin 1368 -> 0 bytes .../res/drawable-xhdpi/item_count_bubble.png | Bin 0 -> 1957 bytes .../drawable-xhdpi/item_limited_bubble.png | Bin 0 -> 2925 bytes .../res/drawable-xhdpi/item_locked_bubble.png | Bin 0 -> 2364 bytes Habitica/res/drawable-xhdpi/item_pinned.png | Bin 0 -> 1003 bytes .../drawable-xhdpi/shop_empty_hourglass.png | Bin 0 -> 3877 bytes .../drawable-xhdpi/shop_empty_seasonal.png | Bin 0 -> 5715 bytes Habitica/res/drawable-xhdpi/shop_gem.png | Bin 0 -> 15551 bytes Habitica/res/drawable-xxhdpi/currency_gem.png | Bin 0 -> 2414 bytes .../res/drawable-xxhdpi/currency_gold.png | Bin 0 -> 2660 bytes .../drawable-xxhdpi/currency_hourglass.png | Bin 0 -> 2957 bytes .../res/drawable-xxhdpi/ic_header_gem.png | Bin 2275 -> 0 bytes .../res/drawable-xxhdpi/ic_header_gold.png | Bin 2427 -> 0 bytes .../res/drawable-xxhdpi/ic_header_silver.png | Bin 2032 -> 0 bytes .../res/drawable-xxhdpi/item_count_bubble.png | Bin 0 -> 3244 bytes .../drawable-xxhdpi/item_limited_bubble.png | Bin 0 -> 4745 bytes .../drawable-xxhdpi/item_locked_bubble.png | Bin 0 -> 3771 bytes Habitica/res/drawable-xxhdpi/item_pinned.png | Bin 0 -> 1512 bytes Habitica/res/drawable-xxhdpi/shop_gem.png | Bin 0 -> 15753 bytes .../layout_rounded_bg_shopitem_price.xml | 2 +- .../res/layout/activity_challenge_detail.xml | 2 +- .../res/layout/activity_create_challenge.xml | 2 +- Habitica/res/layout/activity_full_profile.xml | 43 +------------ Habitica/res/layout/activity_main.xml | 28 ++++++++- Habitica/res/layout/avatar_with_bars.xml | 48 +-------------- Habitica/res/layout/challenge_item.xml | 2 +- Habitica/res/layout/currency_view.xml | 36 +++++++++++ .../layout/dialog_challenge_detail_reward.xml | 2 +- .../layout/dialog_purchase_customization.xml | 2 +- Habitica/res/layout/fragment_welcome.xml | 4 +- Habitica/res/layout/reward_item_card.xml | 4 +- Habitica/res/layout/row_shopitem.xml | 44 +++++++++---- Habitica/res/layout/widget_avatar_stats.xml | 43 +++++-------- Habitica/res/values/colors.xml | 2 + Habitica/res/values/strings.xml | 3 + Habitica/res/values/styles.xml | 7 +++ .../habitica/helpers/NumberAbbreviator.java | 38 ++++++++++++ .../android/habitica/models/Avatar.java | 2 + .../habitica/models/members/Member.java | 5 ++ .../habitica/models/shops/ShopItem.java | 10 +-- .../android/habitica/models/user/User.java | 8 +++ .../habitica/ui/AvatarWithBarsViewModel.java | 52 +++++----------- .../android/habitica/ui/ItemDetailDialog.java | 4 +- .../ui/activities/FullProfileActivity.java | 1 - .../habitica/ui/activities/MainActivity.java | 10 ++- .../inventory/ShopRecyclerAdapter.java | 23 ++++++- .../ui/fragments/BaseMainFragment.java | 7 +++ .../inventory/shops/ShopsFragment.java | 43 +++++++++++++ .../habitica/ui/views/CurrencyView.java | 58 ++++++++++++++++++ .../widget/AvatarStatsWidgetProvider.java | 13 ++-- .../helpers/NumberAbbreviatorTest.java | 55 +++++++++++++++++ 80 files changed, 418 insertions(+), 185 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/currency_gem.png create mode 100644 Habitica/res/drawable-hdpi/currency_gold.png create mode 100644 Habitica/res/drawable-hdpi/currency_hourglass.png delete mode 100644 Habitica/res/drawable-hdpi/ic_header_gem.png delete mode 100644 Habitica/res/drawable-hdpi/ic_header_gold.png delete mode 100644 Habitica/res/drawable-hdpi/ic_header_silver.png create mode 100644 Habitica/res/drawable-hdpi/item_count_bubble.png create mode 100644 Habitica/res/drawable-hdpi/item_limited_bubble.png create mode 100644 Habitica/res/drawable-hdpi/item_locked_bubble.png create mode 100644 Habitica/res/drawable-hdpi/item_pinned.png create mode 100644 Habitica/res/drawable-hdpi/shop_gem.png create mode 100644 Habitica/res/drawable-mdpi/currency_gem.png create mode 100644 Habitica/res/drawable-mdpi/currency_gold.png create mode 100644 Habitica/res/drawable-mdpi/currency_hourglass.png delete mode 100644 Habitica/res/drawable-mdpi/ic_header_gem.png delete mode 100644 Habitica/res/drawable-mdpi/ic_header_gold.png delete mode 100644 Habitica/res/drawable-mdpi/ic_header_silver.png create mode 100644 Habitica/res/drawable-mdpi/item_count_bubble.png create mode 100644 Habitica/res/drawable-mdpi/item_limited_bubble.png create mode 100644 Habitica/res/drawable-mdpi/item_locked_bubble.png create mode 100644 Habitica/res/drawable-mdpi/item_pinned.png create mode 100644 Habitica/res/drawable-mdpi/shop_empty_hourglass.png create mode 100644 Habitica/res/drawable-mdpi/shop_empty_seasonal.png create mode 100644 Habitica/res/drawable-mdpi/shop_gem.png create mode 100644 Habitica/res/drawable-xhdpi/currency_gem.png create mode 100644 Habitica/res/drawable-xhdpi/currency_gold.png create mode 100644 Habitica/res/drawable-xhdpi/currency_hourglass.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_header_gem.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_header_gold.png delete mode 100644 Habitica/res/drawable-xhdpi/ic_header_silver.png create mode 100644 Habitica/res/drawable-xhdpi/item_count_bubble.png create mode 100644 Habitica/res/drawable-xhdpi/item_limited_bubble.png create mode 100644 Habitica/res/drawable-xhdpi/item_locked_bubble.png create mode 100644 Habitica/res/drawable-xhdpi/item_pinned.png create mode 100644 Habitica/res/drawable-xhdpi/shop_empty_hourglass.png create mode 100644 Habitica/res/drawable-xhdpi/shop_empty_seasonal.png create mode 100644 Habitica/res/drawable-xhdpi/shop_gem.png create mode 100644 Habitica/res/drawable-xxhdpi/currency_gem.png create mode 100644 Habitica/res/drawable-xxhdpi/currency_gold.png create mode 100644 Habitica/res/drawable-xxhdpi/currency_hourglass.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_header_gem.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_header_gold.png delete mode 100644 Habitica/res/drawable-xxhdpi/ic_header_silver.png create mode 100644 Habitica/res/drawable-xxhdpi/item_count_bubble.png create mode 100644 Habitica/res/drawable-xxhdpi/item_limited_bubble.png create mode 100644 Habitica/res/drawable-xxhdpi/item_locked_bubble.png create mode 100644 Habitica/res/drawable-xxhdpi/item_pinned.png create mode 100644 Habitica/res/drawable-xxhdpi/shop_gem.png create mode 100644 Habitica/res/layout/currency_view.xml create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java diff --git a/Habitica/res/drawable-hdpi/currency_gem.png b/Habitica/res/drawable-hdpi/currency_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..c384772681690e79af33146b242f4a7aebfef311 GIT binary patch literal 1183 zcmV;Q1YrA#P)Px(SxH1eR9Fe^R!eUiRTMsVW<2A^I1dT6iD@e#IT5I!Mzy7`*rr0Ts902jZIL2C zNt;dk6HvP;WC22=5^Ioxig;8kDj{~rK^0Inv0JGSC=DcW8ppB6_RQscGmbs>*s&9Y zy794QeC~OC=kvMe&X{N*gANQj@c(u|^b0?^wD7W`*lNG={y4``?QCl92fwYG-WQ={ z=K9+V@L@NQKJD+^PtSkUE4C-0iKXi=NJ&c!6zK)l!(S4DQn}Rpz5U|$C3N!cXL_al z=Z{S2)QB3Usn{6pI<)}akx?U9yX1HcNb_fY~17Uw0*x%q&ckkn;#W z6F){rxL8~@{JHe39;XxGk%kRAY<}6Plu6cXa!U24Fs6&`5Ax|92~B1`enyb}DM=|3 zTp(>G+>~J^ggwS}Tpyxi#;^~{Q(=S8odxMox#kf8Az9_^W=vqCMj)9D9SJ$2bVCx2 z>q4coBS{YPMoke4!FGa+CXAs@c&-gT#1yJ!avVmgi@S9^1HeX&J-h$gtK_pxWENhP zWPb(IDCsm}Yd$ZLX+&w<40fg^sJ^J#HF9jH#q~@1AKGv*Q}~(cYq|8?*ZzRkYV4Ux zjorHQ)1yTx(1ukYr`$Xgx~5UY&>5{`a~s(3z8F195jE7X{ak$9BqPM))akKX zxrWzM0;r#h^R^sP-emf>5u!wSZj2^qrBEg2KosIlkw ze|IE=fR*Pj6cibKg&$_i?rz5-Bs7nd#V2QdpDx8!ouUeFE6ZAShrY>Y$>ARWEMNlL zb#}OQC4|^)dS=})Les3S5+7DI&ZPK>3-P+-sx3Ek=Xkw4`C5s-++3zAAAgorU;(ow zp>44*A;kXr(z~k)Y13S2y-7;YZq=gAQgD_`?vBaNs~x*SH>D5RKCK4gMcw=qktg6>#M;^yW(D%cjt6p#yy*2vDQz6c?8<@9Vu z5!yK+goSOx_7(ZHkT35vkWD_~5hdhq(Z$iLXNzLBo!F+><+$L2e z)r{~gHAf;5iqp3|z>j&55rbId^x)9qJ`f>fW>Xix;1|vebP>{MSCjO_DpFL{C{uhy z5BZ3@!ZB{Fx9a=OTYNZ~So+|yl+IOTn^L2r;W$08@-CPV%9UK|;xp~=kqpYTKP0(AZ(cO#p=^cM8P%7JI7z0j#tVunxC xA};9d{-?4|<`xWGPo?;v=%53G4jixp{{rfKZQ(zvSRDWW002ovPDHLkV1h0%J|F-9 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/currency_gold.png b/Habitica/res/drawable-hdpi/currency_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..6d54747cdb00ba17e3e4bf478f85b9a4a3e277fc GIT binary patch literal 1303 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 X83z*|y8QVU00000NkvXXu0mjf?;9Fv literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/item_locked_bubble.png b/Habitica/res/drawable-hdpi/item_locked_bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..fe4f622bba8d21af38be035d58d0a423d77cf45c GIT binary patch literal 1764 zcmVPx*o=HSOR9Fe^m|IL7RT#(5?9T4&Dui9OmP=~|ibSQ?1TU?nriQ*~sc0iLnp8BV zeQD!^iH(T~;mOcM6XR1&Yj`r2rjai7lBmHJ1>0b-7t~NfO>Kd--DMZH>}__&??3cR z2lh4#MIZDe%Q^F%@A8}PeCNyzjQ!vKqZtqubKk*W(5)!Svy2JbnZj17jFmH{(hp4- zBj;nx!mg6+8;iyAh0EodoSn=6Z{DD)stQ4Wu!*1!FoD(6wP+@+AP6#3SuX|r$mMZ$ z(KWd+-%Nu7aB^~bGgIY5s>(K-50R=V2&|6@;@fU_VV_xGQ=kNC4FrPkGgW;vHS8iJ zg79H+vFj~@P3H2F6;xa1V6aG0SSLYl&*f}E^MXM2%bKZvL)o&M5%dnE+DEnZ@PZ)B z8VT$-i$&O+4c3y*7a&P)NhX!!OAZMDN`w}RV&0COf|V8&T7G}v1Az$*DHcm4KrF<} z()QQB!^_yC5uO6FP5$-Jz)gZYZQ>p&CM3kZrg9#BPnKsgdf}hbn7LOx?a^2}9};i5o^#TZ*JRtRN9zGj^K zH^=i?^o)w4s7_6VPCFgW-3tZ8awC&y7%!%ULc#CB#C>QPZEbB;Av}5VSkrV`sqvCa$B`XjN5}GCe(=^i7N(;ggyA<;#~by4y_C8Rf8nZLS6euz-o{>Y%l? zwW`zUOg28(=#9r?16(0pkC%?RCpIvbyNKbfDOZCIbRT_uL(cb7#0CRcz{Gv)QSg>h zS63&}W6OE?@R6rBtY7ElO8;d4%lQjC_w9S*G%b5%U|>L|deva{i~2+9_x5&mb^S&DBAYgCig$K)D!ev%j1*8z0CwB9 zZPwx8VLKT(Jsywq#EH+_irwzlx#8XD1Cx`V?ArBwD>6wjBQ-TO@t&TZ_FT`TepSjLLd-#Aa_=ImGWG0_!GYVy76+JRLGBRSL!&;&{ zl@f`Bcv}L?Y+@7`@W5`{mtV+H5wNY-9A!8LO_YP9QOe zmoA%{9Dg!34vU%{92^ws70^zb(oR8a6u`P;#}0Q(OG`s(NqIeq%0$sxLOLbzN1MV& z-$_2YvGEDtSZ_y1$G4|WotmT@PLeD^J3EezvvK1_88r!;Opw|f{^V)^#wS5{cemB& z^N9|J!$xPFC`pnCU<#=Hvw+_i_lLmv5xfGxSS%)!t&DTBq@+Z~?#4?;HbC7MALQye z1hR{-L)rjVT1snSVWBl1kL$4XX0DYCee>v$cDp@^XEz>;v@x}3xS1>(nKIU>QOP*w zz{oJZy8(@_MSS1jXVj%EYOjxY3&N8I&u;$OW+sb9Uw;E9!bbS6C?u8u0000Px%%1J~)R7ef&Q%z`7K@i?~c`cD@sn$^Z#U5%30qG%WLVg;mpdct!+lz{xJP0C+ zHx&$i#9zL@u-6?$_ov-{2L z_s!1CGPcZ%{)Io4%KAv~enA}%qtV_%Gma$-Oed#3MLstRQa3Sr@7DA||A7CKlZfWz zaKcTu=^~<5=@(3R%iMgPOXk)&#V<)f2%%RDeg<~o-k(JNxD?8dz9q< zYEOG0@*BDI74oGUAn*MZClJf4FC{H2u?B%iEO-$Cccs&^JceO#%elIpO1?aXM;=l* z%6GMuXBKy zBpw_@oGH(0*$PN!Gm&z6rAy4`a|qg6Bcd;^R(D@G-1kutE8Eay<$#4a!N1r(h;AUv-l&Fjc?NF{*F6J6^&_jPx7&q)lzM=@Qnwb4ZRcd1w>TPHvuUu-EG2l;SMPfwLx z63A?8BAE|}I{<-ePQ(hYYcf90alzR+e8)#?)~-73^Z6<&@V{NQ3j74i5-d6IA&Qd# O0000&|Su zZAffDjBf%~VvLU%M2r>%D)K?pgo1{uB%%?bM0{cJiQvkLm69rimKA+)Z|O z&i&tW&Yj;q=k9#j`DDJoc-PDn~8uxJ^yYkH06%crtNCcx?}}9y&9{ z>a6iBuoKd4ktVv%NCMhd>0=a5;AwxLlK1)iexZUEIKGPIc$W7vd_b(K5;=~}zC58) zcoj^lQL#C^D4PyiHJ%R3N{B4m-Q8W;?X5JD?JOS%1XxaB1%ZJx7_&#Wq%@H6D+hDF4ddS3HqVq?=iGkRqFw5-eZIvBjKJCGV3+C1aVT zsR|2XAP#iPgnoQczeI;&8D@tuPRhJIZeqA6kw`vw(e=jTMN^wreHTQKMOxI;Z0$(^ zwi%d4Dye|_E_f@miru}XMGKoVDw3^?yLOP)#&NS1$1PI|&JG3Py^3{7AX!GT)i7cq zr^=dg2MI=SjZLV{IEb3I)@j^ThmMjp073pUWL&aBT3l)eY(j4jvV}p{ z%zRymbw$nc6nuLO>ERnOVSn47!JXKN=;MYP0IeLA1I78ud14<;yING zr~w}%RLkC|5QzHtr~@$)al4NR9X6Dd-7he-bF`?20>c-UCGmh)6tBuiiYhTY@0S=^ zQQ!xsdIOSIj>;;$4QHLMU}F;9lGNbIC&gTI?0ZpRG5|Ob@Jk%S3Bo+4stQOtwC$FykvEc-Vv3b*uc zMnz(gBnS|^NpRu$AS%Iy0KuCC7oHEI5?lxnyh(83`5-F6g#f{u1Q(tUq7qyP5WGon z;rSpc!G!?9n*>CjNI`>3yb<6#iem(cy_tS}{ufQ_z+Bx40%JU!WFP}EMy!?irk48?3=DLwv z_q=f%Prp?%`1{=(26z7SeC?(u`v>+n960>N51W_2I+9xEtZCs{PiN%Rr0Mbed}!_8-=N}0Q20yf!S5ZPrhv5(!iJfThwja zR%e!fN%Qn~a?P)Px%p-DtRR7ef&Q%z43Q4~FIrkxgtR>6jV75oTR5)7yiH-rsKmiiMQVTY{z5$FPm zE{qU=fQiNpi5rZ%lGKE#B-l2=MAS$Mq+dfj?Y!r^12dUvi<*$=hBukK^X@(8+ArNmSs*f>-Z(2Aq zu+~4hQ=bde2WV}Ui;oq-;-k@XFnGv-UB!x%Mh0)Wi36b22NKEq zlR}7_BhvhQxXn#>1zT}JuIVN0jKZD)zE=imNbAI%*;k-%^+7@~KGzdEi9x*+t*Qnh z#I*=|!lxXKjVZ=CN2O|lm#Yxf8c0hXE>Qwsi)vQw2?X>u9>mJ_hRss~L3`e;V?#Sd(Ahq0ylWyxh%T)69dkwugu9 zD?stg^_fM+*d0X+$RZ(|x|z#*B>S*S+dt@6xea8>J0J~d>xm5oh>#wdxhwDXtP+xk z+!8{zlt-mzx>`+9&?yVND}2Q#V@sN2mNYKG1DgJ5PCk*GTi_5A+$bX!(9zr8Wv9AB zQDmzIUgy8auCT?_@Jz$?bUd2wz)21cotctbf2N!WOT!Y(S`|U2plF$RBh4vC9Eaa* z{_PG((3_qQA#W{#i?JBOxEP7yeepXiCYBLZ$1|6v8*hN8(jN;D_wxE;#46>NnGnN@ zY>G5bs(N(nbKgY4Pry8#oC66+$e0ICwg0{Y ZzW}bK=Wn>lHunGk002ovPDHLkV1jIUR8s%| literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/currency_gold.png b/Habitica/res/drawable-mdpi/currency_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..d393719c8b00b2b7d940d04ac55834fb6cbbb997 GIT binary patch literal 766 zcmVPx%xJg7oR7ef&RnJe;P#pifb_ELE=45l?Bx)QQ@Z`ypK-9Yz6Qg(jD(@N+FCILS z2%b1-xM6g`g96zg`_VO)tZSd&?`yjCZ6Jxp8!u_U-@fnfp9L`R4c??9) zA>}fJs3?9Z_X*zujCJwi>&BmSoM}M5U0gsfcm>FnD3b64AS5VBTgDKuEmBVq5Sy5= z*2J^jZ>JeL)c|?@5Hfs6iVLk@5xkR#0?@?;Njg&o3eyG~YC)J!DVmQu7nvWuh&}IZ z2O$b|w~u~bB3qn?Q@RW5(sc?*B541B*Z6{N^8lHQKslFzWuk?Ni3g*RWJV2eTG;ct z8$t>T<)ufk%l9<4NxO*2x%-$t+`(~e3+%|Xyjd_*O0k+|Hqsw)LFEdkg*`7WJQ-7- z=C^0^D9%+CFUxSfVjV*+%>Z``7nF0JE!`yLi;6Ss2k_brFdX1bs_97sc5W8g{ADG> zvZ~{T`k@=3R^)Esf;#1;0h{l&P}|u6Lxq2O51;Cg94CK8$*?RT%gH@My$00hVZ@<= z3OcV~`n6yC34tq0qDsQO1mQ9)F(DZetJr5p|0D9cI4?$C-g?n(9e#mhjyMx^7#^ z#H+(t=lkT0Px9;PhbW3x4mvz&85GOpdH!m`uR-6f zrqJRtdcAELf3+&=KWoU6mrkw}cMIi@bMAGH$n(x%RTu`Z3TrK`obj;;`0~FlJ2t@Q wtaZ&a?zDee*Q_Kt@oxG1A5Nm@0-l+H-~XpbKsptU*8l(j07*qoM6N<$g81HMYybcN literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/currency_hourglass.png b/Habitica/res/drawable-mdpi/currency_hourglass.png new file mode 100644 index 0000000000000000000000000000000000000000..fe49c0fac0ddd6bee49460eac624a378511c8ccc GIT binary patch literal 850 zcmV-Y1FigtP)Px&3`s;mR7ef&l}$_&K@`W|o88h6YHhIu`4E&EAz+L|G??hwgBlM45igh+H8Gxy zHxGI>;owP)fp|1x@Ztf&#RR;FF(x2Fv_d1;Kq;lPrR}z}^PDYdVqm*XJQ`m%+1)oY z|KH4;d2ayzTbT%;Rr}j8xiaa@MIz`Tgj$B^C!$IKTqh7~04&HrjP)L_{8UQE5-|KD zJtD=M+$yvA9O!bWsHzA|(}8C=<<~N_#Yqrj@TjNR_1X-gnmLO;L%hYS`dhtfU3393 zlLXLn2&vcxczi^iCw*dcDf?9yaIiRL=i3rsbXMeyvk8Fl0aQ4L!ippD1k8rs(Tk~m z&ZLJkMmvRz|E&07`bLapb>a>W!1?>Yy>)U;(w3uhbou%jA>>BnbPzxkGaWCTmH-5r zSxHku0EoTy1n2Gn-`~!~rJHTy!mWT<&4^7ySaN1c0jxK9A$^JjJZW?*-VVR5@lO%C zyV^up3+4oV>kT-rAfjoQELYIm?3$7@c=a=-$AbyJQUq`T{6i$am?uao3VTpW+~{u! zFgo-EoC5?jHXGv+L)h?zlKOfgCp3o2o$f>SdBa!A$^wkpA>f7~pc~ zpBzMGauAf&X|SKJu{SA5)w-5__}2hHan-JXt+U$J^nM7`>to^Kqo=)@> zj_6JyqZVyHJ6pE@%K$Jsx4|Kr68Z*wxd`NSVkEAJS)FOF|<=tRzmH?gU z{Y+b-iqvrC3)s<@6?H^turPx%cS%G+R5%f>l21<)K^VrLneA>{*OpitVl9n-f)#^71>(hU;mE~AKLRAZAtyfs zdQhSVBg7A2qVYoF1*4uI)ew~g+9sF)8cBil-%_@n9p@dh4N@^2csJXbd7t^J~ zjw#rFPI__bCWIK-pF4DJ7_+(S;|spt0`)FU$J~15iyWYx-$)nzo*AHfpV0zVs72TqMb(l6Ohq^pnm$9+OhuxuqcIL#HUE zBVnGz1+}J^=6+Om9eBHSkcYgKXFZEg(n2&or>qY9cI*nIda{)bB&-O!f*rnBkL!CS ztkp}H-&j!)z=(vwtw7B%%>F=AG+!vMeabVju(hfUJYcqrf05K8#0>PsQabH24|%U_ z6C=RE9(usbMdz0xstyzsaXSKWy6YfAuj!aKqDgq_d9$?)xJ(d(=LYV*R-MW)(*U=_ zy0}=Yz-jKafh@I~PK%l^@ph+xb+=4i&JaU4yU;%|!x+1-&Z}TS4OlM~+dv8HPs87p zR#B*LgFNJ=LJguxeqiE(`Zgwc&;kz!QLL4**K|qJVR4Q#3N&9?!#8JBK`==kUvGVo zej=THH0?o-dQKhjfQ{~0LQAP&6vc*v_vP>E-`PxVa6(_Z?`!SIPh1-~n^9YS#ZQEk zu?Dx##A&qMMdVg%&5eeP-sUXT?7M>iABZP~QI6hT>KrlIns4-HwG~RX- z{{#{2^72eX)XH;A%0aFUqaazsjt;N%j8;fL7>9zWFr9rCm)QMCbB6FxZZOk+l_VY| ju6})*qW37Z$5Qhf0!ZjFuoK~#00000NkvXXu0mjf$zeZi diff --git a/Habitica/res/drawable-mdpi/ic_header_gold.png b/Habitica/res/drawable-mdpi/ic_header_gold.png deleted file mode 100644 index 51acad3ffd8c87253a3b92e2fb9d31b2e6d9e2ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 716 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 buHHHWbZoKpwTi}T00000NkvXXu0mjfml*tW literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/shop_empty_hourglass.png b/Habitica/res/drawable-mdpi/shop_empty_hourglass.png new file mode 100644 index 0000000000000000000000000000000000000000..5c237be6b7861b1be27591d7cea52569f50b9703 GIT binary patch literal 1895 zcmV-t2blPYP)Px+AxT6*RA>e5T1#x3MG&6-<5%L?Nu1VAf!I#^fVL{75)}^#35jq4L=hkmLI@

1UIB|Lr6WAo?8hn6>3YP)^?IMX_MG-9)8=)H|y;0--+|6_wNa> zWbbQscD|k6nccC8x~aPY-4*DrKz9YYEAana0pT|EWO6nkM0J9sJPO{ANRs22BrGNM z3nBVQQh|hAl~OE|pd^v}*CM)Nd8`Ygqob2<%i{{bxw*Mup-}ozka$~4d8~6G#dUx` zJ1`LXHWG>CI_J|IX$&x#oO%V?`VlPmHQAb#py`aT#7FV?=&xp+2%E$(rIJ$%(Auz* z4Fn{g&r2SUhkAN?@WCcT8@GcNyHZlEUZ+~MM%8MS%H>L<-N6K;#dsnX#+Ztu`JRiO zdmgc2fD>FG;HO}JANl?M4OBZ<%cU}{t>vjuC@NyCK_Hb{3Zk;K^XRQ9i~%}X_XRhD zt5&L1ftKpE8rAF29#S3JW37e4{ltsH$>;YeEo*?P(St2qwG{Ygb^H9lior69D;sZ=ggZfSWdGUIk*fG`4iErl{5 z>y^ZT7z_=z-4>}_YS<1oLSqNwib~45O%1*>kr*u44ILJY0m3Av_1sR4_4Wqn_+v*Y zx^Iu}w(}~^V=lL%tm^R-N0i0o&RVSr5PatVvSbhHu;2nfkEY_G5^MGD zodx9|c>q}aofwNhzN^7I5E*Y#=5Kk#XV_9zF0&=gKoi=jbK7=_=~;6Ok`r4`5;Nf;$jvW-C9CElNDUq>?FjcK%ehZyY524HGtS!W!(N>z#jWU%f-Uya_w&^ z%gd|KT+_|L82lLw1|~*EM%MIrH*(hivM}tJ6N%B+k^ioRE947pwV21tK_`GaA0Lao z7>!0(b(>qcs{mOjfUA0>^|=<1&snXe?2m3zXHy#$Zj{3Mk{8D&aIxSzK$fi{>Q6gm zw5--?Hr8P{Tj-r*P0Ot_n{vbW^v(1e*puIBR$i}{HUi?lmPfIqFH))L_w^Vzb5{YT zZ%%(8g*XcVy(}cQ9Ssf**z)Grnva8l!H^9c+t`xz`p>D<)Wq)GYa-~!8rVtJRA6`|9E3EX=_rCTkrN`x4-42@3d?T5Q4s}C+8Rp8xKxX zICC|GCN?Gp#z9~G+L)edoK1Emfk40}2bs;+ZtS379yXLTuIKd!8bKz$r7UF|k5|5L z7V{+)J>yq~Gwy=$JcUC2bmZ7!#lq+JQn9%Hs(0|!{5#3b0TLzj#2g{x#Qts#pKKZsI{iFlvpLEmki_v$494$#i_Xx!uqp#~jqU=qHAKzT~!+wxIJ0)DP&bbl3Fy5l^cZznW^V(YpSIIKYm?(sc@FivmB zZ?}EMcTqhN1Q#MpH5NLYwDM-s&6~bD!ta=LJ`NmzX9fNLLcLlmD&|QJ< h3UpVXy8=cl@E;^}tx$q9hn)Zb002ovPDHLkV1nCQnp6M) literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/shop_empty_seasonal.png b/Habitica/res/drawable-mdpi/shop_empty_seasonal.png new file mode 100644 index 0000000000000000000000000000000000000000..642d79627d99d090bbb32af7640f6a3cb1a2e824 GIT binary patch literal 2472 zcmV;Z30L-sP)Px;Vo5|nRA>e5SzB*Z*A-spetdix&(y`4;JAPrL`xCKa+EqnAUBbsSfcRche%PC zm;Mev7P%}~4>1d$yOsidlVyYyS5+p+hy031weKMW|+s{v^$4Of3} z*K^we&dkiD`ue)ZG)=3)(B*U|W@av=Y6jczrL6!NT#xYd_edu*^}W;r2mGoUMS*QQ z`TqWX&0i}_Von=yZLn-xl9`#gZ3_2a$4QBjti>mq75sT>YKlXUh(T$-t4>CWlGY+6 z+c#kUVRCZP+mNb-4{ZTh4L}K^mHr*h=k);2ojYe`Gwv^-fH0sZmb0mV7UJWK)?$jH zND*t=1gxWkQBilobM@e`CB_WfKTo7QQ#E=;2wuZ$TP#lN0iOQt*`G4kJqjs8kb0io zvd~OuyfZBSyc$u7LfZ4m$G;nIHuu|(w^U;@AOHSHm2D{p0_vUI)uwJbBSk5=z2V^rWH$NhPF25cs`;2%O=OS5A(Njfv_t zmFJcLJay_%dnokY0b_&ozfFB`{L9KF&-OhZ zg?7pFbnbqdvgzwLKRb5pSSD^lP4SJJ@FHVpPM%47zW4KpBU&TnNHBkEFYl?JY%lTb4w4M5V>EGDKB3EDL> zEMovn433MJk)T|V?{Szkp_<4Q!d<~U)lg|Ly@L{|#7hBgIg_Qkx9^kS)}flx}*YIMoQSpvdjzc|CVgWYzt!`N!`?T#bv$*V-SV)l z<~EW8l=Ju5D|GwLefr|^HG07OK(}w*eZ-l!Pv|<(&*OLH%pgA}^@fPjg zHB8IdEFn&l14*fr+1blf$me8}0C`kaPd=BY#f1!|22wOMoR-}Wl1qWtfzYeERURS- zF~06SCC@J-t-M(OYyc=kunut3-O6*zQ>$x{)4SOO!vd8Uf!1;CL4P^Gpg=hWFf^2= zx5mdP%{6v$Axl>-U#EZ-mq_8>Nuxuf`&nVTWXA-TNT&y7ykEU?ld>GAA`}~zl}!0h z#d}Jk#P?Y^&(u;wlCkaH?AkMzy!ukX8$yfKaR%WKGjKI%aygr0ff17qW!P#+DAj}* zL_OQfR`)obkR740k&)eWEpvlr|9T0bC=*SZ6BxQF*W=8|gQKGdqz5%1sPdjqKm7}` zQB5ju09YtI;R#xUa1a#nx3IJ%696CZ=X!$;nfuFU5~8rU%)t*>boTlE08-jd)w2#@aW z5=zC^0QsJzG;`{#j1^?a>OM3*G$;Yy;;ffSrer3qr25Ly1?6R6aDevzcpuHrKO%!& z_2B41*{nm#!$;qg$^#H6sX}mf{C*oMdk?QH8Hk6ks(Cb65HAhGED6swi(ZiucDYtz z9Q`S@{*co<%EV5NDYzF1u?9ElS+7~cyLS?P;|M2{R#L@#LTW7bu>dtgE0RYhvKD(~ z4IzH;i}Plk`@#VS@4Wz0-=Kw4?3M{^8K)(7RCY$f>M)O zSk3N#e?}5RnLz{50D=La?rlYA-%QK!bxm923$Hxi)UDsEY_5t0sH)|2VWsujoc_(8 za3Vogl^|dVu4%9WYAk9bt_Zgx3Bc3^C%qzRN?r@O1Vn09DB+5#dMkVv`dk-_1?Vi% z$_l@MFilCeZY(f^klN?D5V{(~R+qKltMk#!)EIzeJX1)`BQ)SWVW?%7m$lr7A5Ju$ zkD3Y;|Dx&5_9v&#{t5z)jvXYyE(EPt;sHQB9xJ!O@r*Hwvn7sSs!q?8Ak6cf&kA{b z?_(L+wY8_KsJYEox8_Z(1;N^6*I08)22KUd$TrN7?{7R^GYWb{tAU|2fMQnf)>pXs zUc~{r+1l+IZwgS?jc2x{^qRWis=8X>|9`A1x|S`Ka53esoH%h}RZ;j~ARX#xpre6~ m209w(XrQBkjt0If4g41cRY&ZLZTL6<0000 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/shop_gem.png b/Habitica/res/drawable-mdpi/shop_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..4369e09dc754274e6630f234e84947d44b2699cc GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%zPkOpIhEy=V zonh<8Y$)I+?&5fuRp>>=3&9CplM7ls3Irw;vHCf&I=;-j#F)9D(L`k8kB{%vw+Q#T z=v4PUSUU4YcD37i{d;#qMCCag7?=ba7+4e-7%`X*DveuDRBHR)-e*%CpV?&mbXc-KGvSW`)ha4ICJ3~e|2-hi!G8bWauf<=Bw}Lgt9%(89Q&)Nb2w~*(mHhC3u;P{EN3+ z>&ho;s-6w#l~58=G!RBeg3> pGgiE9%00$U&bUMOzPx)-AP12RA>e5SKVt|MHD|X_wHws-KL3Yo2I4F#wer)n-rgf(ubDTmp%!KFCrL3 zVw;!xKj?#mKKNAi%?ClPVnBqTD1x-9R*UVXvC^jbFeIC7_AC2w?|9DKy&t)oyL&fX z3WXg=?wK>^{LaUmIWr5;8m$bpGSJFED+8?zJi!@YjrxA_-%rC2*HYI2#89KUwdL8Z zzOML*AN$|jsx7yDm2aQcpDnCye9(O7$*veOu4+PqwKinz*i1r$(LLT&N z9zfR(5loP@<)z@_`wC#-#^g8%ah7yx%g*dM3PGkoR0+D^jOoE(2OJLXvDSzt-cBP^ z$|E#@mUWz6v?Xosq~PM!4dD5klS4umcyNs|+I|oYRGf*q0-)dyg<{Ybiksrrmw1PQ zF_{31iA1i5*~cMD8tD0gq~#oKl5LCOLDUR@T4t#vK1cX4>F>jueyO9+f{Lq>E$8I? zVRW(=o%9;L7#zts4_>ZVw8Zs%5ky(5%!RZ~K3D=f5H$mEw#)$IaHewrjoao`EF za1@^D+;1})pyE6TQT%g{^y46e_OOq{S8Hs#p|6_vfAm&7l)3*9813JTB) zTUeu&c2~hzFXo`TEe;{I+7a7KHASU&B(fJ5w&!rYoQL0Xiy;5=snT zOmMEAMS!%_VGNY^2ms%15O)b4rdM6C^{4xSbT@3r%4kLSI(Zwm^s-?RZIch=ix;A2 z0HlyOK7O4u^*m$DC`!&j>4*Sx1+kJ&K~XDt*{I@E_Iq6izJN|&Mdv998f24flMht@ z4o1xYNG>rlK8>B{HH4J?jVTIn+6hPUa1&r*bIk!;o1`a(vzwKL4&Nm2KoZNx7)&FZ zWV<#J7DPP(TAv-c@D*_JwkgY0#V99}f#2oKI+XPKyCAb4vTtR9H8{0C3(KX9jfS?Q zO`GFM`3iuv=Z;T&g4=q@L}CGTTM*Q`7t={|+4I{Kh+@`kvp;P71NRFXmOR-YTNa}Z zVI$QMq~*IK7eB!?zHPzjG__YkFSN^pCIz(_%D0>?(jS z*sGd|@z=4HSY1K}fhASebXde7+=FVL-cI+nk}#dRXD=fLVG*Xy^iS<70D_+zc(0(e z#m-|8MxVw4=52UKV24^xB|*p5Xbvn7`3hYuZo>B)b9DC^19b_5uuN8?-(3elh7!-c zmF6Ofw>7&X4dWrDi>{0p9ko?+>3C>CzGAPg-G-ulHs(o(ba&&lQ|FNbAh27<-ks;5o{>Bw$r#B1Idym5I{*UQsbt8UPs{oVk2T2W?6SVc&4%JUz}pIp^nn(?|eKDIupp_v6o4^Zz(= zV)>z)9sn6N9)Dn8OdQ7iKF<6&{n%s%W+pGu-(xe_GStdID+8?zv@+1jz>}7N{{gN# V=TBlvoc90#002ovPDHLkV1nVQ^1}cC literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/currency_gold.png b/Habitica/res/drawable-xhdpi/currency_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..b0dbf9f36b36058b471e63d1fd4e582d70997699 GIT binary patch literal 1720 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/ic_header_gem.png b/Habitica/res/drawable-xhdpi/ic_header_gem.png deleted file mode 100644 index a26ea8f65fa3b371fb5655f98a1340cc4c069b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1478 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 O0000eo% diff --git a/Habitica/res/drawable-xhdpi/ic_header_silver.png b/Habitica/res/drawable-xhdpi/ic_header_silver.png deleted file mode 100644 index 05d3977eaa79fcf2ccce8afbd7d18441bc8b7fbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1368 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 XE4z-#S?`ad00000NkvXXu0mjf|00oX literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/item_locked_bubble.png b/Habitica/res/drawable-xhdpi/item_locked_bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..26d1257bac0dec91872715fde645b79681cb9650 GIT binary patch literal 2364 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/shop_empty_hourglass.png b/Habitica/res/drawable-xhdpi/shop_empty_hourglass.png new file mode 100644 index 0000000000000000000000000000000000000000..7bf778f1778e0fdf4638967e76065bdff8dcb844 GIT binary patch literal 3877 zcmbW4_dnEuAICrT9$6V78ulI8mr+It7tV#VSH^Mn$_y2yBpGpMMdsO@(Q!mpNI03< zd(R8$>-#5szpvNh{eJ!Ye*f@(Jm2v~P#q?EUU~oknDlhDOfJ*=zeP)Z*}u&m>R$$# zpNWnJP(E;N4FH&b>uKFL4JO;Nw)C*l;mI0*jc>7480fT^-1w|F6{-(2nJ_ANqvfT0 zomJ|?Ln{G5i1QVzijd7L9ho>A?J2oNL5VmVF38FvRa-R@Luj0m_a^9F z;bw}(o>*F1>U%oX1>A>1p})noj@6QCm@PGC7_U>O+aT>@c6cgP#VO_k zgrX~$n2uVRc4g}#px8g7R;+cdc6UCi*g1E)QodYD@$GFXoAJVL}*4AQAuA z?Jrh*M*>KWU+nU2KUHY@(p>)#SW=;xJ~Z|pQookKazRaa(pOvqcMc<)UE3Qz8*^G- z0k&tbPxsujVo=AJ9NI8vyWm-@`})|Yw<|zi^B0-Ss*6`?8%13V#0-&InHw=g%}Z5` zWCY2dYmAzfIAg4cr*tGZlR<tcK9Da>MR>QBMjzGpOv|yz@0eK2uL95KddLg*w$( zoXvoY<|1b~*p&AeOebOXqfHzqRum#^J+T6MENS5@JaY3#{wpQrOOa@&EyLa+-Zjp-o8ojBSfQhd`5EggvPX z6g1baT}3Ya*P!m~;TTD3+?r^zAnqy9HR7#gmN+x9~rCvX1?)0QVRo}zD#?aJ%kCwMQzfc2 zH{JD!5gk;g=vRFS?#TW}!iAY=TJtgAg9<9>OL-;t_u6#B*rd z{R4tf85LIti`#$i$OPIsRVN87u8Z%I-;&bNdad{j|yt!yLF*%_z?pKSG3E0YZ19X6kE zxU{73!5$i**H2u`=}zY~y2eUTZsnV0IXi`BGZkL6z}3wsB*x`d93*HapgHg~=ip8I zDTXZW6qIMG>7H(Tibay7IVBQgcS?SaVfuULd^COB7eM}zic@mJs}aLj_=yY*W}*0H z-5RB^MbuDhbHm2>19Qt^Wn4jZ|DUIpAxD>^>dg${y&)K)GiL#=_CZHCQ>Zrg5ItxA zVAY1z;9UC2tj-R*YC2)Vm6MrbS_MWe>6saDzMitJ9A!dXC+qrvQapEg`AOBkCghyv zw31o=F}A#XqAV}m*k|z~bdx)eZ-;Ztg=WUTv^gati-J3G=R%}by7;NvivaF0Y%Jmm zZ(a&QHzX#`aT%}k5RA)R9vc26eE6$a_vU%E_~2`~L9$v~1OmKfbMdpFuSwDqBC?}5UVL6O4~ro8!W*WvIP>?3d`tEsJS*TYsy{kH(Nc|8i}8H_^TcJP&QUPx zt}=&U1KC)w!2&|Tq^(bpx4Zti_ADLFi!`-Kl@uty!|7%IfK6l*HJe10Dyg=nxcdua zOUB)N`xs0KWI22_)jEhkZAT*&3rki~zx|op{EmKnV1AW=SCZp6!}1AM?1wpaEK&jQ z+S%C)FDPS{?bHkdme6mBYfs|dlJiPI5*b2aP%f|d zQlJg8VS!6qey8w@|)gYgRpeDRa?KGOk?)9S$+{e_wFi zbVaf9I+SFtqPBY%=Nr*|AQi!@RO z+D}VV)3Sd*Y$E}&qPe+Wcd?%Rg0Zf@iF5;=`&(rTR#4+~7Eg5^Mk;2Fvq;Xpq$fA1QF?@MTu zkPe3pe83aOe!T5~_Ed4_2H4|^EvxGO@IkK7R9WIUe3p2>K>}pN)RT45^HVjsMM3}? zjaG@pJAfUj_#WAc3!|DrE*3%(cN$8CgPo#H%)x{=Cv@-@+u<;l>*RP_g7C5W_3tBv z><&oFQc$VrG*R}Lx@ueoGa$RGfY2ot@ z+UpLTQEe;9E_U{|U_C68UxK;9#HEodovlwnZvu`v!RZ7aKMlUc* zjVlgfCpWaqGG*|=8e<^vaJVe>ZMMf+uNFfA>2fyOW<%7vX$Y(+L?kyPp|aUHREO^v zx;eU^uB^TiI7PhNyOSXQ25Ruvy2@|YoDYR9MHGn|xl2Xli9<(@I$aN=bp))UWu9&} zgnwq-VTgZV9FLvE&{~GqRK68dJ0rj6Y6LtvONKmKOlY+vtt+ zzk}@}qpe1}v8iWEB!~uItDLMX?5O7zq$N}Dgepo&_R!uS_oT!o*1B+=lI|PuJ938- z>Ru9tk-}x-X|V9EXRE6oK{W==AaH?Ng?piyTMNLt;;3H24#;cBuLV)mTK9s$T?5pZ?&{yux;J z7rXWhFZ$kG-t+wdt@-l-6_$#MED9y%kWrRS)uba z@Qyu1?}xyWPbILy%fsGL6;0z0=5`Zf{)<*uEJY8l1xsV5Z<*y`z3Oag3hB8d->dWw zd|y$wY4jb$r}}DygW~Ho{@(d=0@B@hJpD{}>R|gOt}%;=O-}C3U*_YzWb@Sy)cXT1 z&Y{w;-C8bYpG7mF6mRjAt#SDQmc|)6bTbs9WgGAvC>f;r5h@&{LW&}IgU_7(W4zmn zpJN>^TIC?s$`~UaJxPt7gx=mx#}v=N5Yy@EOMaMBMBA8^2_3>9Vy#!B5uMIQ=;1~w zQ(vOl^susbSDU4&g|t&NVDxeHIrtH)ZRI}kj=06h?IAya%qDRij-KecGeXVF&qyKG ztiX9AO>W?in*VCl>Za*ne?W#_Dhvj*Zs1_a0u7exq_O~}|DI4rQnc%>ah&Y;BfI2W zLPk|%2>gJ@?+c{XdB%Nsl7w3c*jP=rf$QcvHQ~!Wv{_0ThMI=#$FG}EF0<`%LzBMK zK#v-h9zVY{>tfS+%?YMywgBYEEgB}tv+!VI9|-NK;D;Jelg-qLtF-L@F%es*`y=LA zPWU_J8!Q+MhO`z99U{&kj%9hVcA8|mb3YG%kGD==Am!}GKH)nl3{|rnf{BLY)P$z^ zKqNOGfO{|y5cb(@SkG-PVdYeUf)+r;23?#Hz;*RS%dJ=1x zII!-HDEmA%TdqHzy7h$Q3AYvmMEBTHr{OGz4L@u@+LE_9vz#|xLy0i#$xd0<8uU@6 zUcjJtxrYXKHVYOqZPR_}U<516P}lOQ{Uga0<*4-ZR`QQ(kGJ(ren9N~Q2nh(ei{`` zH5eX5kD1 zS$s0T($u`-+a{gwMF@gx5wFuqXjlR>jdlusHi<_{oep0F28&*-j7EIUn2;}z8Fl+R zUUn3qmDa*YJUkAC{%GKMYjF{vbdBUA$;Ef@<^Ef05rB)Eq8 z^99?$Ca1Cj_uvR?!I%CmaFuIn;2gv*^R!S_?rKYyQx)F+%si{8%%aJTdeQj`qv5Om zbCSLfel|{&))(kHUN;t_(5Z@=e-o^7e7ngYKomDYGg_RrLuQIsBqU#wstmX24N}7+ z#2xn@tGng=-AG*i=DUXd1gAwXMgFZ{Iep!>?H7~IjOSM+d6eGTdvd%SH~h7bxqkn4 izb@hbbPj^<{A%5p`H-Q+24O5ke2S0mhNsO@Be%I z9`CsiGjq;7&b<8~n(9ipIPY)(001snSzi0Ubp3yNh54WNtzD`97bqUuO0s~eF{*t4 zfD9KbFQe;&a%>jpO>E%TahXRx3}X`QGv}$At9X4KGF2lA7Cl-QbQ@maM3<%OWuXHv zNj}-UtZHBa`T%Vk#{xu)Mu<=no=kPUu=-c*F&@9_hp->j;Xrs_Ar7O z#OxT60+h4-k9n$~f@ z`r}+LPj`PD%S&9gOTUeYs^!HQWEAG;L`G4KzBS`|+R39=WXgyx@HI9MOEkY^iu}o; zBN^xWFcG_v<8*vBQ)A>@qsc$G(IPkgS#(gKLyzW22XQ|K*c~ar)6sToal;*T-KvJH zQynh%r$C7LQpchcJv%?nw!JX?X;5wEVmh0r?8j6aq#{n^x4R(@9<^xCh9RD| z`difnC`*qp8Dcs|gLe!dDOQgFvt-eZ`sQcJ~rP&tZn+-R|& z`sSZuI2W}I)6e~Z&jM71ZCKM|Y?rpuNdL=!AG4i4s5##jzOZ~5VawF>jg&dd|9tj| zyr<=XD^Y%!MdP`By6&WpX;7_1EjEKJI^HbKt5x3xP22 z?JpxQ0p6b_9~15!s$Q)AP9q%m#l5mBXPbNXk&_A^^S7HSkce?@rO4Tf^eb1z_N9tY z{^BHsI5OxZwz~JhkFAk0_|?oMv;P?Np;k^6`nPSSKbIG4vx|(0r`K$5{)fBZ}9*{4&Gou@$B_TY6eN=|A-!}sw7I{!Pf+UM0wxnxO-UqX(hl9Do#bO&A-GTOsIgcY7An5sWI?Mj@q-qFcCR`YY_dNY=JjAczNA}%< zyiaa_rA}&=KS8wz{BBj@0u(d-*jD4);r`&dY*Ty2m*nRYpCOE-}o~Pz#ksn{_XQ z=L71eTyu@vAetR9c|bS=;Z%(kYE)+)0|*hM)0RgZT6GYo-cT<^OZ|ORmkDV3$?};eeOxecJ-a zy8jK>tSq)S8y~Afw@nKm4Y&KkOZS7Z4U_4V zZ@x;BDeE0k97A!9Uqgpi-&JoHC(_z1V_M)wa#O6Z#II-zUhJoRMzWw-xLcX8byN#zbDz*Q(6lkR-Go2OXcxjsD*U+|u|W6vL}Eu@*Et zTJwq7?|F4iRtGCd3i~sc#(Ts2q8EE_Re^K9#D<{P2>uyLM@?{Bc(f(ytjTvs`FYjr z_g(n&vTATg`wiRcON+%s|TU^BZBm2YZty|Qx}FT zy{kje<2MtqNad1lOcdS(ny5U3oj#5kj{1;SmQmYl5MiuN+Y4Z=rRGEKM?>m=rgS1N z*F@Jb9m)B5Vw(ps1wUrq6ckT|nKTnhEW;V%0T~%QtHcW#7d$S7WkhdrK8}urs{6L= z5Ztac;nqotxW9FbtJ<>jApa%m?f7IaTd<)}$CvEOxmUjJ|o*X-t{ylE*%eYI0kmTB|P-OhHp@4BL~qjBZmAO6iBMMPj= zOvGktx;>g6Zc?J>R~DLb2=IE?8Sia+9~rs8Pk#9m;^D{89U_Q(9S*;`wOO0{2kZhy zZ2lilt%;7vQiqb(B|W#1?Te!$rQK9TKq%7LKlJ))<_5f0Pbat$YBljUw&VHIJ6BQi zlcPf(S837O7C&sXs%&o9NfCIM%`40V>y*p(jZ19fXZeC26Cn#p2aw@JaFmQpb6%F> zU@5295OuK~y0sC&Ta>?)H{2BM#?^=c%@Ppk^Cedf`!XYsUFG(?zVOy3?-}fM1kH`HUxb z%yyI;4WcBaZ*%&icX?{lmKu+pG4Jo^VKj5)LHLV-a&tEHlN*?A=agRhlf8KETN7Ci zcdZ;0To+8)m%@`Aa@c+Xv(zS$K(iuKa!^{kyZoFefIi8UD}!fx-(9cS6!uZTSA08S zE|Wp4ShZLb79!%SC({}z5F5EtWtwK&_{olXjz(3NA^*4I$^?{y)aUt8f!wF5W3SN0 z8z39)N5Ni^7pXhoz)sd&yKY!ftzY#z=gR^gu3I@QO2hpcovPdZ{yfOo#%&wqu234Ja5X&to^uc^N@4gKJw zpLYbn2*~faiZ_*_p0W~_yWZgV*%i7{pY1tBK_my?;r zG@R4gSUqf&c%TJmptLxf`<*u?K#3kjVCAk}&*KvJ8Gx7h(7H&(ily586B=6JP1JL% zWp?clzgSC`KH~6~;^#UT%6Iubzk}UkE3E(a-6?|V6RHSefuht;Ig(QIDeygeu+`MB zm`cPGN1^ib>=F9;JmyV3@WuP@D{5C8n(<8gkf|dQY@)#HMckB@C@+Ob$cY3O)z4^D zpU-Gm>E)ul?}A-1#|cU@6_uxipLQK05b+VnhUs1oR&On`N zo!@{^bh7?QEU4C4+kTqN251&j_6RMX5uY`ZtAv7F*hvn)>uAvTAzw!Ik@nN9ORXOn zmXrlx#JZHaL?!&<7HOlY?cWlg;*lF}1U~Pf376SsuD(_F+Tj5Wltu~1OO3U~_HSW|DUuy;SCm6sK>f5)#=(!w=d(E(2%l0Z9 zGX!(}+4fhX^veR|kwW){z}Y9Z_xowi@kwsR;=F6xZZ$F~JQi+$-hCRdHw5zAE}@Fx z)`-*kv}V$3<;kN(cIBc73klhvp$Maz2BUj^nd&oAXXUaJK(+Ts$jyUW1IfgqnmKO6LqVSX$jlp`kWYmmfF}^D|g&B>l|o!lsbn_u&T#Via6YPHmVVz+3-> zC8=cO2T>^8rmF>Do%4kiU|*cwHVtD09MCf5Q!33f`9PV{v$8+kg&By}cm?a;`~9L;k0!=?y1uy) ziJrTGQ&~;xf^spO>h=QyYGNeYcugWHhsz)tm=E$XLGlxm6_$H&DT)Xr9FU|(AvS}; zi|;R^R;KcC9g*?5x$a$=--rG0Z^@ezc0*N2qHeozIB~93<50N=y{@698rFqA2cslYnt(&l&&*(<>ShDKs z=o%@Yk0Y0>$$Gd)WKl+aAja3E$*(r|!{cDzOB|Ui$)72&H*i=+U8|Rs=>JqJf$$ya zS%U1dBCP3z6vu{O#li@_x9Pc)DC2rslJ1>M<$j_Du11grum6 zJO0%7d*~aMJ8SRNL`9N~y3jPBiFC^8zltiu<-tE>DX8M5ufv|pwqBM1(+K-QXgFLD%UZhYBCCUcK)tgo{rlLUHp><{Z2UB@MlKHj#Ems8 zhECJ@nZJJx&H!!=~5zaPcMT zQC7A5?dxxP5A1Qm(C~}P4b!uP9hHeNOXkqJXl`87vf(;>>H8k;&FoVb|AbVzH>4N2 zB}(cf0L%dh0n^q&1Ne^ul1I*bm!wog9m=TAK>3Gni&I7i=&~5}NENFb0=dDurJ!8u zbGGyh*-(y2zysjj#H+%6B!`qSqV_w7F3p1sB8b#(klg>hlLCW%j#FH~l(9b0(vbH3 z$b>~8Kw)1=({;X1hjNPL1whX^Bf`mkvgT~Entt{0yZN=3_!d3OUulPwf6`6P1bm+$ zIs8EB_INV}FbRUb23TWtDE#KKXpHd2-}ZOp<||Pa{iaSKln&g$@ydvl0TbUOkTE$Y zRiUBgZY?beJ!bXx$xxx8!DRC8!RG`<=9?`tmgDagI4sYo1(!=7rH2zS_*NsXe|xdV zG;S-Y1sB5u9%43YnADW3%ch4$~f0L4I{d_J{cN{M$d1 z%jQOV`G72}X|KXF{3FV4h(5DcvP~w26)y5mlO&olkD1*do*1ATQPH1-lKxZ^CQ$zc z7xgo}Yl)n!Z=^n^`~lb!GFW5b3`s_{J(ocJ_aRBg?1OE`3Wo&2-#emj`dogPP^lU; zje=C?oY2oYWjE?9YYW%fY8Y|QuzqT^5@8?rWB~`0oMLSI3JD4!-2= zf}m4?%1uiS1N#Z>uba(oymfp&>KpZ;f~hsmyR997K2!bFJ;T_RJI>WNt-$6Cv5q0F zYMq9FE-1UTj8&oKKaP{iaIS8(%dTH3z>?B{m7gMd-bRB0!9}Gb(T&$F_DZdNJaaq2 zsYLZAQ@4&^EY|scf>=B}RK!?WO{>#x{Lt=-;6Fq|SmNX{tj$sjhANX1^8R>cVJLq= z5LsZU(fAHy*I3!s4r%gCoBx`d^(OZ9a4a5 zj0;nC8cfH|rFi|V*IN>8_42+K08%nJoxar>oT?IqKXPkWN(}sV@Oz4T5k$A7&9O^y z-zLGQ0f1v>mEVE!XWlVlDEaG!&BZgG>#nLu{gThVE1wIJ1Mn-za_)itD6?w0(BeNx zXoo0VD+-sOCsb|>aIQ5ibBEf+5;{bvfP})z((`NBZP*-T8n%2TU5d6MVSXpgyHn;; z_tONyGT^SdDcT^YBJkhEq5h*Xp6uif$uVw0zrHt;njQ5=8$SnFSsz`F&J0#T)m8@2 zr9QDA#2ipzGc!Jz*6_AFqYlNQmXia#yMJ=I2%HFsn&a8+qWkovTtWoL@D&-4VMrY= z^xZ^Q2neQ`bJ{YfBX!@?jY?{pX6PTODulV)|EhOugp9js82D6c zVY6fCnPo?1a?zT7>xIp{u z<^gnV5pPCSe$CHQf~IUXRut~*y&}9?cm@*E^G;2d0FzrrK2`zaDj8j5!PPRPQH13( zA0bl8dlh8SE}MdfkTvUR6D39767I<$A!x0dO-Sa6u4eMiPKx1uX9#t)x#^KzOmXsq z8{^<1tv$#4<+oU%>N&`96V{Kx;OD(*VS9*#>EOhU_|MoG0W7#LD@~?Ikrx;64Q=WN z{D)&>d`C2Sd!ViJXOlB)O+D>bGHbovgo}tz8g8l{mFkZkaFGe#U?@qlgve2Rm+)(x zNOCliHJdg9RdvIL&o@EQoBQBL#s3pU{r|yhNRivx3yQ_0(xEkM`Q|@L3;-*r%U8)- GhW-yvwgi^| literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/shop_gem.png b/Habitica/res/drawable-xhdpi/shop_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..765664867a179c2b2a1cec5f3a0008a8c0adc484 GIT binary patch literal 15551 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 D-?5XA literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/ic_header_gem.png b/Habitica/res/drawable-xxhdpi/ic_header_gem.png deleted file mode 100644 index 4e35b4fdae001af92f7179b89ae694b7db3b9a92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2275 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 diff --git a/Habitica/res/drawable-xxhdpi/ic_header_silver.png b/Habitica/res/drawable-xxhdpi/ic_header_silver.png deleted file mode 100644 index eb926b3007892cb332fec1a1687dc8a515bd32b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2032 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/item_pinned.png b/Habitica/res/drawable-xxhdpi/item_pinned.png new file mode 100644 index 0000000000000000000000000000000000000000..45293844fc441ba6f69835bd324b31af01fbe0cd GIT binary patch literal 1512 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml index b4fe424a1..d6f0b7a0c 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml index c32e8aa68..6c00ea846 100644 --- a/Habitica/res/layout/activity_challenge_detail.xml +++ b/Habitica/res/layout/activity_challenge_detail.xml @@ -132,7 +132,7 @@ + android:src="@drawable/currency_gem" /> - - - - - - - - + android:layout_height="wrap_content" /> diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml index 066c173b0..974b1d421 100644 --- a/Habitica/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -46,7 +46,33 @@ android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar" app:layout_collapseMode="pin" - app:popupTheme="@style/Theme.AppCompat.Light" /> + app:popupTheme="@style/Theme.AppCompat.Light"> + + + + + + + + - - - - - - - + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml index 2efee0584..d27ea447f 100644 --- a/Habitica/res/layout/challenge_item.xml +++ b/Habitica/res/layout/challenge_item.xml @@ -30,7 +30,7 @@ + android:src="@drawable/currency_gem" /> diff --git a/Habitica/res/layout/currency_view.xml b/Habitica/res/layout/currency_view.xml new file mode 100644 index 000000000..6cc13ae1a --- /dev/null +++ b/Habitica/res/layout/currency_view.xml @@ -0,0 +1,36 @@ + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml index eed88b277..a24e12d6d 100644 --- a/Habitica/res/layout/dialog_challenge_detail_reward.xml +++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml @@ -21,7 +21,7 @@ android:layout_marginRight="15.5dp" android:layout_marginStart="14.5dp" android:layout_marginTop="18dp" - android:src="@drawable/ic_header_gold" + android:src="@drawable/currency_gold" /> diff --git a/Habitica/res/layout/dialog_purchase_customization.xml b/Habitica/res/layout/dialog_purchase_customization.xml index 8fafb9f44..c4942f3c3 100644 --- a/Habitica/res/layout/dialog_purchase_customization.xml +++ b/Habitica/res/layout/dialog_purchase_customization.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/imageButton" - android:src="@drawable/ic_header_gem" + android:src="@drawable/currency_gem" android:layout_gravity="center"/> diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml index ef600484a..1eef36f44 100644 --- a/Habitica/res/layout/fragment_welcome.xml +++ b/Habitica/res/layout/fragment_welcome.xml @@ -32,7 +32,7 @@ android:layout_marginLeft="8dp"/> - + tools:src="@drawable/currency_gold"/> - + + + + diff --git a/Habitica/res/layout/widget_avatar_stats.xml b/Habitica/res/layout/widget_avatar_stats.xml index d5cb57b3b..c6622d3af 100644 --- a/Habitica/res/layout/widget_avatar_stats.xml +++ b/Habitica/res/layout/widget_avatar_stats.xml @@ -217,46 +217,33 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical"> - + - diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index 49fdde7ee..be1bac370 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -50,6 +50,8 @@ #edecee #f9f9f9 + #4cedecee + #D9D9D9 #989898 diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 0ae55b9db..74c4abefa 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -624,4 +624,7 @@ Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner. Loading... Reloading Content + k + m + b diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index d9716ca14..fe0178285 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -392,4 +392,11 @@ + + \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java new file mode 100644 index 000000000..c78bbe3a7 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java @@ -0,0 +1,38 @@ +package com.habitrpg.android.habitica.helpers; + +import android.content.Context; + +import com.habitrpg.android.habitica.R; + +import java.text.DecimalFormat; + +public class NumberAbbreviator { + + public static String abbreviate(Context context, double number) { + int counter = 0; + while (number >= 1000) { + counter++; + number = number / 1000; + } + + DecimalFormat formatter = new DecimalFormat("###.##"+abbreviationForCounter(context, counter)); + return formatter.format(number); + } + + + private static String abbreviationForCounter(Context context, int counter) { + switch (counter) { + case 0: + return ""; + case 1: + return context.getString(R.string.thousand_abbrev); + case 2: + return context.getString(R.string.million_abbrev); + case 3: + return context.getString(R.string.billion_abbrev); + default: + return ""; + } + } + +} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java index 0f81b38a2..61683632e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java @@ -30,4 +30,6 @@ public interface Avatar { Flags getFlags(); Integer getGemCount(); + + Integer getHourglassCount(); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java index 4da14e3e5..081fd80df 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java @@ -148,6 +148,11 @@ public class Member extends RealmObject implements Avatar { return 0; } + @Override + public Integer getHourglassCount() { + return 0; + } + public void setFlags(Flags flags) { this.flags = flags; if (flags != null && id != null) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java index f8ea02887..39d150f6c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java @@ -15,7 +15,8 @@ public class ShopItem { @SerializedName("class") public String imageName; public Integer value; - public Boolean locked; + public boolean locked; + public boolean limited; public String currency; public String purchaseType; public String categoryIdentifier; @@ -79,9 +80,6 @@ public class ShopItem { } public Boolean getLocked() { - if (locked == null) { - return false; - } return locked; } @@ -138,4 +136,8 @@ public class ShopItem { return false; } } + + public boolean isLimited() { + return limited; + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java index 016d37e15..a3df3499c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java @@ -191,6 +191,14 @@ public class User extends RealmObject implements Avatar { return (int)(this.balance * 4); } + @Override + public Integer getHourglassCount() { + if (getPurchased() != null) { + return getPurchased().getPlan().consecutive.getTrinkets(); + } + return 0; + } + public void setBalance(double balance) { this.balance = balance; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java index 6a57f1ad0..90fcdef8f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java @@ -16,6 +16,7 @@ import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand; import com.habitrpg.android.habitica.models.Avatar; import com.habitrpg.android.habitica.models.user.Stats; import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; +import com.habitrpg.android.habitica.ui.views.CurrencyView; import com.habitrpg.android.habitica.ui.views.ValueBar; import org.greenrobot.eventbus.EventBus; @@ -25,8 +26,9 @@ import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; -public class AvatarWithBarsViewModel implements View.OnClickListener { +public class AvatarWithBarsViewModel { @BindView(R.id.hpBar) ValueBar hpBar; @BindView(R.id.xpBar) @@ -42,12 +44,8 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { @BindView(R.id.lvl_tv) TextView lvlText; - @BindView(R.id.gold_tv) - TextView goldText; - @BindView(R.id.silver_tv) - TextView silverText; - @BindView(R.id.gems_tv) - TextView gemsText; + @BindView(R.id.currencyView) + CurrencyView currencyView; private Avatar userObject; @@ -68,12 +66,6 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { setHpBarData(0, 50); setXpBarData(0, 1); setMpBarData(0, 1); - - gemsText.setClickable(true); - gemsText.setOnClickListener(this); - - avatarView.setClickable(true); - avatarView.setOnClickListener(this); } @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) @@ -83,8 +75,6 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { Stats stats = user.getStats(); String userClass = ""; - int gp = (stats.getGp().intValue()); - int sp = (int) ((stats.getGp() - gp) * 100); avatarView.setAvatar(user); @@ -128,11 +118,9 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { setXpBarData(stats.getExp().floatValue(), stats.getToNextLevel()); setMpBarData(stats.getMp().floatValue(), stats.getMaxMP()); - goldText.setText(String.valueOf(gp)); - silverText.setText(String.valueOf(sp)); - - Integer gems = user.getGemCount(); - gemsText.setText(String.valueOf(gems)); + currencyView.setHourglasses(user.getHourglassCount()); + currencyView.setGold(stats.getGp()); + currencyView.setGems(user.getGemCount()); } private void setHpBarData(float value, int valueMax) { @@ -166,25 +154,19 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { public void onEvent(BoughtGemsEvent gemsEvent) { Integer gems = userObject.getGemCount(); gems += gemsEvent.NewGemsToAdd; - gemsText.setText(String.valueOf(gems)); + currencyView.setGems(gems); } - @Override - public void onClick(View view) { - if (view == gemsText) { - // Gems Clicked - - EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand()); - } else { - // Avatar overview - OpenMenuItemCommand event = new OpenMenuItemCommand(); - event.identifier = MainDrawerBuilder.SIDEBAR_AVATAR; - EventBus.getDefault().post(event); - } + @OnClick(R.id.gemTextView) + public void gemTextClicked() { + EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand()); } - public void hideGems() { - gemsText.setVisibility(View.GONE); + @OnClick(R.id.avatarView) + public void avatarViewClicked() { + OpenMenuItemCommand event = new OpenMenuItemCommand(); + event.identifier = MainDrawerBuilder.SIDEBAR_AVATAR; + EventBus.getDefault().post(event); } public void valueBarLabelsToBlack() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java index 03c90d023..1a92c4087 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java @@ -92,10 +92,10 @@ public class ItemDetailDialog extends AlertDialog { public void setCurrency(String currency) { switch (currency) { case "gold": - currencyImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_header_gold)); + currencyImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.currency_gold)); break; case "gems": - currencyImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_header_gem)); + currencyImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.currency_gem)); break; default: currencyImageView.setImageDrawable(null); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java index 15230f25c..8cd819bed 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java @@ -142,7 +142,6 @@ public class FullProfileActivity extends BaseActivity { socialRepository.getMember(this.userId).subscribe(this::updateView, RxErrorHandler.handleEmptyError()); avatarWithBars = new AvatarWithBarsViewModel(this, avatar_with_bars); - avatarWithBars.hideGems(); avatarWithBars.valueBarLabelsToBlack(); avatar_with_bars.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent)); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 62721ff99..94e2b4d3f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -32,6 +32,7 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout; +import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.habitrpg.android.habitica.HabiticaApplication; @@ -153,6 +154,10 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria AppBarLayout appBar; @BindView(R.id.toolbar) Toolbar toolbar; + @BindView(R.id.toolbar_accessory_container) + FrameLayout toolbarAccessoryContainer; + @BindView(R.id.toolbar_title) + TextView toolbarTitleTextView; @BindView(R.id.collapsing_toolbar) CollapsingToolbarLayout collapsingToolbar; @BindView(R.id.detail_tabs) @@ -346,6 +351,7 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria fragment.setUser(user); fragment.setActivity(this); fragment.setTabLayout(detail_tabs); + fragment.setToolbarAccessoryContainer(toolbarAccessoryContainer); fragment.setCollapsingToolbar(collapsingToolbar); fragment.setBottomNavigation(bottomNavigation); fragment.setFloatingMenuWrapper(floatingMenuWrapper); @@ -505,9 +511,9 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria return; } if (fragment != null && fragment.customTitle() != null) { - getSupportActionBar().setTitle(fragment.customTitle()); + toolbarTitleTextView.setText(fragment.customTitle()); } else if (user != null && user.getProfile() != null) { - getSupportActionBar().setTitle(user.getProfile().getName()); + toolbarTitleTextView.setText(user.getProfile().getName()); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java index c1745ff39..a0150d1f2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java @@ -127,6 +127,12 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter 0) { + hourglassTextView.setVisibility(View.VISIBLE); + } else { + hourglassTextView.setVisibility(View.GONE); + } + } +} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java index 2096ff859..5d7868a46 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java @@ -13,6 +13,7 @@ import android.widget.RemoteViews; import com.habitrpg.android.habitica.HabiticaBaseApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.data.UserRepository; +import com.habitrpg.android.habitica.helpers.NumberAbbreviator; import com.habitrpg.android.habitica.helpers.RxErrorHandler; import com.habitrpg.android.habitica.models.user.User; import com.habitrpg.android.habitica.models.user.Stats; @@ -95,11 +96,15 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider { remoteViews.setProgressBar(R.id.mp_bar, stats.getMaxMP(), stats.getMp().intValue(), false); remoteViews.setViewVisibility(R.id.mp_wrapper, (stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE); - int gp = (stats.getGp().intValue()); - int sp = (int) ((stats.getGp() - gp) * 100); - remoteViews.setTextViewText(R.id.gold_tv, String.valueOf(gp)); - remoteViews.setTextViewText(R.id.silver_tv, String.valueOf(sp)); + remoteViews.setTextViewText(R.id.gold_tv, NumberAbbreviator.abbreviate(context, stats.getGp())); remoteViews.setTextViewText(R.id.gems_tv, String.valueOf((int) (user.getBalance() * 4))); + int hourGlassCount = user.getHourglassCount(); + if (hourGlassCount == 0) { + remoteViews.setViewVisibility(R.id.hourglasses_tv, View.GONE); + } else { + remoteViews.setTextViewText(R.id.hourglasses_tv, String.valueOf(hourGlassCount)); + remoteViews.setViewVisibility(R.id.hourglasses_tv, View.VISIBLE); + } remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.getStats().getLvl())); AvatarView avatarView = new AvatarView(context, true, true, true); diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java new file mode 100644 index 000000000..40071cf56 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java @@ -0,0 +1,55 @@ +package com.habitrpg.android.habitica.helpers; + +import android.content.Context; + +import com.habitrpg.android.habitica.BuildConfig; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import static org.junit.Assert.*; + + +@Config(constants = BuildConfig.class) +@RunWith(value = RobolectricTestRunner.class) +public class NumberAbbreviatorTest { + + private Context context; + + @Before + public void setUp() { + context = RuntimeEnvironment.application; + } + + @Test + public void testThatItDoesntAbbreviatesSmallNumbers() { + assertEquals("215", NumberAbbreviator.abbreviate(context, 215)); + assertEquals("2.05", NumberAbbreviator.abbreviate(context, 2.05)); + } + + @Test + public void testThatItAbbreviatesThousand() { + assertEquals("1.55k", NumberAbbreviator.abbreviate(context, 1550)); + } + + @Test + public void testThatItAbbreviatesMillion() { + assertEquals("9.99m", NumberAbbreviator.abbreviate(context, 9990000)); + } + + @Test + public void testThatItAbbreviatesBillion() { + assertEquals("1.99b", NumberAbbreviator.abbreviate(context, 1990000000)); + } + + @Test + public void testThatItAbbreviatesThousandWithoutAdditionalDecimals() { + assertEquals("1k", NumberAbbreviator.abbreviate(context, 1000)); + assertEquals("1.5k", NumberAbbreviator.abbreviate(context, 1500)); + } + +} \ No newline at end of file