From abbe516b3a69dd1f883c86ed4f111d71e19f07a9 Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 14 Mar 2023 17:41:25 +0800 Subject: [PATCH] =?UTF-8?q?app=5Flogo=E6=9B=BF=E6=8D=A2,UI=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 +- .../app/avroom/widget/GiftEffectView.java | 4 +- .../com/nnbc123/app/base/BaseActivity.java | 31 ++---- .../app/home/fragment/PartyFragment.kt | 10 +- .../app/ui/im/fragment/MessageFragment.java | 2 +- .../main/res/drawable-xhdpi/about_logo.png | Bin 30825 -> 0 bytes .../res/drawable-xhdpi/ic_gender_female.png | Bin 854 -> 866 bytes .../res/drawable-xhdpi/ic_gender_male.png | Bin 924 -> 924 bytes .../main/res/drawable/bg_common_cancel.xml | 17 +-- app/src/main/res/layout/activity_about.xml | 8 +- .../main/res/layout/activity_bind_phone.xml | 2 +- .../res/layout/activity_binder_alipay.xml | 4 +- .../main/res/layout/activity_create_pk.xml | 4 +- .../res/layout/activity_decoration_store.xml | 2 +- .../main/res/layout/activity_modify_pwd.xml | 2 +- .../res/layout/activity_reset_login_pwd.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 2 +- .../res/layout/activity_wish_list_create.xml | 2 +- .../main/res/layout/dialog_attention_hint.xml | 2 +- .../main/res/layout/dialog_bind_success.xml | 2 +- app/src/main/res/layout/dialog_exit_room.xml | 2 +- .../main/res/layout/dialog_family_join.xml | 2 +- app/src/main/res/layout/dialog_mic_queue.xml | 2 +- .../main/res/layout/dialog_patriarch_mode.xml | 3 +- .../main/res/layout/dialog_pk_mic_queue.xml | 2 +- .../res/layout/dialog_protocol_update.xml | 2 +- .../res/layout/dialog_pub_room_shutup.xml | 2 +- .../main/res/layout/dialog_recommend_room.xml | 2 +- .../res/layout/dialog_room_pk_received.xml | 5 +- .../res/layout/dialog_select_pay_type.xml | 2 +- .../res/layout/fragment_add_user_info.xml | 2 +- .../include_dialog_common_ok_cancel_btn.xml | 4 +- .../res/layout/item_decoration_common.xml | 2 +- .../res/layout/item_decoration_user_card.xml | 2 +- app/src/main/res/mipmap-hdpi/app_logo.png | Bin 19431 -> 27651 bytes app/src/main/res/mipmap-xhdpi/app_logo.png | Bin 36196 -> 41065 bytes app/src/main/res/mipmap-xxhdpi/app_logo.png | Bin 76384 -> 77773 bytes app/src/main/res/mipmap-xxxhdpi/app_logo.png | Bin 112489 -> 117283 bytes .../res/layout/dialog_dating_select.xml | 4 +- .../res/drawable/quick_pass_logo.png | Bin 30825 -> 46670 bytes .../res/layout/activity_room_invite_fans.xml | 98 +++++++++--------- .../layout/activity_room_newbie_message.xml | 2 +- .../res/layout/dialog_newbie_filter.xml | 2 +- .../res/layout/dialog_erban_update.xml | 2 +- .../res/layout/dialog_update.xml | 2 +- 45 files changed, 114 insertions(+), 130 deletions(-) delete mode 100644 app/src/main/res/drawable-xhdpi/about_logo.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d2647eb79..a98abcbd9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -404,7 +404,7 @@ + android:scheme="yinmengpushscheme" /> @@ -461,7 +461,7 @@ + android:scheme="yinmengnnbc" /> diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java index 63cc1f207..20ba0b0b1 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java +++ b/app/src/main/java/com/nnbc123/app/avroom/widget/GiftEffectView.java @@ -140,10 +140,10 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback { ImageLoadUtils.loadAvatar(receiverAvatar.getContext(), giftReceiver.getAvatar(), receiverAvatar); receiverNick.setText(giftReceiver.getNick()); } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_ALL) { - receiverAvatar.setImageResource(R.drawable.about_logo); + receiverAvatar.setImageResource(R.mipmap.app_logo); receiverNick.setText("全麦"); } else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) { - receiverAvatar.setImageResource(R.drawable.about_logo); + receiverAvatar.setImageResource(R.mipmap.app_logo); StringBuilder sb = new StringBuilder(); for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) { RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + ""); diff --git a/app/src/main/java/com/nnbc123/app/base/BaseActivity.java b/app/src/main/java/com/nnbc123/app/base/BaseActivity.java index 6270e0f1a..1eed0e1c1 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseActivity.java +++ b/app/src/main/java/com/nnbc123/app/base/BaseActivity.java @@ -214,7 +214,7 @@ public abstract class BaseActivity extends RxAppCompatActivity if (mTitleBar != null) { mTitleBar.setTitle(title); mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); + mTitleBar.setTitleColor(getResources().getColor(R.color.text_normal_282828)); mTitleBar.setLeftImageResource(R.drawable.arrow_left); mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent)); mTitleBar.setLeftClickListener(v -> onLeftClickListener()); @@ -238,7 +238,7 @@ public abstract class BaseActivity extends RxAppCompatActivity if (mTitleBar != null) { mTitleBar.setTitle(title); mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); + mTitleBar.setTitleColor(getResources().getColor(R.color.text_normal_282828)); mTitleBar.setLeftImageResource(R.drawable.arrow_left); mTitleBar.setLeftClickListener(v -> onLeftClickListener()); // action @@ -260,17 +260,9 @@ public abstract class BaseActivity extends RxAppCompatActivity * 设置沉浸式状态栏 */ protected void setStatusBar() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - //透明状态栏 - getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - //透明导航栏 -// getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); - } - // create our manager instance after the content view is set + getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); SystemBarTintManager tintManager = new SystemBarTintManager(this); - // enable status bar tint tintManager.setStatusBarTintEnabled(true); - // enable navigation bar tint tintManager.setNavigationBarTintEnabled(true); tintManager.setTintColor(Color.parseColor("#00000000")); } @@ -281,17 +273,12 @@ public abstract class BaseActivity extends RxAppCompatActivity * @param isDark true:黑色 */ public void StatusBarLightModes(boolean isDark) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - getWindow().setStatusBarColor(getResources().getColor(R.color.white)); - } - - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (isDark) { - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } else { - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); - } + getWindow().setStatusBarColor(getResources().getColor(R.color.white)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (isDark) { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } else { + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); } } } diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt index 793f974d3..8faf743f0 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt @@ -1,7 +1,6 @@ package com.nnbc123.app.home.fragment import android.os.Bundle -import android.view.Gravity import android.widget.TextView import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment @@ -13,14 +12,14 @@ import com.nnbc123.app.avroom.adapter.RoomVPAdapter import com.nnbc123.app.base.BaseFragment import com.nnbc123.app.databinding.FragmentPartyBinding import com.nnbc123.app.home.HomeViewModel +import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter +import com.nnbc123.app.home.helper.BannerHelper import com.nnbc123.app.ui.widget.magicindicator.ViewPagerHelper import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.nnbc123.core.home.bean.HomeTagInfo import com.nnbc123.core.home.event.RefreshHomeDataEvent import com.nnbc123.core.statistic.StatisticManager import com.nnbc123.core.statistic.protocol.StatisticsProtocol -import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter -import com.nnbc123.app.home.helper.BannerHelper import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -82,10 +81,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList homeViewModel.getTagInfo() } - private fun onGetHomeTagSuccess(info: List) { - val tagInfoList = mutableListOf() - tagInfoList.add(HomeTagInfo("推荐")) - tagInfoList.addAll(info) + private fun onGetHomeTagSuccess(tagInfoList: List) { var changed = false val oldTabInfoList: List = ArrayList(mTabInfoList) for (tagInfo in tagInfoList) { diff --git a/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java index 0c9422450..1bff619b7 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/fragment/MessageFragment.java @@ -395,7 +395,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi private JSONObject hwField(IMMessage message) { Intent hwIntent = new Intent(Intent.ACTION_VIEW); String intentStr = String.format( - "yinyoupushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s", + "yinmengpushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s", sessionId, sessionType ); hwIntent.putExtra("skiptype", PushMessageHandler.PAYLOAD_SKIPTYPE_PRIVATE_MSG); diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png b/app/src/main/res/drawable-xhdpi/about_logo.png deleted file mode 100644 index f5e532a892e4d792f6dbd5f21a697a90c16a6577..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30825 zcmV)CK*GO?P)RJ}?{DpWp`qEA1_6O6EgA)*Nem+5h%qiOW-}S{ zByo}_Fw9uzvX-0 zKk8Q1Ij8D=f4@d(7~ihv>Hghs-KtaPoH|>bTXk>Xi7X-k7-Ji&32b1D6IkFx;5ddH z69R`KY!H#vgfJb15c`231OkYL*SMB=8AjYExZjJw({%!bk$t)WRK1ABr@}AwlYl9` z^$~(}e}idn+myd8zBpWU{{}sx?k6~@NvQg{>xz$QJ`+>&RJZsmz;1+Xz!pL7f$)9c zR^VplxrKSQFvT{0js-&SlT?pToz>N&Kl1Z*+f$#G3>~ZS)xR-sW zU?Kx{a};yDG6c>Ao(il51}M)|{n~y;Iyi&!w*y z^I{E4Y&=H;hEn@#oPICnjev$%dr+-hID9HkmpzxptHskI?7cKrN~!TH16GDlv9%7F zM_l)Kxlq>&utS9Z$$-CRIp5%nu#3mBJbnr$vWyvCfbcs3&O~IoWqn6mCU?Kj8ZO0S zv|u(S%TG+7M`%xUF`c8}d24Tk!oW*^BF-%@yp)h`DNbNnXBDG_zc2dv6|04UW)eED_9H#&j>><1b$9nIa1bCQQ)lg>Jw^hA?>=u zj919$5g={J%fu>6?SGrT-MEc$Mo*|UBz_&}70q62VeK-5JeZfin&*DL`uZt7iy zH9$*flVa3#_t9#vD=(+%8Y!H`xb=DWUgPI^;QA#JL$2uHH~87YUx%>XxD>d3I7_E! zHY_Yr!IHAg0_>E9;d_}M{1;xvj~=UJ$YY~mA`{GTHp1Hpa&mxRvqY&~YA%FOPl9gK z7NDNcq5GW}TuoBLdn{$V*8QyhSwU-@q`OgteWF13(Xs@O?CX|h!P{+{{BO=l@g9A! zTW!e#u8iPFB_EymDGmGAe!bVm(6n$y7=~|2;LRMwKl98m$B$Wld<7F(!!G_q5Pk<( zvlx+vxE_n#jOWGJ$1)i@Ofuf33@q7GBnc08vWzzzjsK$eHU7EY3Fk;bSsb5YNE*WE zaP3C!cu)(rbb@aZAS&S$d$`cG#SbwtifP}Zo6zvMiNJRBp=HM#QL{GJeMiohZd0x$ zuodC2nBYJ2!myPeqx^UZHY0~4yf46+z}TXexR+R^9WIHHJcj6S3ScOZy`Y|YE42L~ zU=Hr^Ynj>zwAV@+{m?ts;uGBtpIXY$2oE!itO|x7(y<9q#-%}{frU#@pu)GRtu}Zr zVbN3uN1rx;O$DHm36Ha1TlcTk3#<~=^zwN@0-ph1$2sALJj(Lu6ig(ri)SIcKLk!j zP%F>cBE&9xvDRtSmq{8Scn*g7-4dq0F?+0~4S5>yny{_FEv7`Hgsc+gy)kHg^{$Oo zVo~?4F)D&=4cemf(&VY*wJ~mP-WA-Ik!TsiJ`XyQADy)j;adp*j(@{-k7h^6U~fAh z64=QLgUCMwqH;-R8O1zj@!6iy$|a(2)DzQIE-7sVGkGFn#;?hcB0rMG6gwVLCb1hQ z=(VN7IU7jnu5+7~a!G=$a1=am;@^<1t`-s<4M*6)^eYTeh~>75QKq>#K@1(-6e%Pn zi-H?GeXTh(yePLVPaPg*c;x{?=26fv9Plzfg+}kqM1sXN*PCA;ga9W8d;8U=+TFb%O_zU_8Je{3kCA$OwfHV`UFy@Mn6YqH%S?uyWV;>6(Obc@Uas~`rGG_NAAJq}YPw9{CXCko z#pkUfip7t(>9S7-KP%(wpneUT3`QKM#;thLCE)J_yfT!kt;Iuyh1G-O!gHN~NU)4By7{ua zTe{Mj@ii}~Go!WP^7Gv>WXQKaGG=-xL&)khs!dex?_2J}7=&VJ{iv>r2rhzgWqV8xK17c>Z@XpGQ-WMqy|Eq|$ zlFbyJ){QcL5|u4smdsAVAzmlh5f~B(oE*k@FCUdPo=?7vRxptXcJUuVe9jdNgEhXH zuu!DZSQ|@FCcbM?GD@mVA}A@YD8W-oSzB<6lU@JxggIJ3S{7B@KLyV!TCB_}kfi{d zB&_D!X74O&YR#x{6TN0pepvI!lV@RwfoH6{WU7iW$wpHe@UmDMZ=sbyXALtAsfXzK zX+$5YsJy20c=oTD8!B{d@W;zUuOTeB1%wwe&V~H7OtdkLWrTuBV1~219U5bvsoHRB ziP!0Q#qt_iC3xnhQm#U{WqP)H1_{l?QY`bj^tc{7SwtgXN}rm*G%j{P$pTq>lAy*; zFtYG!#dgACuU!&DCn!eti##nqTVXUg8Idw5f)hC9lSEB)iEPvedVYe!yumx4;y2ey zS&M?$IrLqN=L*)S>+v#-kO6u7k;3AJaUKisyBy3}j41tUupP27AfF+GQ#7IRQWUbG zV}Lt?fnuPyMn(_>EreAYb?v=Tstz(bcqqU2sQRVfVr^;J zRo)4KYU}qqY8VyVjwZuzbqnhCT#FVnw#L;xSWd+szSO*HZ*6n)+%w;c^0d(}j&1St zvSo~3wXI6SvwbX26J3Uu8wAecm%@)|l(q*G8Nl$53E^b2B`71MbgN;w(^Ws&nTBo> zjU{bbEHNFEM+^DB62z{e#Qh1T-<(<|y_K3)8SsXn)^rBdu&G?iN~SgmURi_GhA5O5K?6@yeReQXV4U6K~25X{0f8+GXIMa^1PrEVyB4RT^tXinnt^&f-81lxbGj(ZuuwC*qVaTTtR#wM@wYFC1O1c}qyv$4N#;A0v5#ia2cKuvnB(GL^|FM!5c{$|!uym=6Cu zW)JTwc!BM*z}dViT;({?@L(d#y2Fwy#A$F9BBU5S52nqBWxUDoW$%%cwe(4AxRfI+ zVPWw~)~ZLz)3I_*lENuh=Kqx2FSj%-^FS0FgS&>>K;%Cqd^W^1a4f1WhTcl?M<`dK zrKMbTA}tAfz(xy-&jvl>;esAY|6 z*Gr?Vb~)pvZ)?8WkloVf=e`<7&v#?9L}lol!4`8ZZCW~I*CDz`qE>i|UxR=U;O80e z^Zu4qFp*`5{0^|(JdZ$4fCXG3n2GGO9Ig9?_*klBL(6g~aOi(YeVP*I*FCCj5(eir zj797-Iv$zyM_LQxU~tu0s*o`(%t*KvoKw9GheNi?V%nKH$VN{Ke8f}JK_WmIrqn5U zSJl?E37K{cDsQGv>nnAwd0J%@J2cF@k{sV99Ey7A(_2&9feBmC~EUYXvUC<ERGr@ z377MfI^Zr!p%WH0Gra&8{KWjt_p>Z%d9z9%NK1`i<}&?l8VRwGs(yyTP=0Bp7nULX zHh)?&ie;o-a!i=#24I!s4lS!jW^kQ(D^|3xpZ}|Dvi&`(U;1e*+u~yjG~U^fgr)2l zF>G#aJXT{SMYDpUTI!iSsu98CzudZXr2)FI?XLlli$5h4q-vfTnYgIn5LqvDBa9Y<17vXT}vRq%}SL5skyO^;DG z2y}8IQCck?3TZu#;ZZ9Zv$Csqsr2LOU#B|~1B21%}LD!$HIg0*TEDK9pK$QobK zh^s464W(;n7t5N;Mm(PJbJ!?PQ{$P!)S~HPo79q|l&Cdfb=ten^A=v|VpX|*OrLl= zN|{p_sf}A^q26BB5|DgKy2olOnsnYqW2*(cWPgR6lJDA7)ES4R6{;3$o1C$r|hDvgMBZ_b1hCPxo5IBAkUcCl> zWlc8$33fw(3|v*8y|Csl@%;@tL~G$^j9-hluH?CO^O^4%7}gMIfh-4d3+|e~)-AK?^%(R0j@r!vLy00ZLg)YC!M+C7HdAkM>- z_`Uqi+MXvo7y`3^yRb$tyR}O$*GT?MX z!hkr(&lAF+m0iiFjzr__&qH;<^>Ye^XrAg&m?bDdb=Iq5QmPVh6RoUT8K4crU03)k zPDZ&AcV8QX+KLL~qw&=qJH@*_L%44q#seHU4u`A54#E9RbFLNC2vTm7@OI;x4qbHO zvSmmx{fh1sskJ8?%Kpy`N%0~ojJEQz)_T7*kCN{f`A+Z@EsotCL_=Qy%Nx@{nakneag>Ebz1b-D&hUl;H|>t_ zmJi^#$%IrxIU0C`5o?xel`M6i7N7MRHO;HuIBn-vn*l9iQW&jp(pp;_UQ#$4656Bk z!4MIgl6!SSuxokEh=!r74Q_1|NynI6zsfPFaJL&T08is^Ru2el2yl!Yus%gx0BU7% z8n1=d5TUG6LxI!e7z^a!nRSoK?wOOy9l?hEY7D;(%Z}#-ywEmA{D_%`cg8aK^pWt% z!{LQ1O2tiIecV>)^7(;9Um=HjNi+zhxd)45Al0dRz-(K!2oQ16m zksT*bmqdpa_)37PYy0d?obl@G>NrKR{QZW<;Z}{49(H$Fih~*3;(@S?At#Kpz=I*}sL*S{C@C(b}MJwR6X;?jo3UKy{nEiX{ zU9bS$H3#zo(*cf{^cJqoyL5f`96T@|*I*}3!33}y8)ha{Th~q46+eX41K73@Y9UkC z*#`H`v6czNyA)BB2lv77*1qLSfosfN!nok(1v}yIAgX!QuU49f2QnU27Be#tU%O5}CcH0h|vo`R?L*Vy*05|Paf+-4s@`8&gvseDw zBlrpjqXSw5SW&2yAdZy?E_fQ6b)OE3_dW(5if;)%Lht!Djd06=i*DyR(aoI@ARIT& zkYh|k@l0q5yW7-hgkLdZly@*sU{@veT|SR7}eW66RDLy1bgATaC(c*Xj_#mB(vG5E71;iWeR z=A>9x(O#m%&+H@YFtEw>Vm$q84r(t|a5g^2B&32BR4sSumNNn#=NR=U|I_2qw9!cK z>PYVzH8PrcgM){?&N5zPG#bEQ@q}Z>2^^XgMj;rrI}vBCO^^`xd^D_Gc^_X^g{HL= z-IkCUTt-UFEWJgyZxPqiSwh@UbM*uEipwzF0S{>QeM4ZM98er7owIuXOX_GFX^NrE8)-`W)?b2`9NCgJ*- zBz&5Gaq0#F=dOi6Jv1u&Ziz-&Wm@H4AmdH~mLhYRnB^~L|x5k}&F z66YdxTFDFFLkJb$HGM^vl0vp6!76n!raIPfUe^t2{JX)YHVQ_z^>0x!C-wc}@f@vs zeE;a9YZn5Cjw5VnA(%TP?;)nIQm7Weg?a6F*Y_RKZ`W(@W8HI7V#(HWRe%p21Sd?u zLqmAsJ#gzBS@{C+>Xm`R$K&&D=usR(01^-C}& zgYfpl1IJFm-LvqUw?_}QY!KIf%R}^5E5~9+b9x}$Hyily196QQ`EGX_Snp62z+2#a znH9+z%sh+Io|B|p!NK#2Ta`2yP7bo1Nki`Xl)=n{m0i7zX&ab^EE_qgJ+J0RfYsw6 zl=ENysI&!Q5!T4G_W~-*)w<=1^?ue%J#`}RZ>ELA#{+MD1hx*9(4f5~Ja;N87DS=_ zjaBfTM_^mtViUM^E|N7)Tt5xfB(%KgkieBY;rG`^AwFXnd}Su^gW1@35Tb%b_)4f^ zg$q$)*&}en4E)?GII&v;&J30CcI`Kg2c9|&I~L#%?}C5XmcgnpNb#&8WQMNnY0{6P z9NBK0gqKf#)mFP!xmJi*gs}3UBm)a}O_XkW=(eqHRrh#4=bjNoZdK)x)>EAy{%%wOKTG(VAUsED{(a@Q$_cpVtLmzX~o|1LLBE zM!}m3@UzRJVx{U$6L8+j4sKU@*BtEZ6yqtA%8>L}FA=z5Ps|<;fafoVafCbOC?0GQ zQb=M$skVWc7x?m zdT3_D#xXc`GG5=f2k!3_;EnP_8J@La*@Apf3wt3~! z233<6LZNG5AUNeomOcBjkQS|a(4Y=1=9(IjPFRZNbgPndUxzu}^llxN@umV?v<^<6 zOl`{;&zOXR#-dmGyY28lcgEW%Pr=VGBQxy51=z9>>Dx3BpK%ofldi2m%nN+JgLn7@ zJar1@hH!89{A$yrdjEo(08^)C?WSFE-8BgC^ksHjZ(XY*s$FXib8%t1Q*y72aTW^B z`HfR8#Ze=a%Ay?UZ!*As7f7JUQ|q{n4YeC%8^f&yh5W=e5NT(w(y;0nMQ#(v)(R%TA!G304uC@kNd+T; zXD$=QLrh`+ubuGW?XmB4fL~o*o^|aOxN|PTI&cgQ7@%=8Z8%pZy1>(Ib>^=GY?CO+nIh@d~lZFD{>pai;aX4tq3Tqr+zfLV)-?$roI2YSJZ$B~eGE?QejGZ2T&koF^P4 z7p@ydf*i3PR!bRF17n4>w6qwN$7xUgwqfb|=a0Y_y5zviR=^wA#D~16PQuaSvCTiv zL}lC~@V;#^3|lt_uUQp^Sb*=%M))g3%p_(s6AD4IDq6_dA^h(hvE~`eqC(x(B|63f z95IoYU-&qVuwe{-Y8jlr7XIuoxZ*hYr{kic-?Ar;dDujR7wMKVsuM`NXz#{p88)$P z%F&C0pI(RPL$+?ke$xGx8MVgJkp--e001BWNklF$4KJN(YNn6Cf%m2gL=sN+Nhn?yKtGH~)VoH`B9SROcj z3XYtNj}Hc&;_e*6x^ej5kHnqz*X@Aq3u!z%nc9HqFgowy^z$OAtz9#Cp>I7t(CrJ1 zV&OfX5?&eWK6o9*)|;f?J_OVK)zh>Q$`ujL=D?)o?Q6BwUp2{jYn3$GR5bZV7l|Vs zrmFq8>SY*^o~@+*`dNZya8Vu41k*lc3v<#Wq#o#p0tuBexx$WN2_@GK;EG*v;Y09& z17mvoT^nGbW6*7LaLa6A_)g%Ghv6>|hC|2U*H#Dq>qBt+T+B{R4x)lp1_D>t;s4c{ zn1S3d4ri@||Nc<%U~fDKF5DP6d;(UDMdcl+c@T-~!+U1o%R68?2>7wil_o7A z(fqaHp!FO@fE&tV`Xvum3rd=M4Wo!q*>_h2*ck-HucZ7M)sP_eojRy!Y2%;4Bzjdv zPH>ncP1*WqJx@^JY*sKR{uV=K@$&{x^I+UsjiO{(@RgP;HB#Y4&0M>~Il*?DOcjFd z-6O@0Y#XMl?s<{GCwIW+N%-S+aKv~4ckOO?ctOK~%XYvY&&7=4Z?1v&J|f&VAK11K z*G`)z;*NH%OQwP4qiD>WZz1XPtQzl4tZav)(#e?~y12sVX z452@af!d-afiTnTtaCxP!$xf=O>3}0NDpMA*LeFwaa+_ct&BYv1U@?xy_v@8fd%;J zHh9wkaO@*vIQm=9Tn=vU2yAe;l4Sw+ueBQRM84AQoS`e-l(l)tm3NHvD4sQ8 z=#i9SCZ5%MAY;iMtOZb8hkQaQ0axoN@5QS4zp0EC!LrpQF}2*^rq*Dq2ZdKNz#AWo z=ebUth~eQiyYv|G?-2ONHu!gIV_N>#*T7}lqk_F)MSQNcb^yx)JbPLEciJ*IekyL_ zT^`EXDS@67`0o$Gw|2v~cfmhyjh<}FTs-eJOpD}(GT60~@Hol3=P?}+x;5byjr|*9@5CS zF$ns)v1B3m$-5EM{{t) zZn$m+zOqyJ+Du?UB8}J2Xg;R!NKdHU-)F;bOt@l&+K9EOQ@%%y-DkmzV%j!FJj{3& zx6#*_c~!W!JV|$Ljj-mI_OepRM3Nm*TyW;87_vsmCqQ~aPtAV`6qzor!|={V3HDkg zIT8Wdvox5~$1taWbr@OJ7KH#~Lk&Fba(7ES_cR$`O(*%HN5wDqbKz2!X$ z-I)_o{u>wJg3xx>Jjyx!dubG0_kQA3mEY$=W&q0P~zs?Rm2d{6PMv? z%YzS7;mR4fY9{XFxO_WYJp+GoKm5^#_@0cf?t-uFg6nq)ch3bLniuAzWH3FAm2es_ zk;3T)ec9NE7L%r+w2fX-K+yazk3H;*T-@eugMSgG)?CJs-ONd7@>gNeKJQn_N$tsP zTboELJWAoS@^tE9cs5Lm{!#BqY4Sfu8Hoe#1v<*m)pT`Z1qk6sN_={>(PtCQv#Z{I zrN6cEi`AQ<2?*;3fol(s&%Hjm173Y^=S32C9HS#`B^=Xut{%i^Pz$PlS%A5r#It5C zK}&e`T16#>F6-BBUr_IR2H3i8zBi?TN7X-}BUV}R8bZTWF#Vbjuo+HGV{`0m0*bLU zZ7h$9k_hQbFFvG|u3yC4C+0Lhn4(Vxw2k^A9yuFxZ9I~(=~w9S{96&Bc~k8s$Sn60 z?G#3}*Hjc`ZKr7q9_5hYf<&c&xCYaftRPV=bgq@!%5EDbMil&aC0I&`3_>V;8;X-g zx8a4I1oPK$(4JMwN|50OO3FG^LT`nl?NO3K_X&`HW|V+y9%^zVrLZ8dqr1Om;QG6?3~kbpuvX!k%@Qe|Rbq4_hWXHKV}} znbG|hYwNGm?>-nK;KlZ`xRN(v6rO9D@%;wL5?f}gcvZwQ!nwd|@ao#xaB<@_kTM%j zx``SRcWMl~{)JA3PZB{+oJe;EkzA-Pu3x$?=fTXN8nfhD)2|WhjeO~Zu&MnThF6mM^lN6O zVpNKQHQe;@QOko5FMQ}@4wYi#Zt)XRg`!TN^?0dkCa;WGO{kL4R+t#nD-A>gb;Zk( z#wEh;i0fICh}8V32k1@^t9jFF7X5CGYPlxqoiC`qDJxivjls={labeMeJtYSPRB2m zd{_}TIBUA4Knd9ZTDg=CkilQI85r4D00UOW<*wpa!avPZEePg3 zV?#~~4@yOj1e6@-FUkPp*_unzZ^wA0#Tr?^ZKqymr7o=pbV+I3A)=1?wPO4Dx|ycV z-0{~T3rb6X^krF#7T%;gEul@Gw1TU9G?zlCcy(u1)B%iKV@EolX|3a^ar{#OR4DKv(g-8L`3WZ|53KII5pa?GuNPk~6 zCT)Ct=@In0jZQh2y=H#AR#@v{n;xw(7rEBELV~MnDX8X|=Cf6(zJ7Im6Ms!Nwyqf> zx8}o*muIuWBhhc6iqO3u!+9nn^nH6ci|iSGHI$@(enRuwhU?VhOEJpHSPlvzQhJRN z=6v5;3f;YGuf|X5&T0bvZwIJsjO{F}dwh^W!P-oh!6VwvqE>WuZAFcv+O&2Qh)ysh zI(3ZL;#b0@ug;eqC4tU7RBOC4UiK(XpiGF~FsOyDHjGx*%+Ghk&)wI`+@MhlZRK%L zhPfuF*MRsWSEkK_Z%mV^aB^acazI2S8^ncR68Yc;Dx>M28CW$y7u&ZKG&8T~d5DV&54GpVe#un2jTR65c;St)yB`bOAWgr%jF4R}iN zjqo=3Wetv0?*W%SCR6~*rFs`%@l=_y4@^Of2r z&!*?rd&2a1K#N9NCUuw=m<{D_M& zpL~$Lcb7+kn|nFBN6|uWKOZ`nd-NRLXk1sk&BJyEqM>MIgK^=R=aGWk9FwZOr=f&A zOFDz5e~afqtqj5AJ_@!oQhIqa5~oJLQM4{fV^gl`F$TUvvO@j=pVs1jflQ0wJZ*NT zvMD8G^I?Gr73Ch&7T)vP_}N%4l97t@b@3 z)2LFl(G_l0r?^{vKnBq78YvSN40B?&2^JMmS`i(1p(vy1x?*^0S^{MYSXSAhJS2TD z(x=xTUKUc=l1FSkQ^|8b;((;+wqoyV`W)~4wZ;j}2ldlNFwU4}r5$Ckx_hD31|ygD zzFxlH#p6_OCT$D27FK&$uRzMe;$n5}`rB@Okua}o zQ!&c4=?~x9{79F|5Ge+=p0}BYoDDoms8^J{Ra79IyZ4V*ymd~QSAx}DnDEVx(OXo1 zyN(Ubd9mKlEar+lHE8kjm*$b}uOVrv^h=YTYw9Ib&EL?y7gJl;9^upb z%i8gJ+5gvat?6Ucm4(v`)TiJwFxyt+*^)zpS}{sRm_2T;J{rrG$tspwr+*Fn2HoYW zA7a~>iAf%-4vq7dLo}Yr()O+GQdKusHpCRurG(VU(@EqS;IBPi;+stNn#K6jHu-5L07Gceepn32}QQKpb zjktCVk%kkz2W!1CR!?%=(qx4%+o2?cj)XuGb|q*creAUQHm28MP*Ox~6Ecsq@+8Z< z#6$;(V!d>qj4B?c@U{)FHFkoPInWSJlLzf+tqhGQIdO)svPKO{43J!{4}j>-?fIK4UCy2)vwjR5=bq4dJ;4YYhd!)O1DMxRPjO$ zmJ=Hpwq*SL{3P5mnX0}vidN|i4?0{+gjvSd@}rziH)f)*r5Js3r$%qdF0J*Fr=`f6 z`97PQs}g?O=W1!}{DsSSGh`yGwNl6ZddG1OvWiH1rb;ysAI8+gmdSS^k^bieTr)uz zMSPH;@E3!+|KUNE>|wY6MNPiRlvRS~6vkY;2lR=5X7DmUc3$+ovbZ-0X92c`OA8aA z5^!R03l9Hk%`T#FQr#WzS|P4aLSzr7jYjvsF)OBV$)EpJG6&<1=BpMZ;B|~@N zb59YZ@r6rlB0`fczTR60ji9QlCOq}k!#4W)$*+rY>eT@4wL+2oqLf)VwNfdJD|(ay zCxH;OaMa9iQlVv7ibb~}Yfx<)9O(&n{hPoNT2;`bd4#^U^OH9}=ee?T?|GElPz1Fo zd1E}U2??q;mLAt?JcVlmx8!XUWeUdzJZDs_(`kk4mX<(heBm-PL2O5{_bUQDqg?kw zyk&56qpzqw3YZQb44#c^UCe6$n!@CW5hXy5u96kh40eYULx~2g;J8pj@uf^(1F4o! zdmf9r=m{6Cl_3jF1f}~p{QTHvK!?A=Bd`A|Bj8A_=N^o_VA#26 z;}q1`-bAMHEKj}h$ggcHcT=bpEF4@Y)sh2$qah5TT3h+H$q6f%Ipvz9ymZie?9AFs z3mg~)5Y^A)S+6(UIku4K(1IKaPTGQ)iPNEQ*=QP3)!ERt=QVBfjfV0RKWdX3G!!)T zNJ`+8Dg#mNjX`J`ppIYVt(F?ahHPYxC>(ul=A*(f=sm5iw~ARY@Uj*t^N?}N8OOGq z+wec7U)=0Fg?-Y1*r8R~lA&cR%?5Pk z7_^KID&}Rv1T6>|;f8XhK2^BmCfxV4$H-BF7))240&k6-!jTj+*GE}YxY?j3=%F3n zKGxR9@M}E4WW+j4R~ducPcuJc^sGU1VSD$}KAd%UC~ICke4{O3L)o+|LnVNe3uhOS9QB)p3ZU}K zhE;8gmMkHP{eC@?n)><@b|fLQ0iz|dzzS-wT~c*5Se}qjF(tuI;ip~Wg&JplTQfFc zqIg$5C>Ja|f1NOLMnFMVJW+4>*m%^8aI1M~Dy~sDeeK&~jYg}jZl6QaB-9-rltP>BV7Z%%5HdUyw2`7Iy>?AP zV&0|V_@%G2!YCSh-(Q(VGX}YsVs9YzGDFK|fD$5Vf;3WfI@StpZ`i1>weoepgQ*9P zN4{#n3vQyUfGCAYl`W$ow)aSDoGA=y-Q(s>6j;Z*l1H%htxU0&s$ghw_-Xn=!J`lW`=kLUL5%P6*Z1|L`40&w49#$XV!cIO7h1%OXO6EF2v&eZ-E-IJbZ!=%s-K42 z4NnO@Lj$hD-qNR)UD2nWqw=nrc3p4ls?ntgrlu82y+PDRClp>4Zv%yoYK%;y zs8&J2?XWY-U*p#@Fol2q!GUd`c&)=$G5u1*#A&JUujW8t;M3Q-XnCm)+ljvJ3y%sp zL9I9Rt^lpPQCaLM*DA%`)#Z(q4g8G-Qp#Ri9?eLPf1qT-lyX%HI11*2QMz> z3y4uWU8)E9-Q1R!%f>qM4)-ckOjBVZ%!YSqkti5=Ci5#wei}w4oq}i^5~nbxf3Ovb z-aKEGOvAVq4KJ{*eQm`{=vOZ*FQJPPCeuE}OWBJlMN*z^ECf~sVKM}E4`JspFobM< z^N7-5j=y$z`B!(B&o-5NCEcG4LSkj8aMp`q-5aqXbB&u4PGgA!^)n;wt9k@dwX<0| z8(NlYA99xIG2y8|`u>EHm=96< zKiskn_AJ;a!Sls_>rE5g$HxXu4fzV{|Dr@uLdIJFBOh(}R9oC8n|cwfvs}R_u~w1+ zffJ|T^&8;%D`52)Y?+5|?}lr3!q;cu);+=_3$QTMO45jfGiwE<2$08Uv0hb)J&(CMVW%shPfcDU$zxObO>ZN|`Zl?-H$ za(PoGGzmL`#SVz@<@t+U?Bz`!a*&S)+91he9m zfl+TCN_^~Hh)ebpqvxuRRyU5FLpr)tr&v?bqKz5Yx%d3iN;NTnqgTLB9{|tZ0M9%C zj$8o;Ou=|a>zQ_05cv2H;B{BR&iQ)$mRGdbX$ERJ8F^jNZuuFwby#d}k7DJ}4NTZ# zg~Cs$pubSki=?)60S+05&uoIHPP1r{?%#sIgY)pE?eK-|aMgCWa~5_i2=mgOT$_FC z!Oh^=5MD=nQ&H2Hj$c-Bweqx-y=PvuFldH2+#`RXQicQqkH4Pp+Nfx}Tkz`ft=t5n z2U;-(2QPzX9RSZg5PoiBRIu?uRHhO7)GT`z;FmrNpZZ~;p-HReH?_iNinVMekYqK? zV`!ck9tebRtIOVdrkP1)rR(Znw;tYec(hoLrU)=Mgga*8>pS6^9q`qi zaQkj}U`|*Nzra=IIa|H9m4zbgmZrtum9Z2rmj38$Xz07ACfl!FEAQQ$hv>a4rEKEY zP~<#L^bxv`_xwSkLLE2-n^wXz*1=D2fTyp8V^_h{V6=DIoATE;3$MRQowir=Y5AEN z=(SUWMlG*K4vL~RH@|oF<0Hd2%`}CGf9tQcbWV{nf@OWvr(^;6=@oG@9&HK0n>Tt~R z!e6&u%a$x_F$i|8*IpwzL1-B}#Ro5V?cETG7mf;v2J*n^z~;5lL;du6IDQozvJ9rj z9y^8d<(O4*|K9@O6InJgu#tm5&EIji898XUecmtCkN3H^`ixCbLRJtc)0x_~2ev(Q zy+R6DH`x2oU{o0dSRUZG>G<#8tb^GhY+Hb@?SwCEg)eP`@9d0O%7r0HmW!9m4D|ut#9`0z5ni z5AG2joC`cS3-|1TAI%DL3xPR-c>x(}r`>w3fWB7qWRetCi83uAFgXy`P6SR{2hZIA z&p!xGS`Ev`BYokqoYbWhWdK{DTWRMJQ!?F%*rEcKdSi%1&vaZOjkn&zQ3FX2ft58# z1Q^7v7qcZ<`*d9h(gL}=VbveY5{Mzmfde>uExc%L6u|pu;j25~E8F2K+XJ`lg8S!U zxG61K4PEJmU2`S@91E~!3^q=}5!1p+D*`92fTO12&?z`%3RaATyzUsV_X0Uodme`Z zI~M}??uL7I!yPm5?d|d3T{D6E_rTUUI%DE!YI#gBf;a$HPY8!E51g_Zo_zp3bA8~H zHL!C0$BRII+_H0y{Fp8qH%*f++0Yav38`Z%A*SXxp90VdYWl^td8<@2Ofk%ESOR^m zEVWG@*x)6((K3$pYBNL6g~zu9HC<&?Tuqe3-Q5Z97Tn!6xVr{-cefCnpuxk3yE8b! zg9LXC?#{qIcF)ca4h)a;y8GQ*Rkv%ye8hM=~pumX?T3e-8Lucr2u5ocdwHlG68A@AK zs3T%bLY;EeVCfghPH-q6Hu{0 z;MYyN4i=b~TNHe#4}1Fj$*;|#Y!}qH&|lSi58LJo*VBb7^3ERM>2EqBaT^4IEzV~y z;4%g2at|45Qxm4O%TeXuwLt8z0Y@?G)oc0cJ@(b-sgPrBO$6N}kl^j7QL$DF{zk;vBjt^ItABwq`)0Rmrj_XbhmwbfDI&EaG=3vu1`rcNobKp^K) zQ}ckmw*A&CYo~8w>LM&EKJ@PeT17V^CiyaIW-vaQK4dvLOL} zoK9FR>O@*asf*@?gx7Z5&8nlTOguO2+#~Jmjdfhfc?Kbi0VFkTEPkEg83WU#s2~^S z+#o)Z9yo0!A^ru?7sXBlS2FS?L|!n0h`-?LxZ`CWi-14!MF)|w7bQt+kgJd2!OyXT zPL~>nD01YS2?a+v1XB4Bn!V#C0b{QpigdY4L?YwQaY2-pNqtAiILg-A*XPee% z#?@so`Ju?tryuvY6llOT`OM&FI!`?rpCoaRQ7J4IKXCz!n+ zg3!^Y1`lKW4Kfnhl>4Mi4-J$1n7sw0G;@fKch#MY4!V8__kG`Dkdy$+=-R%P5qkL zSTuX~V4I{&h!pUo;xkabeZZ2WQsJ>Ihz`eK2AP$RpD}XVwzM#p7M!YxQLW33a=`$P zOC23E>du29&oIGd>sDN5K-=)iQYbU+ZX=(fO-ijX0^%gYrKGf0DXGt1HPRadli%YC zaud$5!q}QnzO277hjUrRN-wTu*6JH0nvhofp7aYM>jFJ%E%as8sP!6WC&)m|DnZ<< zv?E!Z&CYiBM*3X;VquH{)mgj?%Vv*C%Rfr7(FaoZg&xNNW6O?s8~bp;-x!L{X^EUn zgv`nT!}ldWQ_5J>akqH-UroNg{^pZef*SRxp3VN`*sr6RF#!eGEUg(f{5$rpZ>2B0 zRt#;wv7MV1XPjm_RsQOwb?{gIjFs!7>m_4YO_E8+Fpp{DwE};BoSeK2&VwY@Ie*Z9 zDM~;!H$R#W-+pgLdV9IM{8Q5nfl)+ZG-h~q-cqyNh%B<6FCn7CaV)S%W9J2Ilt3ak z`_8T7kI$>N;-j^4gZ-MU)3-Vu5&pomD8dr@ z`=+&k@NjEBT<=;X52u2;6ny@~`gb!R6<1H?PG-x^gve2GlspsTfl`Oa@yNJ=QQW43 zMZKuT^S<=cjtSF&`D|2*W=t{$tBU7?I<7-3nS&e3lprkYyOmF08OzU9glO4 z$=4L7*AByzv{uZHw$T^A&J$ZP=!O<57lN@Upj+8}rnp ztjS+t%A=W|-Kd!OQPPbv-PLV;m|#OCUi(0uHIqu{EX0&F5Ck+w;N7a@xP;0+mSWT} zZa4au-JJo66Vq`&X1&zq$Ws40=#0e#a`N6v)hJakQm*SBwtt6LFrm?~L~ilN8{Te$ z0qBqm%p6i{-4Hhee*Fd`N**{?lsq(>Z=7n+yY$9Al_WAc$4Nh#q_P(~RE}Q`xW|Z! zBy56l^{pW+${jM{`aw{LYQ8r$Mbh+&=k|MLp zOca*6*(S=B`;DZu$aUmnTZWMxm44~g20LVQHPsHQf#9D!wNnJ8ylLEG5k(%yUzTVF2|bNnBl_Ij>~<*8aSy{Q>eQ_x zhd!Cfmu0?ld}caQ$?(-t|EFt(rxi9>4I1pHE=s~dAA(dOXpyI_YOB;h8axFT=IeB~Gg#VlHV)(7bUL}ohM zq>ieVFJ_jVj8Iw&Us$SdE8*epbpBPZ&d1o5G`rDFc$<(A zWW2L7$7tmbyu`f>v$!t+Kg-jHLx=_|<<2ReWROuJxrWz++lnWtzDvk%ep$yivKwGY z4Q5whw04emW$i9t8|$z{Gs|eLE&BBco%JD; zE*Ozw>S*&FE7t|0N~dggEQ5 zk)Ov>IvLH`L3uJqx<&l&pV#Ln0%6uWhkkNt)IvGJu`~S|!;4G%Q+rp()~af8m{bxC zrr3FFSd{*^p;&t|KU-Q)eL|w(2XC&Vf-{17gVyKq2M|4na}v~G+{|S>Pbvn@nTcy7 z7Wc1uOtzd_3MAS459O2ozoD% zBQ|AyzRGg6eyk|C_13)p&OoQYd+tPMwH0@=Hm~Fvy99SSqwVv>>hX?Dr6KH}DH;*m zk5OnIbS%P(8S`r;0Xyqt&rsZEPO?ksQ;y1WVpo`QaEp_F)pf@~5$!h?F}U=Ksu>75)3FJ>)F2J6B@xQ-M3*@ll&(z|$v}nJ;yAY@6O~pi{P! z@@-L}anhE_vHb_i|3+jJdztz1NX@fHrp9z^jb>=1BaLEoK^5}_4rp435w?MjCefu^ zv}cR#G{Tf2nWPYG!auj&9x}mJ$ygzoPGOmj$BemHdnW28Ej*{$yvoZ4S~7ipQlzVq z*Cfn#4sog{YHW73KSi+(l7BFyI6ZVfd@J-}V+cB{lYdl|9YX(p!S*s<%%EX$S&)w$ zUCZprz?@)TX`0XzjKH$NO;Kt*>%MWXUS72wW`}J;7^14!5vnCrj;?lqQ;rTVXs#q^ zl2Qa^A>=D5iOKQ)_HHaBn(rXA+yuueKvlCXO${cU6-7>;aj5dbSG$^2DQiR zXE*1VuAUT}UWq;GFNnl*F5dJ<{bx$Q(p6R9Vi9=$0C}O02|d6qB5Gj!yW?uhRWUg@ zM)0C5)&HV9lT^@)orh<5rP-c;Cx(jev~Ga!vKRVCe!jMI0C<#{vj6o}2wmjy)5E$q zx%ZkYyg`eD*>t|JlB%lvA8~ls`7g5duDdb|wIEw+tTj{EyNdfRRZ3BV( z<*5s|ELS}k92I&Po*5hr5>~2doC@lBq={`8;keSL9dR0PolI0rnGdE<0(?-pZb((6 z_!~Yxru*2h4cW`fdNu6_M6BJn>OHrmY_6-0t@VK~UKXX22qz2;lc~5mb9go8my4tui4)Ftul><7eQ~H=N%`k2L}iLX<%q*Xpnf$e-S#- zo8DP-pWdI~oVL6>{;QgGrN@ux?1LAuZ@kn&hbcuf@;wHgh&7$HgEH;ehH;@w|N4?@Z>ga@Xt{(G3O}8Ts`D^v2}uzq;D?d|bI)Z!wZG zkY8WV@iA84!@QB4jaypa`$z2U8LzXIp_k3~AlCLhET`@}ZD4qK7gCxnqoeXFLRV66 zm+0@`Z>9v3j*iH8shmV*0Q={{5R$x&fggoj`R=!U$97sN$Z@ylza*qGjGqR-BQcZ? zm$HU`q7ky?pk3WkCPP#egjA|VmJ5m7*TRzreE06T$uo2tr8!-yFYXW}Kp`L|wg?Cy z!8CJn`nK(&%V3HSTKr8Q?&Gpt|MPYwWtJ-%EY*h3Bxvn#&nHjCqR&({UDpaxlK$7+ z5n>3TS68mX!^66|x~4%vJ?(hJtYgFS%cjYx0Am(H#P`U}cO#@;v_S;eM#K~<+HJ-1{x7OxFs?U~yf@>Z z*KxyO@SUDGTsUNTo);0mp$lX*c@Q7(nhP}Vh7XnZW*~24V`Bt{Zu3{%93DsWn}bOb z|I_+_=edFdHXx$g-``$1Ph(>dgTRZydETIxbyZ!TrdBIHl56ka2X8}{K3Io!eG$KI zhvm<2XCQFvE70CT67)LVvNw4lYF%?f{zzs32Y{GF6S@>r5jdjGze=#dkl5*8sUTFMq6+me4kRIVsy;K-PR=g6H=Rez=JTJ;oclPja_Aovk!~46y5Qi0wd< z{28O*{q^uiULN;`9Xml?z>`~9c{wH~@WpqC$++)eGRJpybz>M;$1pkaD?7nu8E(zFE`h6 zC=NFvF_D6jB=B~o>%O^mzc89?hsD_!xpgzh|6qGKk@#sO_*FLlCin1E<2eQ2|3$0c zWiNWBvp@uY<_}`dTAf?%q7MXxVP(m0dVTxCMFu5q+c2ks0$ zD*za~&OK{)fyt@mKT>_;3;ReWq3hpNualdvs7XTCF-O=ETP3L~JHW#7=kPjP4@99( zOij5R=6PQau>~csI)m~)lAfuiEi9g`CrjAheC6x@SbEn(_r?C-+Mv5sfdQX6WnS0w z_QPxNMKF2HZNBG%o}tfnWWWw~!Ipc$OYW5n#CRs#A%4&{J|B>gOHFpzz|S@>_h)MX zH)6>6l~?^Q0ey5t)Sip0;TDR&q0#}y#0RQ!pqHXtF6R-(h=xE zm*F2vVd2HoQ|JcVuInQ3VwZUH5w75IknTT+<)tM8V9sQq_ZLvXB54ORGxKGlb3ph< zM0Z`M*Y5pSS+g_!b~@c4mhZC@8*so`uw6HRw#qAYZnfNOj}N*c2KC8`KF{PX37k|l zw*4!L_Zbn~==)f2M&J4%u;0dYM(brieox&|o{hEj;~t&pD1Of+Y|zDrK$5&A!bs@udsg`Q8uo2oN?7B*H-rI?1o6;6;?%vNZc&r3H zS27YmSTdNrU1zr6&MG!ykpd{tbyw}Yf94!4xcPS9%Cw)Im9?e%wx{~>ko_b#_s28c z-<}TLpO4CK`p|>Ee=H@5#~*PqoSmeg+hRlSbvO_3-*51FYxvO; zI+==2wT=5bXgXdlFmq+A@dRrs@kPmZKaKL-BZo>ErHJf1GpnM@t96Mi$SPA72sfXm zyeZ2lE*mnt6R47eQb6EUQ1t>H#v)2>F!)5TC%}UwN8&e-nFWfh?Gc+V-J6_HcZ}`;XRlmY~5v}oO+Goc-?jM;o1qez|Apd_o55}EdXFF8nPjdI__KP+9 zp0)m@7rxW}|24TW+T^;z$&z}`r)))I@I9=#f52`#@ML@@?Tu3-FZaLHTa+QQbTP$ zSV6DXfleO7aF?AqW)1PnV;%DI<<_NMD0;Yt&t%|p^lG-_2+o78x^JT3jHC_`50lDY zo2qJcOytQiJiGJh{hXPXGbbY*Yk-KOwfFgW=$8ZN?tnt#UIoUypQdro$Y1~UFXK1< z0|Jq!QPt~@pjy5G4$)%mJZ)h7aw!Fn?5rZ&B;t=g(_Vlb^noF{d7ZBKkZ^SWbXffA2>)H`X_m19RmIxYY?A)vB|Kn z0QT?)BemgBYIl@aNZ=wpGg~Z|>h=%J{&o6C3d8sQvkh)_alhlFW?YaP&<;K`@y3Jr zpvNKOLUf8czq{jZBC3eqv2>>P!+ig?i=G#sjhp<;i*+C>KIWN}A2QMgAcf0*x{h_B zUZXYYbl|yrBIY$s>Fz^W6+r12P>aU?EYp4qjR`YX=#LN5dLodA!rano`pJX*vFFUhpp)nUe%aes_lxWGC?tA?yzTE^8S`h%``BC32=~r7Eckfr7 zr$Gfz6E+{X-T+AM4UyGW=S_RIF2_}#r~!%(F`b&4>af zp1BsV@-4<4_fV1k+TA4Ix09F)k3D;Iu!F%(X+3zY^LNq4aRAc!A8c2@1;Zyy(d(7usiddOK^~?3u~8K)d2G^ z`hZ%0?1dNUZ3TfHIm-@5vCUkdF2jn=)^TL4$7y2)M$Llk`7a~}Z=v$`eoAN~9~lc} z3s#2A(kBp6xA(&EwKDYC``O6)y}ovFyZpv(qM4>+wzjs;%F5Ec-K&ndT%Hcfcz+~+ zr}}uV8U%QFc#qeapoyH#S8KAM$8AH9*O`8c)4KjyQ*c9?)p*8!9u8&y!h3DEds5AR zJ@??l)_cy2hzK2oS}{myYF#8K+@>95CiqpeicI4wO8g2PB*xt|j@u^NisJl*aZ+u} z=}6;>^o?!O>gJJaj6I4NB)>}uOiXkN032GLgr{%Gr`-$B z)g#9CQ{0CaFFEdS$H%{?rkq?sE_@RJ_DvVO-IkZ^>Z&V1g+j1(-(mrRvMFtWI^-0r zA3ZR$L$I6PzlD;;&D>#%iN=-uMC&zl-i){!%?0jVLW?87w)* zqordf>3w+iHp!Dzp4&0s4D0)Zii&D!V>2S%M;C5J;IP?~XEE}PBls<#OgTpe_93=w79D)x7mJi$3s9~S(yea76Sn$r6XGcfmStt z0!SPdit*pSO_%D-lvlj)-Q3*?g?!le_xB+JUav-gQVG<%d!@^UJa=uMZCzhXOPP!S zaI7_uGCtkLYfikOVj*huY4d>-qoaK%cWwt0g!V@A^71)$?^A=PnBR{=SHuEH9A7cC zu)Jr6RT2EvX=gTaglq8az0!SJ*jXc}zb@}UQ&>542Ex~&u@-@A8Gd|U^mNUWcO5|G z)n!d)AOXsl;-Tx(($X)6h7%Ep*jemm60>}QoW<=mHQxZtw|;RYBqU5rORIA~RIxV_ z7Z=Zgv#aIGRiV=;S82`wB($QQ9-*|f^g>4{G`zZ@p^~dBN3l$zg1|o~0yvR^q?HwY zs8F%Sz{acH5%=po`FI#C33m5`2`8<(AO?1t0_w5SJw8`s*BgJ2%EW@0nHS0#tu$@w zXcnRY>%!AC|A0Cf<_Jcf{yepBd@GWjH1LM&xz%5Eb!`!o(o&2%y}oE_N~wH1ulnZ# z0UU|=@jn7SR|6yV5hCMKrV|rDC zbt~|&9CbeshHWqBoh+>^Oiak-bFpQ1dxwXdK9^fw?QN`?@gM#R=5j2)C_dF!qxsZvcU@F4-E4(}Wr3AquR?D>4y2YE*mTS&Lx>T}XnAv1b#8&K zY-wr9?z|zSC^j}e{-KH=HiJR?P|Gi0tQi_wkTi{r$-Fmw>1w;KF>wb>x zN2~*?C4rcCN`Ir?0)BaUSt*wfGvxUA>$rk__VDjyDg)^VYV+sYBRPg;P%x<3X*hu} zfr$IRaL`W+3@B?9*wz6jxd>%^hs52kX4~;!kx>3;(uCmn(SUxKfYAVzRkY7MAjbye zn91Nu9H;M{{t8gk5_4QZj|1eNeJ)MK+Iav>w^(a)oyg{n7yHx;h;K8*G>kAHsd(xQ zRmxMPIyg&fVP}^z`(! z%*+u?ZYtSt4s(j-KYxY*6?GOMAf}MCZh%SaH^ro-o!5RA6hekuRxGD(IBL15XH8N1 zgWG9_l`)H{+&G^yOXs?2AyU@OMmw3h%B7F7sYCn&3ffO@_;sn?La)uGkVZ{QOREZS z7U0QzLJ+ZOb^AcEr#kjqZtc2trjS5*R2j5Rsn6%;=C)}j=EG3HJZ$*0Et&*(H#;3p z<#hppAOvW?lJas5ZEYDXt@P$@7VWm+_qQtj<~U#hl9NQ=mh?p}hEaN6)-Uc6WIV-) z61Wl@hD50m_nVU*R$50RxLv_KrSNF=ws*(0*@QMFr#9*ew>chIkLR(fsXK zW`^sq6fi?WLx9IKfMn3&b46)oW%Z$qIywYYa{0_~+xWfD*Q^FAlq{{S8+@+JWxkP& zss=x6D1ORQp-U3JCjhjGNs>Fda!E-EyX~J(03l1T6G$nH_JzX}a$2L@98MoTUhU@c zyTd8ZA;5*FWn{DvKvG4R&j0%Iai3~~)&{^3JSk02O&wsW?ZU$U{5S6p3`si#`48zP zW-9S6Ed{J-0=8MN6Fhee*ewk78slm&O=9Z$-61_1hqRI=Ises2%5P4 zuIQ#FE?VX6!OizK?{O;z7M6X$%Yh%yU@89fD@IimoCW}g5zi&A`SJvlPR(9rZIAii z|FiiGEyd^}Kqi!n|XYY&?jjT>W7TURGP93rO* z=D#EnA@PZqt=OMXY38sRRm;|d?Rcrm*60KRwcA6bPG~XB3)1SVEX@_n1x?pf5QXF@ z=WH4EJD|M+u$_K?J*)*ud{+nP{WX$CF=J5g7cgN!l?($#G&CBiz#w3AF)%Sv;UE>B zbZEJ70*N4>O3Pt0Me>=G^M5I;-QC7;UIM^LXTV1s`Q?j9QXN5R^QokgcVW+#>zNMs zzdsSHkge$9h`yxeDF7oYW-yxpBBBq+Mk?nawR+GqxbR@3KnUhSMNxMcokjy$XY&Wpe4E z`6vc1S>RkLa& z@(Ny)azc7tbp5_jPi$mjGCdu1&uJWZ_m@v`-$Q_bfx+y2t$od902M+z(n5Le(nlyl zf&z_%&otetE(x=&q~ybL%J)02Aj4&~-mxc7s|rWXv^6(WTD9UOsXvH(4XX{S9AKshj`_uI3^z_9etTy}>`bc4Y zTL%YAz!CbtwJs=Y9-Ew`p`wB=pOfb!DeLLUKR!ODO_c~S$6Tz^8wh+@U$hvHl|{*F zhZJE<@(iAcV4=W{;5~ZGdSVMA(al0)+(@0Rp}s=G)*xxd9&>GGDpo!^-H*XX4Gr!D z&gqYDfwd+Y0({b5MYe7!Wo6}@;tc==0PcM~)&cDRRm_DDK7GjmF`bs(%D9;i?ZkVO z8@?c9l$p!v5=VZ(wY=Bql36l&btFbuS{e@E*p1AoicSK-;;&S|M2Lc@xDmGbF59Iv z;+a!)vLhmoP#;!?L@yrGEi*ybbhg$sU`<9zBjj@o|iW>B?SwQS+`gCVQsEPdIDbGjr+Phr(Hi6W2a zWXhzfhPH1_C)?qFl0~obgz3tk2B43$y*X$%XZ3mZ*T{IX{%nx(*ydw@If9v@*nfnf zA`sm(pS@5YltZ&Gt~T@FUq$Rd!@P-@vBfqsXfYVB{5#f+59BWZHOUzn!!ejt`X04k zzkc=EOP2j8pCNGZ*{)aYYxRzJCdCy-kLJql92`o1{raV&m%q@P5n3vexYST#3DE($ zZ2apQTE@X^@ljr_2yapd?_Pek5V5kxMFm>nEZdHQuI#fMR=-$LflN~(R=dma@j3}zFC-6nL!-D}A7dK*Ho3+59u+y|7s6(>> zcOkv%sbAs#I7|W0K2U+@1pJ2}%uH`AuAPLDQF)2quk%zk^X%CAq;v>pMvU@Ny-s!t zSHKzS+hecH>V{0(5<5!<#Z1X3jqo4s>`eH>R=t;+a_;oOJR_y|f4?{U!P$bPJO5=&&y|r%TAV9eW+CL3IHH|W0y44#BtZyzLK$BBbB^@1E0Ehly z2;Za$X-MhE=Sb1Ft0Xyw4>`yUt7c|KktFg=kBrCs2`CD(vxz=hd;pe;0X1EA+12B2 z(ua*kMyxzTShpsu(N~1WMDhg*FX0yt1M6i++ABYoRvKbqS~bP5wCXB65fH*fdVkNH z8oAm?JdZM8Ma&D?$+Mgh(v@(Z3crkP091*EK4vO7z9V$jy8ScvXp=)pVym*Ep zgN*%M-}f0_d9fe%nHq_iez}YUeVAG;8ylj?aN$B%gV+vBb)ly0F&I#_i;4iN1B|4d z2-GB_fVVR>&IWS8odWd5E}iHTBG4)NgcbYKjtCGzYiov#OiYL{P;v}cfQ~lq$~r6v z?pb8aT>t&=iw--E7JaZ3L)L1AVXuek2~|AxSaTI}FNi!^G!ThAjbWJ^QS1gPJAs^u zOK#M%k7pSj-ycRPfq1i_3il_IwaYn#PYFhumqZ?FY=bSg$lbzaho);#lEx3aay%ND zf87dr2r!R8hhrLOO#_-Q5jn+^j|2w~uK|cVJT~Js%g=Go&we}(OTEu`Cpl?_UVJ18 zB>X8r=P?&(cGk)Mg+5Z!o%p#n;?r6#v=VSu3IT|I4CU+oBT4<|%do|2S2V$b(DYaX>UyZ;pR zILoQ5N&PER2&2S(efdASYg>Kc0Dg12Y>5HXH9X0?sT33x)OcE8MvyD${S9#5F1Mq} z)xUfZ2L*w%1UwmA*S&~=%D+2dz#bw8BIFyt6~GHIZUC3e)B;?>z((Qa689R*Ap{R>TvoS0;(uuh^(x4Fs++0qh&dLMmb@UNYc7%+i+Ng|5 zoO;c9ghsd(Z+}t`BAPN6L@0}eyTMLYUt`Xm?=ZB8i&P(e=3GYy*h#`EIw@8eJ(UlYG2l`P8lT~hn3cBu0?c_Tax`4fh9t@b3v zO9vk;6CpLxiN^vlmZ&fclyo;7<=6$9%(|3+hd8+(+r**6a3c>)Iy25~h`jVEJIZS! zg)u7wrYp88?>1u6LS1*?7T9aNhC<6c(Wz;zCH+!B%jRDF&oKSHUcEiky=|hH)To$B zTuQ7;xD)*k$3xxkXYogHUm(4jc10lhmnX4M9_JG5Ll;z^|(bXmh$(_otTZ`V* zx@>YqrVs@_%Np1_=qyBtu^qp{@zcVYOOHdNP=DQyoW3M0JpK#Y(OHdUuI;Euq_x^S zq%_93E(UCGlm0r*5k!~{T;3>uu4HS5?Oa_`A*rR(x41Gn z&7!ZOrwlryvC?48w>18-yibjN>;)#5_113z$@6|({uP@Oy8%|;gJ)<^7sgV#FR$N$ zGmQo*W2k1<-Va`N=7v{SbN>s!lik{l)6Oxcz)`+HuAHjzT@hhg@Hd;i!KBKFO4)S` z_ox5zx#cY;g+FGrkRkQYEh?!pqqgT-(a6(fSPD3`{xfQaxTG?bD(=2(sP&)MPB8@F zpnT^=>7^J2<5*mFTZFknm2@_JoWep!yVIi$U9Yc$Uct{ERS$guWnQqz$7eqeh$Uur zh*{x)=YC$gBz+C~MTvQRq)|i7>~|r-EOK!EVDou6j%}l*{~7ikjsArK2ZK zo5n9zB;wxd32{Mg53y7J#l z1jF)<<_{BAveRwPOw+7pacq}yc2E2!TNS0Rw?(sS^~|HoEj*+Vv_-q7JP(gwYd)<- z@73WWaTjsKe4Fwau3*hFAgGk3C{^c)R$ImR`u*%Yxt@n70(HvJVGERwf>m10Z&dk| z^$sS1pNjOMrj*a(i_6+U_{oQUkQinVwW7qFmko=b9LNQ3h8hp^v^EXRL&W()#o-JX zp~)r6IA(drH+MpxnWG;J0{>g!G3?eS7!Y<~c(_s1RsZWSfJ0}vh~7}6)K!PcqW?8` z;I7cS|GY438XWg&yxNkd)Hj;7M8oqQ3mtXZEWQn;0_a?pY9dkW#b|Ckk4+~@!r634 zwoR6d_t1Z{hrYK7EWNEPy@~diN?W|y#a!MJj&=T~xSvO#75j`4=~Kk_CkFHPQJDiSsikm!l?B*;jmC>)9Y;S- zP$}+ng{E`2!Gmx2^!QC0eM)JT@w0P@0U&`1WK91-S@LHWT&kiuwX?&>Iotq{rPRq% z|G}T_2A-kiqJyw_Eqtg~K2w*j>F|?*zetFmF%BLh6<;4E7%JnU;}6Pf?Pvr_o#uTg zBqTL_8k@40o6Q!E9OXTaB+30CJYs8CMmlB%tkEYACa+keY@6`%bh4BY^yW=+H;>GH zfs92uKFvrGD<=h^2ev`6Q-_*Htfz~-*)4AB83PxA3?0l2W{&QP50DF?FO1W!i*fS! z$#joBT#A1l;>-d!p^l&wcnKFcnVzrre1&k8=8FIfEXNQG)ZTYtudAJfP=0WE84}qY zUz=n&jsTXh59)lyg``kbOzAgKcRRUP@w~Gh2sZ6UkO*H;ZwQmZl+hJZ%nW&*qC$Hs z^I+DS%DFr8`Ro?4#CM97e`Nwvi}Pd`lG9;0UHCMDL? zs^3o?JoI9}6dI1~s*nAZWqe$u_>u4+@YJGVQC7y$2RXnMnrhqQacvPYfSH5ZI1QYo z9`g_RZ(+qzmA=mbBabfDjOP@=Wm3#ucSr%W4VZ+9EXFya{N`DwT0C>{G7)Ww8w$QO zEn4I$0zX=b)*yl)4Qe-!XcuMFlQoedO1&eLHB>QPh4NqXWQ1>fTE2)On7yD@Qe%3} zB2`Sp*5NM(T OFL`MdsTv8>u>S%2wx7%Z diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_female.png b/app/src/main/res/drawable-xhdpi/ic_gender_female.png index 57db63542b7e433e7ca487bf8cf4ef323e25e207..148946d371ed5c82ddcdd3a3998a7e7131a74f7b 100644 GIT binary patch delta 830 zcmV-E1Ht^(2I2;gF@GFML_t(YOTCuKZxmM$hrfF5u?>uE4OlEj7+Wl1L=Le*KoDUu zHv|XPOC%I23EVmGM?^~Q0W3w4I3%1{MGkC17$oo*#BL7=5DH#|6Fi16_VlZ$dl<(a zPj{O|^N#&q)%U8pe)UR-So*sgG4XYG{*cu&izI9uN*C9P!gzzZZ1dMUlD1Irj$6LnnInuvhRz# z#k-S$dZcq3a1^BGgJ5GungPC+?^c`~?`Hxq4>QL=t3D1^u$C;?-Q%HSKtGMfz54Ny z6<<{|Sm(<^dVhVOUm(U@LwLV`W(2H8C&T-vR@Zoiln1tVeUIv)XiK1e8niY*LmV6f zuiiq>Al&H(Hv}%SPrhwAEWXZ$x*ojKS2%M)Eo^SigS_QM=SAtQ{?~9e4Wl;5M-R0v zNzwKjn^1E;GP;<7J9mb*CjRY+59Bhp1OjvHWJt}7h2~**9%DXPCnk&1kDM! z_yivPUD}<}A$mB~hcG)5`1x#DJs<85K*#gR$G>WXrL*AjGw6O9;78;7ve;nhOQGZ43R1G#8#i&SH0bhLf0%9nNB| z{{{VTV0sKzHNc#B9^?Uomga$hDYd(jn7V3gZw4L8;w-I4Rk7CMIL<`3!y|Ae4Vi36 zvb>ar6pgKk!ImYMc$E(k1l#cp$J6(snNU{+Z+~5QJ_NV>ARGD=f?qTtvhe)cjg3fi z0%HvBKmTHmcO$t#aYvPcCyQX=YqB0$y8!E27|CI#Rr=|bKOP~uDfG}{yf6Ha)@El_ z!=@(mRv+RCzL4H?k1A|nIy1Lw$`8Sdrl5815+o!6#pA6Yb`0z>-s`_fnFMwd-LBT>+h;bqMdo! z^m;(AK$P72<9|C-0@{Qp!``Vjb8R7IfQRmG!Z@Q>8Cc-g6g=;Qhi%{n zz(uypmYD~{)7h8!(?ON~*kQ1&1{{^~%|>UTcC~$j^9ktD`Te$%DX*&)bLh@ejJgyW zT|~i#X;2b@$L-Mc0lHnNio(Kb7*-64PPqEo|0vN7Vt)?C_W(OXffFlW$#`h#g0s(a zw?~J-nyKIj9D4-c@@n4N>=kn$egk2CC~)RTsH=jzA0XZ`aC^gesHuP}ui(WepS03w zfvpIYp}^^tFlRJ8X@|yl1Gg`#hAA<){sx*m{D5s1*nKU|u_XDN_fo{V%uOiju*O1n@tELc%4MlgQP`BS_DsyNN%pMIRqVVxM zoP6f*yTJqcrqo?qi&I{TZb_m){U9>65@QTnYaGYPJ-DkI&Ltq33Icj5^(`7*Rs_o@ zqoTzgL=bf28yo~CR6uz#q+EFW6&|!^eg`dMi+?6S7PfD=i^iZP#ZXG&e*S?v*^H!p z#2s1)Ru%!m*R?U!f@-v@p*xK#9pa@|F1$d}gXp3C9q@!7(AspY1eVrd?zbRT@Y(cU ze2IGXB|M(KJF>0K{x{g>t)oSlapkC|9Y|24&gV+Dd3(UWeVzszWB=#LgBJ1u&N^Dq w5i27XTA(4S7h1?Mu@_p%K{!V~|9RB^2^7P6f|Ad((*OVf07*qoM6N<$f}UTI_5c6? diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_male.png b/app/src/main/res/drawable-xhdpi/ic_gender_male.png index c70fc0e58be2877839ddebb16d8c38f672f13e44..f166c0dcb1f5a8f4d63e995191bcecbef37bb425 100644 GIT binary patch delta 879 zcmV-#1Cacj2b>3xI)7bg990y@e`oH@?xxL0n>L9yRx2#Ql0Z@XsC_7YAU>!dLJ%xU zL3hDND=mGiAQ2I?i1^YVlz@oj$&V*dL2F|{38)(yA=S3DMhn@Hk9K!Jy7ri%MjIV6y76_hx7f

xP*PylPk`~E&b5T^8*%-_a&HH_4(j@iRbzacXe32f6n7_ zP(OgMWtK)#_eeHZcvO{d&7wAUBl4bPek+^=_B1-VEh#*?)h4}B2z6X2D&OUO z9_SVx+GHX#%d(>MhADNMGp8i;>y>{H>8}Ue)n$?0?%-Ip_u~6L#u!wU&;Bm4cZ(gR zcPj63{C}?|qg3@$s4$#)_F7<YZ8nee+I$*T-@p8NAa0RQHEfFqdn{hrp5S6JVC+nZa+Qb;2HqMa(ME*yISSWo3HV=krTtmdmllL1lQ~$nz9Vn%L!09n0G1 zDN@{fsE{{?x*o}h3j5Rw1@002ovPDHLk FV1iG#x61$k delta 879 zcmV-#1Cacj2b>3xI)7Ve9Ay;8e`mg#*^Ny$ZQ5+rShcWJCBaMaQu|Q6AP6dbkRT|O zf^Nh|D+)eUke~=w6ntqAYC&kplb0t^K}%vm38)(yAyr%2Mhn@HOS?NeJ9A{F-MX9X zt+njD&Ueo5{LgpJ`Hs-y8&)+Nri;52c^cInsAdr9i_KK?h=0r?a$L}_76y|)jEe-# zTuP&#BR{L7$>LsB-Vn&N3M}TstO)N(F?s0V{o>cNsSC_bdxHeQVMMmK16p%NbqZtl zj14BHSN~fBd@)yi#!~$Z=(#4?e@4rp$P1qgCBLlpQvi#xAY?~&uzANyx(PZCE%meC7w+iZtJr6@RZMm zuzmnh%PbBh@05{T;Zaq-Ygb)#uHR8!+v?Ki8kYTlZhzZ~&EKB&IO8?;B*J5o%@yBA zb>GzhqqAv8*`G<^7>h6r8K3j{c0rrF5jh~)-wG4J&PFG1N(fJGvdOFyA{}Rn%J=zz z2U5aA>rHHCSyr6hD5YL==A>kQz4#9z>3YDsdn{hw;^0`d_YwpF#u!wU&;Ks5Yoi^f zcQWsD=zm<3QL1`AQW(uVdo{4f!05IFNh2J~2YfSM#t-4%l*R6}!L@{mywBmeFuv1~ zTO58`4EQ?VRARXy@QF=^;Ts)(Sqk|0bnP6zr(1aCR)>qB@cN8L)90a9Nx5N4_YOGh z++g_htk1;4T9^AXE(1x6(UTsh3N4DI0==Blx_?FU{LMCx^w}JZs&9TR@YUNL?&>yt z@Mnn=7s7Une6nF%JlJdT(iWGq#gNgHCCXJIx-59-js!Ot;mzMY=KVGmMs3lk@r}S+ znFN~?!iklDBXecuJSFW4dj@Q_tuxH5gdF&*)UG<>#&0&-q8{A0)uq?I)E1#ar9&2d zRR0Z16HL(Ki=ptNQVAp%q{}%~ZouJdcl=1)o002ovPDHLk FV1i{GyI24K diff --git a/app/src/main/res/drawable/bg_common_cancel.xml b/app/src/main/res/drawable/bg_common_cancel.xml index 149d53a9c..f85ec735b 100644 --- a/app/src/main/res/drawable/bg_common_cancel.xml +++ b/app/src/main/res/drawable/bg_common_cancel.xml @@ -1,11 +1,12 @@ - - - \ No newline at end of file + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 824b1c9d3..4657b669b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,5 +1,6 @@ + android:layout_marginTop="@dimen/dp_30" /> - diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml index 21cd67fe5..e8fb17133 100644 --- a/app/src/main/res/layout/activity_bind_phone.xml +++ b/app/src/main/res/layout/activity_bind_phone.xml @@ -75,7 +75,7 @@ android:enabled="false" android:gravity="center" android:text="获取验证码" - android:textColor="@color/white" + android:textColor="@color/text_normal_282828" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ll_account" /> diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml index 396ad3b1a..ca823179d 100644 --- a/app/src/main/res/layout/activity_binder_alipay.xml +++ b/app/src/main/res/layout/activity_binder_alipay.xml @@ -170,7 +170,7 @@ android:background="@drawable/bg_common_confirm" android:clickable="true" android:text="确认绑定" - android:textColor="@color/white" + android:textColor="@color/text_normal_282828" android:textSize="@dimen/font_huge" />