From fd28be2d0ff4417cb29a1a43b2ba9b384d71ede6 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 24 Sep 2024 15:22:18 +0200 Subject: [PATCH] updated subscription design --- Habitica/res/color/promo_gradient.xml | 5 + Habitica/res/drawable-hdpi/flag_flap.png | Bin 266 -> 366 bytes Habitica/res/drawable-hdpi/gift_sub_gift.png | Bin 1413 -> 1102 bytes Habitica/res/drawable-hdpi/payment_gift.png | Bin 573 -> 1304 bytes .../res/drawable-hdpi/separator_fancy.png | Bin 1021 -> 1089 bytes Habitica/res/drawable-hdpi/sub_plus.png | Bin 0 -> 361 bytes .../res/drawable-hdpi/subscription_bg.png | Bin 0 -> 2834 bytes .../subscription_selected_indicator.png | Bin 0 -> 851 bytes Habitica/res/drawable-mdpi/flag_flap.png | Bin 199 -> 278 bytes Habitica/res/drawable-mdpi/gift_sub_gift.png | Bin 968 -> 790 bytes Habitica/res/drawable-mdpi/payment_gift.png | Bin 339 -> 954 bytes .../res/drawable-mdpi/separator_fancy.png | Bin 534 -> 575 bytes Habitica/res/drawable-mdpi/sub_plus.png | Bin 0 -> 247 bytes .../res/drawable-mdpi/subscription_bg.png | Bin 0 -> 1927 bytes .../subscription_selected_indicator.png | Bin 0 -> 621 bytes Habitica/res/drawable-xhdpi/flag_flap.png | Bin 325 -> 439 bytes Habitica/res/drawable-xhdpi/gift_sub_gift.png | Bin 1619 -> 1212 bytes Habitica/res/drawable-xhdpi/payment_gift.png | Bin 556 -> 1430 bytes .../res/drawable-xhdpi/separator_fancy.png | Bin 1058 -> 1122 bytes Habitica/res/drawable-xhdpi/sub_plus.png | Bin 0 -> 308 bytes .../res/drawable-xhdpi/subscription_bg.png | Bin 0 -> 3580 bytes .../subscription_selected_indicator.png | Bin 0 -> 1126 bytes Habitica/res/drawable-xxhdpi/flag_flap.png | Bin 426 -> 544 bytes .../res/drawable-xxhdpi/gift_sub_gift.png | Bin 2383 -> 1712 bytes Habitica/res/drawable-xxhdpi/payment_gift.png | Bin 848 -> 2093 bytes .../res/drawable-xxhdpi/separator_fancy.png | Bin 1482 -> 1503 bytes Habitica/res/drawable-xxhdpi/sub_plus.png | Bin 0 -> 451 bytes .../res/drawable-xxhdpi/subscription_bg.png | Bin 0 -> 5345 bytes .../subscription_selected_indicator.png | Bin 0 -> 1584 bytes .../res/drawable/flag_flap_background.xml | 4 + Habitica/res/drawable/g1g1_box.xml | 4 +- Habitica/res/drawable/promo_gradient.xml | 7 + .../res/drawable/separator_fancy_full.xml | 10 + Habitica/res/drawable/subscription_box_bg.xml | 4 +- .../drawable/subscription_box_bg_selected.xml | 5 +- .../res/drawable/subscription_type_box_bg.xml | 5 +- .../res/layout/activity_gift_subscription.xml | 271 +++++----- .../fragment_bottomsheet_subscription.xml | 223 +-------- Habitica/res/layout/fragment_subscription.xml | 295 +---------- .../layout/fragment_subscription_content.xml | 278 +++++++++++ Habitica/res/layout/gift_segment.xml | 35 ++ .../res/layout/purchase_subscription_view.xml | 206 ++++---- Habitica/res/layout/separator_fancy.xml | 27 + Habitica/res/layout/subscription_benefits.xml | 338 +++++++------ Habitica/res/layout/subscription_details.xml | 464 +++++++++--------- Habitica/res/values/strings.xml | 27 +- Habitica/res/values/styles.xml | 26 +- .../GiftOneGetOneHabiticaPromotion.kt | 16 +- .../habitica/models/user/SubscriptionPlan.kt | 7 +- .../habitica/ui/activities/BaseActivity.kt | 12 +- .../ui/activities/GemPurchaseActivity.kt | 27 +- ...tOutcomeSubscriptionBottomSheetFragment.kt | 24 +- .../SubscriptionBottomSheetFragment.kt | 25 +- .../purchases/SubscriptionFragment.kt | 99 ++-- .../habitica/ui/helpers/ToolbarColorHelper.kt | 1 + .../subscriptions/SubscriberBenefitView.kt | 5 +- .../subscriptions/SubscriptionDetailsView.kt | 12 +- .../subscriptions/SubscriptionOptionView.kt | 184 ++++--- .../ui/activities/TaskResultActivity.kt | 7 - 59 files changed, 1356 insertions(+), 1297 deletions(-) create mode 100644 Habitica/res/color/promo_gradient.xml create mode 100644 Habitica/res/drawable-hdpi/sub_plus.png create mode 100644 Habitica/res/drawable-hdpi/subscription_bg.png create mode 100644 Habitica/res/drawable-hdpi/subscription_selected_indicator.png create mode 100644 Habitica/res/drawable-mdpi/sub_plus.png create mode 100644 Habitica/res/drawable-mdpi/subscription_bg.png create mode 100644 Habitica/res/drawable-mdpi/subscription_selected_indicator.png create mode 100644 Habitica/res/drawable-xhdpi/sub_plus.png create mode 100644 Habitica/res/drawable-xhdpi/subscription_bg.png create mode 100644 Habitica/res/drawable-xhdpi/subscription_selected_indicator.png create mode 100644 Habitica/res/drawable-xxhdpi/sub_plus.png create mode 100644 Habitica/res/drawable-xxhdpi/subscription_bg.png create mode 100644 Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png create mode 100644 Habitica/res/drawable/flag_flap_background.xml create mode 100644 Habitica/res/drawable/promo_gradient.xml create mode 100644 Habitica/res/drawable/separator_fancy_full.xml create mode 100644 Habitica/res/layout/fragment_subscription_content.xml create mode 100644 Habitica/res/layout/gift_segment.xml create mode 100644 Habitica/res/layout/separator_fancy.xml diff --git a/Habitica/res/color/promo_gradient.xml b/Habitica/res/color/promo_gradient.xml new file mode 100644 index 000000000..efe22607d --- /dev/null +++ b/Habitica/res/color/promo_gradient.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable-hdpi/flag_flap.png b/Habitica/res/drawable-hdpi/flag_flap.png index b4e5e9cec5ed217cb65501c85f1da5191a018bd2..e67ac259f3a6d95259b68ddf0101a33db688ee2c 100644 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8S0U}qe@Gb>XoCO|{#S9Drb3m9;?W~mvP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBIc856$B+uf(#dBF4>|C(&Nt(oz^BnDG>Pv8 zgO$ScgghUuj?0dh9D^K-HW`~Za#kcr)`>4XTG6BXk?-1>y3Lnnr|UYJ#61tT`pDg3 zwWCYu|9`#{iQaq`yoo0s_Q^=Zt0`RA&ZWstGNpT+4N-`ejkf8f;k<>O9; zW&Es*wjIySYO3%)HJ?emyJvgb-Dp+2=o5wRu0b;c7MNVz61P1%b>+;wGv`?v<+y|` zS|)C?zWF4UZ^mosg+1|%Y|FTMrbotmg)=Iduh8AzcJ17%dkf#JWmuCs<3~*dZ!W{l zNrF*D>+7xw^V_l}=^3c3-BHheqv);c>JYuHf4nrCZ!a%nn<^f*PWAf9USRMrc)I$z JtaD0e0sue?S$S0jaZ_23!%7E!^g3_-6{`=L!M863*YPMebRYI9#JlSBNbH1+% zjQe~)$B@gVIk|k11Jfbj9~qd|=F2ME^(aB>V4}?(xm}@0KIh Q#Q*>R07*qoM6N<$f^uzkUjP6A diff --git a/Habitica/res/drawable-hdpi/gift_sub_gift.png b/Habitica/res/drawable-hdpi/gift_sub_gift.png index 278e05552afe64f61af6c00e601780d2fc883c2b..5cacbeb602379795347d33b4d35dcceabc7d643a 100644 GIT binary patch delta 1094 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 Hu0mjf5GL_v literal 1021 zcmVQyrul8gZad;{^i{N)W`peSLwQ;{mj1qt%>>0 zzW>|K{j!t%%ew!phVQbJ{E=Smyq@u?g!!U%^u@CO+0Ost-2btP_N#&QxS;;fy!Nw~ z{o~vJuZr@=ukz8m`Ov!f*UA6Cs{Y8f|H-)j<=y|rtoX5u^_61tmTusxhWf;<{MN?( z;MM-hy8obY^u4G5p>y=kzyE_$-Pg+h$gcOhn)af3?!l+}*v$XLv;Uo$6$StR0626~ zPE!DXyssr3qLu#qJoqp(2fhqGvu$`8Uprsyzc1_xKQ15T?C*ZKvb|^Tw-n`b=>DyY zl@I$l+v|KifmUxobv4?wAyn_Jm!5|U^*aB%JS zlhs3qo4{VQLU>V-f)=}d=Lii+V?Hx`2aM+=B-L>A^I%I82!jQ`w$PF^CMFZ#j65DE zAt`U{dH}@1y!DnnRJ>stFR%(M1W$TEAS`Uz!|h5Y@>uHx3*J*uCYXx<$dqM_xm`%6 rEN{G}G*j}HvP{WTS*B!lyJO1#=BuEOMkjSt00000NkvXXu0mjfEv;LE diff --git a/Habitica/res/drawable-hdpi/sub_plus.png b/Habitica/res/drawable-hdpi/sub_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..6ca472fa0bec0714475176a9950770d936ba5895 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VXMsm#F$06Z91vzyJ8NYE6l5$8 za(7}_cTVOdki(Mh=MBJq|_)LdF{6U=KT8#F$?RC zSS?ifGS&XKtid2x^rv@Y z^^JE7kE}zO?yXQ~N!$9;&2xs3`P1O}(h`a`)e_3>pR$st1o8GPZe4ft*OgGFRi`Vu zLMqf}O#bFEQTqM?Tb0>UQZ=sgrCgHuWW;jv!w-9}wmI_`@?6)u`}ExRES(Ge%=~Kg zhqs^i{&#(u4O7SRsa`Xu2e7_~%-LP{_Ce;|f8sy4S4al^zp+AN2{0rWJYD@<);T3K F0RTW0k9Pn7 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/subscription_bg.png b/Habitica/res/drawable-hdpi/subscription_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..8e6b8b4276816bb29757f959e3fe378bd66796af GIT binary patch literal 2834 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 JRbc(%{|C^~7-;|i literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..af84be92bf292337c292225d9786f72b1c44a65a GIT binary patch literal 851 zcmV-Z1FZasP)%FGba_BGQ z$~)8s7T7s)`rZ?Fhscihcn6x`e>2PH$)*@R_772W&Ehn+Wo8A6FR;mH^WNe53_El5 zA7Bxy&u*1$DFBOdwCzlhE%m^noLI$Y$c92-5!UcAGQE&k1hCngRRk;=pcJZp9;Dk3 zMya;7gH9K}(z#P#D3Ky!QH~V1{(Yy5#cgeKfL^>lKaKG6N{99u}+sO2iwMgy;b_) z-b$4K7Dd{nXYY^E>e}wWe;!bPTgwmrac4GbEDAlt<+sBw7IoWAG$^y_h(D^rv=M6ls?R_U?_i8sOzO2i#lTu_*K|t*jKWNcr2t zz*5Gd?7$gdQ8wU=uqb_ShFFv?IAbhI53B(er32Oki`0WP!XmX`&9F!vSVJsQ1J)Fa zk_T&yMahCS$D-uG24GP#U_-DdKG+~EiU&3fi{!xuVv!u!P%MfLHW-Vdfepu^@L&tD zC>+=lEb0xm2#bQjmSGXV8yz395R35PQr|Z}Y{jDbC*r4Ph|?wUvmu^>S8SsFn;`xA d_3Nige*r+VjV0$b<`Vz_002ovPDHLkV1o2Whfn|j literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/flag_flap.png b/Habitica/res/drawable-mdpi/flag_flap.png index b14a89033388f0b8ee03a600a01181329b3ce5b5..fbf095f591d2e3f58a5391d1d22e042487151b1a 100644 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+9g7iyFCg=TDiwM}H9VkjO zT99x(X!qOmOE>TE6Bg@UbB%Fr!>@~L_e{AQzd~zeU*e@FzO%!Xm#9CeU;g0OYuzUP Y{2vw}>lED;fX-&{boFyt=akR{04VuuApigX literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^oIotW!3HEXq_67%sXk8^$B+ufMW?lvWD(luS{NfBM#!v&D!hFp`VGF|{>NVeU#VpvxFMUHx3vIVCg!043Z*;{X5v diff --git a/Habitica/res/drawable-mdpi/gift_sub_gift.png b/Habitica/res/drawable-mdpi/gift_sub_gift.png index d133275949c54b37b67d370e4d5aa49b928a2026..694da1399b496258851d744bc9926fefa210dc62 100644 GIT binary patch delta 780 zcmV+n1M~dI2bKnq7k?QD1^@s6D=Y3@00009a7bBm000XU000XU0RWnu7ytkO0drDE zLIAGL9O(c600d`2O+f$vv5yPGQVZfN7ZN>gE_69?Xqwy*H#ualc$n+x0p;5BV%{QDU-w zB!usTAXaj*)kAqFyc)EKG9n|Mh$ER9^tE-%LakawGk*dJZnPXMu1#Lbcn(PUFnu#G zqfkXD2JOf_STkz@t!>v2TxbPn$jfwH@t34p?2tSvyq)<}txY*3jBRrt+f~!m8z&8@ zNP4?CYLz|TzAqNV@n{4+Ixn1w#h>3xrSbtjNk9mZ#n+oyeDf}#yP8S{*4NTQxSkmb zgJ^V72Y-dHKm8TDxtr)m&-mGZE;TwFSXYV+>l@)1osU2W;a1$NusKW!BC zO0am?Mcn2+_`GR{;p2<#z%m_oUeUd);#=H-u7}?AzH~fAzX9XG1ZkhLL0bR-002ov KP6b4+LSTZV++>IV delta 959 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 N002ovPDHLkV1n9v{5Svr literal 534 zcmV+x0_pvUP)ZgPIf#JHN1^USViqli?d zaHJ}kogOz55h+ii%)3%OZX_aVVP%O>o`g{w6A@Rou!2ZKWh$tRiHIv(SlW{>G#03h ziO44MIq~k{S_7;+iJpRRL-OM-i;(y}fv8N|r;Ctf3zEy@- znQdTIX;2vPozlp!3^YSW71UxSM2sLA{rW)-RIUh}ny3^ehmuMym{wCp=u?-A1H z)GNa7J*Or2Jw*W@2)g_hpOf!yd6r<$y6nNdcbSq{Lte;tvi-hMmGq7AZsUYle-qAF z*_dyG&KWJgc~?wLIy=_o+O!w67ewrs=70KaS5eRhf-byk^EvVUzm~MpFsn>947C1i zVeJ(w4zHD8n}~=V(`?IGOGwx-a}M#-psfPNdZ0Q3$`h%u;kBXHCL*#PW12m>8dm!BkBXw; zEunp)v#umRoHWr`);%bXk8y|e!nq8)VjHd$r`g!Hd@L2IGg$RxT6OX&DbD272}jS` o?=8CbpD*x)rAkgnxwjoNleu-|K_^yqpt~46UHx3vIVCg!0M4>dEdT%j literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/subscription_bg.png b/Habitica/res/drawable-mdpi/subscription_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..3cfc3b068b642b03f3ef2141924a49b2a107c12a GIT binary patch literal 1927 zcmV;22YC32P)myT0MGzNP#CRtA|ns=II^fp zW0M0ao`O7mY`5HR|L&r`+I!S}Y9rv_Sap$OxtO3E3Gi|SF zrQ@yv{6(+3KS>BTR&F`0NMrUc_Lmw}2WBdtz!zwWB!vc4~X@|m{HBJW1zMSfn>m&=BV zCxiH-Z6+--ogA?4sz(6S(zK$P1kKn6U0uB&89QCY-$YbA=a_t+noa`fPM#WgR<>DR z17KbMd!Z?QLn;)Zx1kchRo(7VYM{$Mpk?d@IZH5A%c9KtgKIj>1Zu5!H%~oje zERl>QX&5CF9Cn!8094cbP16V)s4@o6B12am_2X8ZxIL8-P+F&MFThRHus~IU=Zv^2 zl6WG+BMl>}BA__jp%bg9Z15~F5EHlN9(XNR5ixlIxHQu{bQ;$}V{!miRHxvXM-TyP zbm!JVFKmTAEi}BZItS0Zf#~=UtvMhQy*ualgR#%V0IXY+g6EXURPMg#Dk2v`eE}M7 zIs;9-Ymr2o+?^AbrLn;?C!IC-fNBU$ak`?3e1ZmfA$S&W)llF4QXY7o3!#dP4e3c_ z_Hob-x^h8YWQJbUnod{$;r_=1L8YaW0o=R$ntRxD)xJ;b3`HS$&Zm^*6RDK zM&ckd=<+0$jbOQlF@D?$9vH*8e2{Rc{pk14UKUDW$o^4^^}fJmA%E6j>+j* zT+%|d9Zyn{;meR} z1^`N?^1(Acisax`(l$GEdwmQ5D6h%|&um4r_dFzM0H9(@A3U>TG_=kDp!!M~JaNEi z*gOxI3;+N%Q;Oh8+h;mXqkDn|0P3r-;L)n)=w&kVOg8{PGvpRLR5btqb*aHaRRaK+ zx7Og9oq_iH-+-zH0C2{82am3!(bgF=&;S5gTqt<7ZKhQX3pfD)tI8BSObh@3tjp5i zNf&T3F#rItPSfCFVgLXj5AB!#jF}h!0LV@I`O`N706<R2B~|PY`8iiL*KJX@Kl4NsJw`!0BFo zfYA@EL%i=0|Jov_V@*C5I7wpHi#LhmnV>i_N-oQj+lZNS3y$->{OlnnW^aIaHcoB` zxT&+<;vq4E*&T926>!KSR;%-uwh9i38RX6aYv7QVO!o5LOb16pl=^6*?bR3!_NCNM zHozednJAU^N?iQ0RYF7I4)v22aL5$!__AN(PxTiCHLD} zGve|_B~mAjjDW`%{WP~eCNbr>;<1(a2XXJENjJ_AcoppV1q$8yN^lF)Pc%9HN><=d z%~gyq&ttH~{dON~FFB5vRX8PJTT516Y7`3l3dj5-3CnTFaFNUeo@sk6DxjId7#73E zqQc*|NgR>lD)tX2Xn!*zVR-FtMC8h~8iyFaS>mKSO*mxghq_`KaY!#vGY;tkT7W}( zfEMA9d7y1ghR$a2XUx2&|w^^ z4s-zyRR+2QhX72LjJODgJmMj6;d!vzaE0&)IQNYDzrWWvWOM^wjeabj00000NkvXX Hu0mjf7Y78< literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/flag_flap.png b/Habitica/res/drawable-xhdpi/flag_flap.png index dca3af7c54cc95267cc286718078966945c75994..4cdb4a573c75d504791bbb1327c1bd5f0f929724 100644 GIT binary patch literal 439 zcmV;o0Z9IdP)p}M+aAe3CWHQ=m4nTBDl+L$jC4i03ARD5ZN;%&;fLS2Ry?8)+~~Z4xOwO z89%VC**Cj?wU!7*^Y?1Z8W&*BK{SFV>VhplgaM}wZs`n!XwXW5cn=9Ffa^a1dQ1Yu zI7tCyAG4->F`px$gb6X7izV!1*)9voYzGuuyEPbBBG8+mYe*)YW=(Z#UXy4BD+b>{ zDq;2c^>G=RT?4Gyuw@md>|0I%UCY3o2w3^^AqaBwQ4-+Hia=^Uzh&OaLZtvZpCq6u ztCN6&o{DY$oVF)9gYL&J0t_rf;P|z)r)?|(L~4Ka4Z)mS4>FkG!e7TqOhjPbR0qyn z6fl4F6oFR2QFEUg&$$TLeMdxHn_+9i40_%90C4*r1^j)F0{*_oOZ>w@D7k@Gc1^@s68p>FV00009a7bBm000&x000&x0ZCFM@Bjb+0drDE zLIAGL9O(c600d`2O+f$vv5yPvW(xnoq6BcdGlr$1P5eANfMfvLx3rUR2DV_ z)EMFp0k-}uH&cRF#CWAFGu@aaNT&E8vam4#4H(-5N>;ZfCRC?u(at!szOeuX0wK?Mzd*VMHm44(Grth!1vicNU>f zZf$QZAfpfZxI~Rd6Jy;XECP7&OFZ~I^bOmgsAtt&PV?eD{!@7gD9b~?Ae6RlPG-#} z(*8qMin71pk9!`KSX}Yq={tAil0JcLAvf_gX^W30<6O7$^Pbp^XnvN5e;F9B|z%(vynFo>;A3h-khcPnd zp9A0qgSBU0oNk$Xdo4(iSYeFK+PPB(EBq^Ura=OcUozOEA|+Y#b~(Adtx?vR1s6I3 zP|Secu78Sne?CZ@C%uMWW`?%7$VmBJoCC{`B`J6*3T!Pqtyyc;AKUzk73( z8Fn$KV#eFSXDXFsy;WZ@X!9Q0#$#Op9S?Eq`RqN09&qOpW4JC6Qfk7XN?5$Y&2qav z7LUTU_pjMrOQ`{e8m~=!5NiXbAkL-oLWYEV&VMImln3rye-P)lZceP4Vmc-LsQ6eU zBX~o7@h!IvZ@zm4l5aVWU90XxQ*WHc!mI6Z#RbQub#_eC-4YOUD?w>d+;Z@S3|#|D zk_7$0gHM9@;DJ~Ehuy~ti-4!O=^aEm--iebdQI=yZZr+>4d0>4I2>z@yQ`ENf{ZyB8|{pRNFcgOFB3z!go5V$=K%jKn+*+}O&Kk3C(_%0T2G$4Mh$jbM;2Rc z$a=JRXMn)4WSzIcWX}UZ2crok{g7FT+`z57vAo$({JJK7XTSru53K?kx&goH2Y(h@ z?QLtFOvVsy#JWzcm%tOewMb$MA5BMH4%yB;J&MAGqlm?JIc;6< z!wCse3HO&FUI~{_(1ZelCKM1fp@5(X1q4kfAZS7XLG$`O5B&Xyc#G`sfuLHa(5zV> z;=3Q}58@2=;uQQ~_Zr$pfau(xfG&f&!T$%=B_L@XwHl+K#a^9&Fb9I>+za?0`DLBh TdqKUl00000NkvXXu0mjfnvysC delta 1615 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 QVE8h4y85}Sb4q9e00Hnjvj6}9 diff --git a/Habitica/res/drawable-xhdpi/separator_fancy.png b/Habitica/res/drawable-xhdpi/separator_fancy.png index 28f321bf2a3d8589af5eec7ddbe056391846be85..f35a8ad9336a256d8e9bd897b5798b0d6170429e 100644 GIT binary patch literal 1122 zcmV-o1fBbdP)w^X2)v_%gNoDGj;XI#G|Eew21MPg>+2^|CqX6~KKcjEwpuaAD`a+g z*$kr1{u@*_(DHBpuMX;4bC$xd=bvI7#cwr?PusXW;rRGd1G*WSju9zagTbL_&Jb4M z1&bXb-R@JcGYW1)qfs%&H|jv~3-J4=#>_Pf>Ep_$dxPprKXw~kE1PXtOd2IoZtjpH zWxu}diWI)_^q`CBtNoa|WaItYO_Ua0ZcxA>MoLss;{%0_A0one@Eku&@p2qk{Y`YQ z5$Wr_H#*RMeTyA5ElVv-oVPJCW8vLPx&zg{K{KjW#w!Zm%$T{{%qY!VGGz8&bF8=+ zKP~L0(NT5kTdR3^-WgTd0m@3sp8`FdS@c+O#yi7ib;*P1Fq!VThVJ6m?RLF3I;>87 zYc&tgtuJeOCH&yYApx;rH*Ts~no!>l>Vg>uXEvM73Kl=U=v;0ym)t6|t#7JTOMY6s zO@i*Ic<~aD9#B3qwv%oq+kZd_tDSFq{VydEvg5=NVJTxcQ|_cqeVA@O2S-DDUWbAZ zMJeZU)adR+V!rVS6U>w!QM%ho4B@OW<$)y8%@XykeH_V>=w^u`oE4^A8r>{$zq|?) oEsbumV#>KdphW(9Rx;WD00ka;s?%B2aR2}S07*qoM6N<$f{`E^761SM literal 1058 zcmX9+3ozRU82?*Nw(Dwjx}&3K?y%~{k&2Y=s;ntBYKCpSRy;d~OLw=rR=f4knaA2F z5%sFIEJ`BcwInqaLYjoGiDzVp=!i<&)W}0pNxuEv?!NE4@Atj#dzHtgiJscl*ZUlP108`>e1q`l%lQnD_`2X z;L8~}QIIoX5$o9XbFjCW+)GmCs$Jiehfp|n!h+eg7VJkdM$U%6$oX5Pq@7The*zy; zRz$wo!1k^K diff --git a/Habitica/res/drawable-xhdpi/sub_plus.png b/Habitica/res/drawable-xhdpi/sub_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5bbf974831a5a7e07ee49e7c8b3daefae3ec05 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0dmjV@L(#+i8wmhYSQ<>o;wCz^MF^CD Bb?yKF literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/subscription_bg.png b/Habitica/res/drawable-xhdpi/subscription_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..23037e347e44b32ea60312cddf986c2efd7a07f8 GIT binary patch literal 3580 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�R1wxiOdY0J#xI$5)WjT65Zt`D1 kCn#8Y$lCgt`M&Ep1PhobbH)Um%Ncga7~l literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..f019009543385d8ccbc7fa5e454d12af8a90600e GIT binary patch literal 1126 zcmV-s1eyDZP)ot=4R=9!u2+hKEN5&ZDX^E@*PYmmcOcDR|p4A5S# zn+&6aA8F-3H&d)LmWi=PM(^CL?K`MO9IllpH%g3#DfVDCG0JenDbXog!2F0~GG9`he87c-rebo z)~l$V&JB{DWIPlaAV!`YUVrL44fcH@sri71LIK2rfw@mq+nF7{0)HT>`Gki&1B&La zYAw8Kv9>ItP9FP9cW$kc)O^H4uJ?hs{HEvItkn{KIOeQcmz}lO@J07IpTd&gc z84tN0feVW*rL6`q0b_@Q@LpWHqOjs(&{SJBATPuAQg zt$^^5Ye2i(EZkLOCN9(VpZx4l+^*QomALGCx_*+h0>neE0SEiO+MdG-o0+)8Uz@7# z^?)aJyAm)SGT71$MlP#0?^Ua_eN*m=8v-8kw2i^&Nnfx3!#pe&=^=?90)~W#JnsWB ze@%|9IDYh0+^$Hw*9{R5Nx2ij3OYIVw&pejXj1ojA>$!ww{lK4!s(&)Sm7b5_rgU) z(Vh-Zm^<5llav&}L((56Scs$VtjF>Qmo4!6Q{PBR3gID7+nB&p3=b*snTVql#6!^l zR1^=X52!F6QX5clJftpQ1n`iWfDyq%>H$Uw52*zhF+8LWU0`QPO zfC<4v@&OZshvWh#3=hczOduYT1DH@eoihAtqPXGV_07*qoM6N<$f+@`iivR!s literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/flag_flap.png b/Habitica/res/drawable-xxhdpi/flag_flap.png index fa7d6a76ca6ccc5b72cff74a27603f8f57286931..b9d6563719f9ba97abfbe7d79ef7082c99ae1030 100644 GIT binary patch literal 544 zcmV+*0^j|KP)^D8YaF)0q#1RA~U-k`G7vHdIRqW zupapS`MO4e?*S7$E53pOV@-+!fI7vVoj=f$-uX)xz|zM}k-q6)3&=y`#U8u}xb!6g zE`3=KkWF7q4wLldJff1moPeY+Cm`v|duvSf2E2&j0T2LUsxVmPhs!})@Hs2Z8WfFjz#!1;T6OzlgHX^Ceiecv~^3$`13 zJ?P21;TTy`1Orl8;kz{s$_guRRy?hwvcd`&-ALcXv`$m$_fXlNUlHhZ0|7(bK)_Hp zl8u6P1uJ@(>c$IDNO6Leqr++jDo1O;rW-3@(~V?|q;l+`@@HlQ{Nvi2USXgv59YK+ iq49ap0&LQ3&)gs3XT2FQPo~oV00008}z!1VKSR7 zrYi3U=9ByG1j9D$W;vOBBbZMzy~VIH8Es;ikM|P8Qm=;;7QF6$mk&OLjfnREy@u=L>+Ug{Dbk}QoBcmV*=wfPDlp~Q-EC;~5d6LElAf!0@tWE9o|3jov? z%I}6r0RYkjS3H)S0(@6CoCqUA``eNYPv_>jQJl1J-AoeB7eXRiqJtOQR4#xYT(|!S z19)OmKy$^_!Inw@Yuh>UF*TWATp%xXv&kw(mAR>8DdxFdUAH!Su`+$IA*v6ZzFCr!(ohYiiD_nCaqv2t*Z z#XcL>zjeZCLIoTXSP)$t(w`Qt;m9MpxQHyT=uLE*s0pPFjuk;UK)f9$+Ym})%-^VY z{iHrHGEz11(!X!aQXpJ?^W0L^qP}U(GTuh1wa%AkMLi!ugiB8~QsEtX$XD|BMkWLNLL?h60+08zg=$Hi z53`jTyJ@1Hz)?pt%U<)kL2VE+e$^%^8E~M0&owXtOksiwkk7))_WN{#s>iRM@ojQJ zts^-oJ2M{x-03LEA*#{+|5cmBE0g+ciy)wd2<(3JTFr9BDQhfbhH0#8dR=gpah{Fo zRz!ny4UZ@jx-bY{hUxI{M&pzoQT}sEQA;A#84`xkC^S8CZ-ZA4f3QIRQMia6e zF>5WBlUtW<_SICu6>5|UTKr(IMu?@fg2;-oDcBq8@W7dwt7691kfL`%$FxjdsUz(3nWPDg%5T)*6Ohnxy-~B{1NgFFKPtk?Z78iK4sg2VZX|u z^j0qG(@w`=m3>@$V0S$=i$T5v^S7e&2J4`}<=CyxxR6&_;F!pDUa&xjaQKs}Bd=2& zf;>t@d2daI&oystY2bmAB66isY3xq=q#s%<*?*$~RWNl?J79lVD(NTxF?6qoK94f& zg38nrThO1S4zrfC-YuIecN#>5JMT89nP{LxL%#dqzHBLtt0eMFWOI~J3`R6xD znW4KdR%9NlPjxijO>b?gxV(HVqmpJNq5Yw9hIH`DW+D-BAnLyHCR=}!6K(7CB!P>x z6`~a-MSER)v|OjMd+v>2;!WUGM!$UN@M47oeYqraPjJ%gnNJ3NS#IPW34Ls zmP-IX#p3o#f~}`?{-w8|`Nq!&$RL!oIW$8p2P@wLWu%@=Iis58yd%S1{ltKlxRgGF zmT=&#{*AHV?B@R)xl-Xdy5X+A^LBb3pY_@}3%#}9!XTQmXa7hL*p0L7JY&sjbm~8j zk|Btt&(j1Y!`DmYax7t|bzGZi{W#-t*6}`2-5sUe>ZFaqRHH09*;D@U=J!^Dq0~{}ccK literal 2383 zcmb7GSvVUA7mbS45~_rTNo!YYZH*{OW2q!V>?4+z22ndfsI?MpOsTDuT3R|~(2h3M zGPVRo?YoJsrD#KK2|B2#F)#Cd|KtB~?m73K?|k2VxDWSNJFJzkptK+W01!r_EF6v* zbqp*&=(tke*ts1O&<|;Y1ORB6LfjjC$Gw3s4o$GJ0jM2oegF^E9{@a7Jjake1^{rP z^u&J?R4MO&8vCzl+>jl09BW5gAe~}();$7)AWR99Xu{exhU5%Q_zmb}kOypRc>e8x zVaQht$WLxyF6w!;045hx1$i5g^sIUs^~d+UiF~(m=j`f>{u8EXp_D6Z-gHZF7vWb6 zF*k@&O6eO5;~?%N%Q$4nz;*IbOKmhETGM%=B?lfc6g}ABN58ZS*9!#L19{2GzCO2O zI3I{R7UsHD8&7j<&I7BHbJS$D%~hMV&`VG3n(;SdS%2NqG7+kp(Yw^3hJ3RQLFtvf z5>e5#JkpbSkNU{zv$V3Jv=v>SUJ^_3$*OQUDPtu@PZLhOP!tjQ5GbqQbeE;IxnWdj zQ*VbmRgRH2rk$$fK*Yq`p=VzT@SNqBQh2@dKrgsNAp{>5NsvaIlbQvpeaKXdY6vHc z$oV)t?5=feinDcH;(L)YXcI47`9rVy)@n;*r_fPTrplc3`tqJi(H{y(8!EM4y3ho0 z#l(3&ytysWOc{gmVs+B#Qnn=UXFG%D)9FjHgaJ3unrjL$zO=iu3_)%S)bQ@P z5F|uR%PKx2cr{}RP+r1ODGrc=;(|kmeohFCi5JR=sJ2_uxC0t4UFn%K?94_EuRll7 zDN8{_-EQX$6L)cYsH>@Qv19)Fa~xON`X8vlml3WYNwPi+8qy{!?Rt;zf&FCSkKtk4mc4g8 z`!6SLidrUP{wm)|GpeYFCm9JLLCYUVeAMrAit?rxc%~?|0cS4hkrIWykhUh69$V7TSl9Ra?i#eC zs#!RBjMQJ2ctox3Nf4RLnM7G6rBdRe^h+RDuYB(-+-fx^5v{r0{q4kb^{mk-)Unf&!zr-kd=<%spMMFzc2XB&9s2Jtv61 zIldyS_Reo4OWP>35OItx-eu}8g3%r_^D0~uvOf!sj;XrKBcz8lf)M#;3fk*THfz+U z751NDQ4VsLK3v>^Z_{1hEd92=xH?A03aPzjxeDvA1ZvK=%viC?(JPFK3?*5y$a=~( zo?G(oBeC5!x@3iUj-YFHVFLhHehFg53tm2(M93>Ah^npRCCj)<1+> zUdXAFLnDg8+u7$AH=e{V$98q(+Kx%OE3$%Belxo2?tVt|irXD@)~}4F=euGkF)U*V zSD1*zvO*h@)SfTMUSpHf1UwMy`6rxDWz>@{35WeWKvdKiy15e#=&oV-0MyLR%6Up*d~# z7J3?S{LPtkvLid+e)@hbigRuJ&~^SXV0?n9E8PD!vjNomcK(iL={moNIJGZzD|4}J z-s1wj`$3z+`3N2BDZ5$yKqb4X{W7<0WM0j%u6R-4MOlYU{O!Cj<199jotNUzq`$tq zK+%z?H?Bcv+62DZBjsS!u4UmPuVxIpUc%IBwGDK6K=^o9!^>EeW|4xH1}6)WR+L7s z$X#C{%SK4#{F3{%{C*fMNaA;YpU2YqfOOS~9r3-T&5zc9%qnKo;zBll9K8S{i{sSz z#em_^`Br&~0Z_!MRLarEm{jEy(NuV{rPfU8**mFj3XOO{27Qh7u)bWx%m zH*WK)|7q_-*Y7H6eBlV+-K2b3{M^eR6nGNto+#SKhYs8emRopFC`}1lE_bNO6TgzCliGr{f-I{C(5+ECZ!@RPQ zWLXhj7|th4HuW9gq@>jUX~W2{xirm=nte7x3AQ~u-<{-?xIkX9&H&9 eBk}$3W^v_sK##*h)zpl>h)h z3TcOM+GW#jMTm>-_6@=&c^CWfcCL{CpnB%-60t5k?Y%n`iFC5H1nT;gIJ;tRARGk; zfQDP(t;_oW0Mv;@z%j8ROOxk9F<1rAGT))%RVjY)m2r51nC&c1lYM0 zd0zF&J4h~`5Lekgv?}@fF5oxXoib$!=!eeT@x6|QrAjU-vBgEiXVd_=OpwgJ6fwtL zbfNUhsjy?pPgI6czp+^CC8wbylJv}AI(yDH4^}!#D{3 z$BAeqmO9g&LxTxI6O}VIyXgNKclT0!&6g|5YJU}TPe)4n=k%}PXIQ4aT0seM{%gPG zHi6fK{hLkg!q)jvC0*&&DZ}STO2gS#)6p?><4MnEqM7^vU1Q|Qa76RSsXoCo6AO!Eh6I@+J(mUM$)S;y7gX| z%Cm3zlUs?7&l(RYTh&@mhZ?)E(BfGj0 zN(Xi(P*pw^O*8tbR>cw?@yB`IkyWw~HU&f0x%)Labrnn)$gl1$s@A*EW-w@LA_HN= z7!uyqADD|JZU&rE3{NuM4)llU6@ho&M3^E2_q)$JepxUl>ZoNqewYaoR6Be4!bPwF zW9|k=q{`DrMkchXE9YyOoP7Bbfj<`sdHtuh;Uvn1)!_q}{!O>zLbQUW$0Kr2tWOdA8R1 z)523XxrT|H=JNjh8h_ILW{vls=?3)+Clq5$s&Rz_o5ywrWl#=py~4V4?sW+;!XR7g z6C8V9j^Sq_7(~|f&0`5-id?`8W;OP2-MAZ?(hw3TJn$a^ENXs6Zy zS#8Uz2YuC5aUn}(h?e+01!K6^w|~IgM$Uxt&Z?a;@evY^%aq|OzKA`ikaf#MsO@@pNqAacT3b3;64-v3?KUS?VK~zFdxc zkb1sZ?!MLnniDT1NzQD6z9)Y>DZ<}$m8TXZX<#q?JtzMim;WcM+jtSA85JoI|F-PA z){~lf`MyH81Fl{P)KB7h)6+-?l3pTrfI!cRPRT`dav||WMc!gtejBy*L^&np=iiPd zU$@LpirBOBq!s?ZOAFkeS{Tv(x!ZqV@w)=G76X0?h*J2S5G8ibUKOhAR1xOkpOP{b z8}9S^lD_E477Kv0)YKc%)*)bMd)8icV`!>fU!&$nh=NSUn`ceAkFx;!#f#e10~>?f zEZ-YwtBv4nf8$=#X7wr9dKKB~#%Iw&BOPc!+WjNW{9isYGCsy;0EH!B+@}&9=&=Br y0NdalhV{)kIv^Wx7)lxpd*&V+LfEXe*Jp=>dmz)H@<%P_Uh&9>sN36`Sa)D zgU3e?oxF4F-uG|cAKrg_{_Le6KYo6A|MB*%duLBwIC1REg|nAmzk2)c-@hBzZXG{z z`uFcYcW>YS`0>;C?>|0$`h5A~wc|%ly?pWd_RYILfBrmm;@tCRFVCI6`03;4Cy$?9 zJb&fv>5C1g%q)Q(mMIDH3ugHA=krY&|Ji?Yq_;}_+n$}3n}0*n*Ke-u%x$wIf5iGS zFfe}eba4!+hAe*(#mNOw1MBDVh1=jG1m`p>ANL+%BI!n=Q`UY_|ADC2+U0No6c(WZP9P zQ1<)q{f7vNpD&y0|4Ir8eZSsnSAxs-*IJQZ&7`eXtXy)H zN$<-#uX}pJRp-qeeplPPs7<|O$Gim{=FBL+hpA5c>8(5)X4wbye1bMn0dc^ z-kJoD%t;(b_uIg5Si~y_J5Zvis9sU`k=| MboFyt=akR{0Q4B^y#N3J diff --git a/Habitica/res/drawable-xxhdpi/separator_fancy.png b/Habitica/res/drawable-xxhdpi/separator_fancy.png index bb1aad139a3575bf6d2bc15275664f34008459d3..7b4687ee854e047b8993fc30ce6f47b48ab5c0b2 100644 GIT binary patch literal 1503 zcmV<51t9u~P)r001xu1^@s6&er0000009a7bBm001F4 z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yPDHV2wj6Qq`gX+Md9#!_x6u`fkmMJi-OB= zFE2Lhuw0UZ2iD62U=%pJG>w2%*Da}m#mJI zGHXqzHOf70ohm3GKmFhyIt+(;NOYU5tOKQr|84^w#Y>!%Zz->n%vA=FkR?_(fojdaRyMYo zXA`+d=(wG|$;quGg@&2ArdJw8Ca-(Z!t!e)l(2z|wwqY1Ok)rVNM%(WPEH?7migoAQLHFGCf>SJtbDR;-<@O-Mm`ICZUbdzztTB3B=2uMLX`<0+;IprG@$8QR z$`yuZe>rH5A5dLKVCEf=AQYDMt=z_L8oI`>FIR!>HyMg$b$@w<@mpku z!9d-A!Hv>tgqwx>q}LMbFsP44JSd;Pf}qU1rtI6h&HF4cKIO`N6qiKjuB_$x1h3>Z zTv^FsX*CaL2>ko|h~H9*V~+oJJatL<-h*!*RPW;zFpt2jZ}GXv>mo1|k`nJonwL<= zQCQLz5aR!+snIBdQ6K$553b{QjeU4$4SVlb&~CW+^Oq5C*u@3!{N}M(1Gv^X%RBq_}5V)0-_T) zFf{XDtL1QGN6c9$C^RRbp!7OoGAl`XKy>C+)5yCX8q>Dk$YEf^ny}d7dDZQQJx+llq3g4CvHun9=ILQA2e>yTGW+C64a$PdO=6SjpA-zU%A(sO4w*Iz zVX_L{DqEYVWd73(OjfZrnI!W@A#|$*u{IIdPh7&)#;`UKSfh+FS;gAK#~Njf$sE=u zKGrA!f>yCMQL#n|5HyIjiRDVjDzw0&V1K)YhBb+q{{WY{D8~C=jvD{~002ovPDHLk FV1fW`zH9&h literal 1482 zcmYL|2T;>j7{EiY11eQe&!ULRr~ws)qiQX3EwVxpLl`v}WQNMnt0z=Isenv51u}#n zh%ywyjxs_Z5N3!8JAh0ngdqtaSp<^2{^|9uckh1py?ej+efQn_UMkAPK}++HCJYAC zLOR-_VK8+96rcTC9U|RzItT`XA4NI4+d?Ch0Rxv1`lL~6_(q{ppXTPto>H((-q+`}v%fa&yF^>gU6>@TrXskzBl`I`> zk#TD`*>5HE92t)(F9;W}E`bJ;l$s`OcrIksd>&|&v#aF|&t&7QEn2peN>r4@ND3mv zqa9oPDbQY}s>91tJr)yP=kmh^T@~Wj_a&*n&DA`XHs#8Cs^mrYBp=wy3HCNQSV#(3 zZF(W?l~A0Yjajm#&;0 zRrNFgW;u9EQsA+o=^-%Ou2`4`Z{pzx0DJaQX%u3Mp4rB$2 z;?TUDKNj#lpC)>hl~1>6&$kBJ!Q41tH-Mp5MIT*Jm#b{A1`mH7Yb;QeJd*d)wud^v z^e`xnl9a^D-_sNm{a~;i%ufK}BB)4^uFQj%cf>1vF!upu`0?2^u(}L#Zi;BRTLW!? zyYmpLp)L^RFf=;?CVQ33e}m;YKz$-@r>wV7z;G8ROWmqUk$x-Swm>6d6pnUrgC%^a z6SDncZUfPrb4h9Vqeacb*R-QsjX2k14f2bY3WFnp{56s|^{vY=6pShIV<)!+PtGOt0I%hj6&`q|7WoV1)1nG|KcwpupB z$rI&u#~t@`&sLAMx45ha6PphnxPnl764;1M(CIfJnAvD7k&qA!d-w*#*c)UcVyx#5 z><5LHrjE}Xc&+}eT3Isv=y@v7GO=>*1s2Qot z_I(OpKW%;7z7}t2MSgdFSp#Pqczdsd+UEX~gT#Z&J%N(#Jr+c%={{0AeBJm)O2T)Y zc5G*B29AYddrf2uUbXwdy&@b>0>5GmN&a`G>e@_&!&H?O&h5 zx;cY$Nq5>pGokJk#&%)YM*EJQGl?E9b*EP5P1?_vGwe){e(}*5v%l{QCxeN`@Gb8X z-mL5{ycLfv+Hf`1*t|Vrg*lbzVIOI;OeE{=)2BQjI>S{t#=~g`mNkmqf-J033Ilc4 z4UJR$`O!AZ;y?>icO`_qR`F|v1r6BDn@297wr;RK=_)OPFZLXlA{a8BCD zh0;wiYr{77RtY@KueX{?GAG~NY Q0{u7`($2-U(#ALbAMP|)qW}N^ diff --git a/Habitica/res/drawable-xxhdpi/sub_plus.png b/Habitica/res/drawable-xxhdpi/sub_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..053926a82e369a7ee15506df543b8a0feac522b1 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEoCO|{#S9FJ79h;%I?XTvD9BhG zORV}O77jSc!CKkSf%KHyr zZCLrjcy$Ql&EHF=J9da4{HVSBb&YLmLcq?SI{u%wpWolEDiipjVVZRKQ=Y1~mM14` zvUF%?Y#04;{Aat(&b;kAnvQm!3Qb&QC-ZUBQD1{XF84eo4Mi@m&ZeM63#MpjJbj^K z*W;7XSa;Yx&*I$|XQNt`a~CHaUa?JlO}9^Mpxf3ZF)M(Kjon!**Cxz9aYb~SXIFz( z_)#vQ$;B%B&7vJ2u`(Uynl;UAF+*dbRi*ukQt$mQrb;p$6gkr~b8_>qNy|RkuITJi z-54dqn-yNywtC{elh=1p7(=kYh+sxHe oc&3W|<-Ik{rGaaEd;~TyrlwbK`&gW?1sLWGp00i_>zopr03J}ZDF6Tf literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/subscription_bg.png b/Habitica/res/drawable-xxhdpi/subscription_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..152afc07316ba62a7e37c47aee15f101394dea36 GIT binary patch literal 5345 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb1dba334703a2e0b6ac0077dc975e222918ebe GIT binary patch literal 1584 zcmV-02G9A4P)s!qz)1)o%lO=gxxFiSLfxu62XN37% z)Xdy2?RyQ5zn>T1Hg4Cd_hybf{E z_6%+|MuhoU7r1B}Sg9#t{?#QeQe2)rtpHpUae4Nzf^bp9QzFkQ5En(sB0VU~j|#>` zn8AI*+-Cq6CBSi?Ft-`PMVYVYV1_e@i?m*o6-pbMhveqcE9nQm?tg7l#zyYR=!t*C z%M9Zp72i4=O9=w##kn_S^^e1Q{_OO-che8AvVe<9vqaBb@81^}-T1awHXeGkSXshF zr2q!t^6g`7$K3kiW$_}5xF~pF;Nl~zjfXwrJj=K!Xkg4*9bDAkyD3g{fQy0!{_Fm8 z>2+79<1hU$!-EgRS&nc~kifvj9W(BnvpRBkOD<3TBF=J%i-H4gZHIuY)8v`8bOt-g zF)j)YI1ldmQ@*S6(AY5eZK?i0Qu8q3kyjB+%H&c^m9K72mFkEEx zNfxe+7d~7`X6Kd^RckwhQzEMch>MIrsvLg%fn1&{W`Ei``m??r3KSPvIc&fdrU)1( zM}Gn1B5S8f-9Bl;HQoBrU*NdN>Tw}(KmFuR?uQaiUe{a#Tx9(`7~3HrkDmBjYdlV$ zh}(J24*Vx4Rx{x+(6|0p97dd@JN4urh$$VB!{*f55~oG{1m}TX_Be6W2(7029|(?tzJGG`GOSHJ&?Q;#$cKFmbJAADFmS zvkOdI>)8V)u9NHl6W3Yhfr;xhv%ti4o;hIRdXX7m;(Al@z{K^cVu6Y4UBv+t*UO3l zCa$-24@_LI>kgQ>-q$%Waf1lJ>ykI(22&(Tmh$`palU@* literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable/flag_flap_background.xml b/Habitica/res/drawable/flag_flap_background.xml new file mode 100644 index 000000000..4bd0c225f --- /dev/null +++ b/Habitica/res/drawable/flag_flap_background.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable/g1g1_box.xml b/Habitica/res/drawable/g1g1_box.xml index 3c098bd65..c122da223 100644 --- a/Habitica/res/drawable/g1g1_box.xml +++ b/Habitica/res/drawable/g1g1_box.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/promo_gradient.xml b/Habitica/res/drawable/promo_gradient.xml new file mode 100644 index 000000000..1a4fb7a7c --- /dev/null +++ b/Habitica/res/drawable/promo_gradient.xml @@ -0,0 +1,7 @@ + + + + diff --git a/Habitica/res/drawable/separator_fancy_full.xml b/Habitica/res/drawable/separator_fancy_full.xml new file mode 100644 index 000000000..4a3c54fa7 --- /dev/null +++ b/Habitica/res/drawable/separator_fancy_full.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml index 499e18b04..02260c724 100644 --- a/Habitica/res/drawable/subscription_box_bg.xml +++ b/Habitica/res/drawable/subscription_box_bg.xml @@ -1,6 +1,6 @@ - - + + diff --git a/Habitica/res/drawable/subscription_box_bg_selected.xml b/Habitica/res/drawable/subscription_box_bg_selected.xml index 66e128860..2afd67ff6 100644 --- a/Habitica/res/drawable/subscription_box_bg_selected.xml +++ b/Habitica/res/drawable/subscription_box_bg_selected.xml @@ -1,7 +1,6 @@ - + - - \ No newline at end of file + diff --git a/Habitica/res/drawable/subscription_type_box_bg.xml b/Habitica/res/drawable/subscription_type_box_bg.xml index 147c40f4a..514a48d10 100644 --- a/Habitica/res/drawable/subscription_type_box_bg.xml +++ b/Habitica/res/drawable/subscription_type_box_bg.xml @@ -1,7 +1,6 @@ - + - - \ No newline at end of file + diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml index c3b4972b1..e76d416da 100644 --- a/Habitica/res/layout/activity_gift_subscription.xml +++ b/Habitica/res/layout/activity_gift_subscription.xml @@ -1,160 +1,177 @@ - + android:layout_height="match_parent" + android:orientation="vertical" + tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity" + android:background="@color/brand_300"> + + + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:background="@color/brand_300" + app:titleTextColor="@color/white" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark" /> + - - - - - - + + + android:layout_marginTop="@dimen/spacing_large"> + + + + + + + + + + + android:id="@+id/subscription3MonthView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:recurringText="@string/three_months_one_time" + app:isNonRecurring="true" /> + android:id="@+id/subscription6MonthView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:recurringText="@string/six_months_one_time" + app:isNonRecurring="true" > + + + + - + android:id="@+id/subscription12MonthView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:recurringText="@string/twelve_months_one_time" + app:gemCapText="50" + app:isNonRecurring="true" + app:flagText="@string/popular">