From 7a1ef8a7cccb91042c6781419633ff7ab16254ab Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 17 May 2019 19:30:05 +0200 Subject: [PATCH] Begin implementing new modals --- Habitica/res/drawable-hdpi/avatar_border.png | Bin 0 -> 1902 bytes Habitica/res/drawable-mdpi/avatar_border.png | Bin 0 -> 1254 bytes Habitica/res/drawable-xhdpi/avatar_border.png | Bin 0 -> 2390 bytes .../res/drawable-xxhdpi/avatar_border.png | Bin 0 -> 4109 bytes .../res/drawable-xxxhdpi/avatar_border.png | Bin 0 -> 6089 bytes .../res/drawable/alert_dialog_background.xml | 7 ++ .../drawable/alert_dialog_button_divider.xml | 7 ++ .../drawable/button_background_primary.xml | 7 ++ Habitica/res/layout/dialog_habitica_base.xml | 100 +++++++++++------- Habitica/res/layout/dialog_levelup.xml | 31 +++--- Habitica/res/values-w360dp/styles.xml | 6 ++ Habitica/res/values/dimens.xml | 1 + Habitica/res/values/strings.xml | 2 +- Habitica/res/values/styles.habitica.xml | 30 ++++-- Habitica/res/values/styles.xml | 16 ++- .../habitica/ui/activities/MainActivity.kt | 20 +++- .../fragments/social/TavernDetailFragment.kt | 9 +- .../habitica/ui/views/HabiticaAlertDialog.kt | 74 +++++++------ .../ui/views/social/QuestProgressView.kt | 15 ++- 19 files changed, 214 insertions(+), 111 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/avatar_border.png create mode 100644 Habitica/res/drawable-mdpi/avatar_border.png create mode 100644 Habitica/res/drawable-xhdpi/avatar_border.png create mode 100644 Habitica/res/drawable-xxhdpi/avatar_border.png create mode 100644 Habitica/res/drawable-xxxhdpi/avatar_border.png create mode 100644 Habitica/res/drawable/alert_dialog_background.xml create mode 100644 Habitica/res/drawable/alert_dialog_button_divider.xml create mode 100644 Habitica/res/drawable/button_background_primary.xml create mode 100644 Habitica/res/values-w360dp/styles.xml diff --git a/Habitica/res/drawable-hdpi/avatar_border.png b/Habitica/res/drawable-hdpi/avatar_border.png new file mode 100644 index 0000000000000000000000000000000000000000..ec93c25a1bacc9801d4bc94842ab9c88c69b05de GIT binary patch literal 1902 zcmb_ddo zLmop2t5H+S7_U*JnHcZK%w`PxYddGR&Ysh@=j)Hxr^ zae3lqs1ox12zM(3ZaMXmSnr#Va8>jpSMKEeT$&eIxiC)es}v>{=Wz}%{O zF4cHp_>7%pfs=ypRpLEGjr*z--oYl%<24QmN~`AI zbku?9L6_=BA*>3yht!nh{y@1%H$IJ^%aIS64v95OU1_8)V2>cTP~lwU9$7GHzwC($ zgGXpTAM2ZXDhAC=i+#_U?01OQ+ME3pwG2zfG%2OC=h*J}ZXVHCl@xB(TzP4XSFZ?} z78+ul%Pv11XJu`-Ob%eDw=E5Gcs=Wr%k|tFbjn?g4(fDOl#$f*)xnw)%G=^wj%x!$ zLc&~Q^8@5UKE;wwd|y{CAD>5YZ&QuhAP0dm#Wb~ArQp4D9RV#@LDtI&4k>dGsBxo# z&m01cwLo}iHiE2WBD$5#VQ??GhdDcW zCY5Zrw>vu`k^EmRqDWrG=$ikrz{}E}lA}m z$J0L+@?Bdz4qy+{G_)9#KsM>BJemoz#u>}zhAALQTnwjtw9r^w>Q#I$6c(N?EyPK{ zy>M^IIoe>-r_geq4{-Qcpw*Vo9^y~xlOrI8f>nX|cr@ScLx(tKg-LKi1)^p{RIi+a zbu$8D>=lqhtVf3zdfGFyC`EX-T4hILgUEKxl5Rq&I}fGaY~}kx%d2LG${%MqME6!`~+}vD9xcXU zUGT14@!GiRz5@B%G`ES1jK!qgaqo-goc&ofoptST)Fcxq)0L@iG4|qeO`o=%Udx0d zG=MDI;C(B#Y+IAvwyeFZEf_N2XwpGxozXSZ)UrL#Qu`YLbZ8c3$J5gvjccfQo qDwYv^f*FUui1^_&wOE9_yowsfrUgZe!rg%Z3c?(6wXLuTBK-m7EL;@; literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/avatar_border.png b/Habitica/res/drawable-mdpi/avatar_border.png new file mode 100644 index 0000000000000000000000000000000000000000..a93bb23022ebcc2d0083578ed92ab5d71f659930 GIT binary patch literal 1254 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/avatar_border.png b/Habitica/res/drawable-xxhdpi/avatar_border.png new file mode 100644 index 0000000000000000000000000000000000000000..7c87ea2642d621f4a016708aca6e58f4490926f4 GIT binary patch literal 4109 zcmeHKX;f3!77j58Xq9nkse-5!QqZ9AN=z*#ATu#cJ{bZAYE#P~2qCBi5+b#hf;fO+ zq)g8TJY-OYFvT#eDzynD6)*?{v0%U$CJiA8kmQ~8N7wt|k1q7R*RItccip?r`Od!k z>~DX2pOfi_^VqcEgAEV}WRsVtYXAhI6$qX%-SuFEY!+SyURtC84;M%sce@Az(f`rQ z)%oaIt=TbNR`^L%odp?--ecm@sJCnGqF-o`*~rB02X0%FKZZBY3cnTlv3O}{LhPkY@*?Iog@oFg_vhX{&=6^6MgVsnZ@ZT@up z+)7OK%C_nqSsr7Oi{+_g%_3s0n00BGH?9(}0%NL9m^)alOjJu*`xRLJ&5~mit52Tq z=|D!$b_mEqVI^;5@p3ledr^E_TL!`0yf}=W94-@&sOtq`-SV=JsoZSINsGYL_|#^3 z)mRAjR5#xz9YSk_mtuJnA@x>Jn3Z)Y*7^*4&yC+TdPNm|R4wJ`b4xlGSXDC%wuI2t z6q^_Z4oWbgNv4q$iu|IlFr3(;=Cx-6s zG6l?f>cR(L*L1<;E-m5*dURue-&u+^_S^*~zlG&RS$>WK_^;FLk68QxjNR=RBvFg{ zGXgkc$0!NG=1o(-#-j3>&_kQr+A0^2a$=LwI{4nXG;|N@?Ts;K_c9;Jp6w**0mhKQj!Vo*QsqY1@28* z`Na&2WlbG<62a0JXt0~LtLly1tid4dgh?<#fB83c-ple4Mvxj0#S(jgwSCsK(Su{c zFVR8GFQ3{p)-Ttm+=(ry3kx4ZziuYfNgKC$a5rgi4m4rIj8$`!%CFrM=BDxEkH^Z| z^W{I}$zQkSqR=@e&K)FKo8DmP(y~*no$%8Z*0BD&qU5dYJbPc8Ka|lys%ExQJHx(o znx6cT!wqClwGX7fS~dTcqg^BG3JNv(OMUnK&pTpGEN% z`=EHI;+H@fc`GK~&GG~8G^w<7UhonzH*U8zl*ep6y4eva{^3~9uWj0>l{FBavqU0R z&(+$4Ln%|nP8P8rKUVIJ*R)S&!gGPf4+rC51Sjq@AF+OUmaE^_nvMNgYwMdR7W+8K zhCXtFGX$rcBL4gBbDuL!8h=>SUZ;}xp^IYb)R&N($J1KO9UZ;_LXn@}P(#%oKZr+m zK5ls)k6$mnjHC|nI>*>IG)abo4zt>MeWM!zDLF?<#m8S< z^PNJ@T9@4iW%Oro$k}VAk*=k7UX+oyhV;E!#F2hYx5Wft=vIHh-gQ7|m-q`=j^g$? zSEuM&&ZHw_s?rUGcBD_FOo|#&MZ2v-%?BdS-s|tA2B=2K<;8>TD@a+J3cdKlWGW?w z5}GSX8t3_z^oh2c`d3JW^Ra32+^X2wHpw)lS@{TmrlR4v*mA+m;OsO*pMVZaCX}#` zGyBU6ZXyO$UW6I-eRbqA-4`Wa@K+q^gb}}DPj_>S&jvhO@RuDM|8V}$xmbiusXZ9R z{b!ni#p&Bn_To_m>i{^j8~Rm{P`OLa>0MPD-~)j|*#xNMZWuaOh#k?zpGQH`z! zh6^3OdZqF);HZ2mtQ9&~Rmzs1obVD0lj&mOck`FJ8&Ov?*o&FQ(*79fskTHPx7Rh05k9`dzOo Xh*bCQM!Vg>{T|}whI6fRi8%jn@yC>f literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxxhdpi/avatar_border.png b/Habitica/res/drawable-xxxhdpi/avatar_border.png new file mode 100644 index 0000000000000000000000000000000000000000..5879226a5568f73aa46afa4f0fb4afa28ba01265 GIT binary patch literal 6089 zcmeHLc~p|=9tNXAw2{ih91BfTyQb|~ES#HyD%XKO>buyP+GDP%{bThf7LX(-A zHBHBD$SpT8FWDp`SQ=;ws11^pVj`Fea=(wxz5mT0w{x#&<{bav@H@}>Uf%b6cz)0O zyzf;{ch@xt0|W#DS#$J=vo{0+WdWaV_$mOw>KohyzMu)-u8xo@j^P*tg33DTeCT8f zbX1O^$C@HJ!{u*}S-0>O>8Hk&kZB1IFpML-BL`5z=(yO$bUNJ8Zd}zyhni~>y)cn=FL#ChP7&Cz}kEtHY zHi~PSQc-B!)|u>p<~?@R_(kVX+ih6F%$$dclLdilxcU!?Yox9IO%u;uQ?IN@mDVxh zGaiWW{Yx^ds3|1yEL=)x{RVi}Y`J9p4eWGc-osJml8=Z`EYuMGa z0LBv$gVyQWu`%Jmvz8Ul;3!2}_pg;odvvX&6uJU2{V%7g@hYU0;ddMfo~Ckt)E6* zl~-j1Z^AU;>MTKT(}iKj!09$UsokP@>dnXW+1IFj^S%@s;d*L)>hoUfXX!e;W`K^Y z*Y<-RzGRb+l0wngq5!=|_3)~WY&5t=IVy~0_sr6w0)&iyO{5Vn6zNG`LDB*kKt}rG zjO$zQHS0kJj7pHJ5hwsP>VBNz7?V05ZjQ@<5D(#uztOb@P+ZAbD5-Bs(d7; z&>|2(GjMDT1YJB{SOhY>3Q9WQ`2;{AMCwZ2@7V)3b|8t`0J|j@4uJ!$v@BTEhS(%< zetnqk2yPhE11vz#lWY|$`UuXy6K=sGwyy*S)^0CBo?2e`UypI(7-!P0=X{+zHCNh_ z{zd{eM0!BS45+}2wx2Zwuf7ekk~(wmaB>OyU7cXxfieJfwq%9PP*{RHhA z<+3Cp__*2G1o7qM@q{f57xgj@qn_YfgDnQcCqEB~A1BQnZ@_S|3uqXBwfKycIDQ&B zP&fF#2C)la<_bPv2JiK6>_yiaU}DN+ru(x=2Q)>dN7TQx4$wV|z0UxANfyu=gU4=y zFT4zYB_}`0A{~78H>Zh@E!4*+qx`+p;@SCkoa&S?!0N2YCBKl& z%MTs&cWbm~=3b8B$Cq=rvEWo~P^>v-o)KbiLSNM9w#vsZBhY#yrkC@K)V+EHaOd?q z_>o}SB2k{?ILo6T-OKP-a&n7PCimrSu0GtyQINPe~%c!4pf=P?c<%JowE}Gdv~aP7uJFNk55`Zr}fNC>oCJ%fs0))0E*3^oz{E9L%}h+X^iu&CxGg4Asr0?=+;4Un-5EeK%Y~ zWxpBQBbc+t7OA|@`FVBuY}tojpC?&0%-wO!34H;+QCpje)rpxfxb3z=m51{{!i9kUNPRU>*ICoA^PtkhtiI_jKoZTXU;T&|siWK(zn2hPC_EdkDH%{?lnbq;uReaThCwJW0@?Z^-CDRbq73+B~M zde7#?m+<@>;2N@|F13?}0Z#hUI<=E7!^@mNHU2k(Af7w0?a41~*hL?LfAs8PyH4NR z>uzphz6irto}*ASMdyV(Uo&9i$szj1pZ~#2zgrA{*=D0V0(YybnF_QLN0=DO`%LPi zXO*X!ak!AZQs`66FkLYZyM>>NkH&K6SxKhoniOMBc&u_{@C||Tdv9|}PtcDo>GFCGP$<{Du6dwZbLIwxq($e=Wx0G~A3w9bpn)=&rnmy+ zuZr|h_E@lWA4zA^g4@2abVF@tFmqf3ZuDGw2i2B72Gjk%slb2?HmBZN zPx7^&8?(Xsm8JzN(Q+RW+)1}@DM6yV5_G`&{(4XHm`{`uP$K=DamLp7MmK}?5%XUr z3Ac*fMSVgpf + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/alert_dialog_button_divider.xml b/Habitica/res/drawable/alert_dialog_button_divider.xml new file mode 100644 index 000000000..3dd18f44f --- /dev/null +++ b/Habitica/res/drawable/alert_dialog_button_divider.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/button_background_primary.xml b/Habitica/res/drawable/button_background_primary.xml new file mode 100644 index 000000000..609b534a1 --- /dev/null +++ b/Habitica/res/drawable/button_background_primary.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml index d33b4ea8e..59cca1e63 100644 --- a/Habitica/res/layout/dialog_habitica_base.xml +++ b/Habitica/res/layout/dialog_habitica_base.xml @@ -2,46 +2,68 @@ - + + + + + + + +