From 085f19c3ca88e7721070093fa7232b0c4f7b1084 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 23 Mar 2023 16:36:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E7=95=8C=E9=9D=A2=EF=BC=88=E6=A8=AA=E7=AB=96?= =?UTF-8?q?=E5=B1=8F=E8=81=8A=E5=A4=A9=E6=A1=86=E9=AB=98=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9=EF=BC=89?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=A4=B4=E9=83=A8=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/assets/rectangle_new.png | Bin 0 -> 22338 bytes .../yunbao/live/adapter/LiveChatAdapter.java | 14 +-- .../yunbao/live/adapter/LiveUserAdapter.java | 2 +- .../yunbao/live/utils/LoadDian9TuUtil.java | 6 ++ .../yunbao/live/views/LiveRoomViewHolder.java | 53 +++++++++-- .../live/views/PortraitLiveManager.java | 4 +- live/src/main/res/drawable/icon_heat_new.png | Bin 0 -> 1213 bytes live/src/main/res/drawable/icon_time_new.png | Bin 0 -> 969 bytes live/src/main/res/drawable/rectangle_new.png | Bin 0 -> 22338 bytes live/src/main/res/layout/item_live_chat.xml | 2 - live/src/main/res/layout/item_live_user.xml | 10 +- live/src/main/res/layout/view_live_room.xml | 88 +++++++++++------- live/src/main/res/layout/view_noble_seat.xml | 27 +++--- live/src/main/res/layout/view_wish_list.xml | 7 +- .../res/mipmap-mdpi/icon_live_close_3.png | Bin 1383 -> 2448 bytes .../main/res/mipmap-mdpi/live_users_more.png | Bin 2483 -> 3817 bytes .../res/mipmap-xxxhdpi/live_icon_seat.png | Bin 3396 -> 966 bytes .../res/mipmap-xxxhdpi/live_icon_zhouxing.png | Bin 2938 -> 1012 bytes 18 files changed, 137 insertions(+), 76 deletions(-) create mode 100644 live/src/main/assets/rectangle_new.png create mode 100644 live/src/main/res/drawable/icon_heat_new.png create mode 100644 live/src/main/res/drawable/icon_time_new.png create mode 100644 live/src/main/res/drawable/rectangle_new.png diff --git a/live/src/main/assets/rectangle_new.png b/live/src/main/assets/rectangle_new.png new file mode 100644 index 0000000000000000000000000000000000000000..4909ea8027b6bb7c7664586cd8e31e6befa6951b GIT binary patch literal 22338 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 { @Override public int getItemCount() { - return Math.min(mList.size(), 5); + return Math.min(mList.size(), 3); } class Vh extends RecyclerView.ViewHolder { diff --git a/live/src/main/java/com/yunbao/live/utils/LoadDian9TuUtil.java b/live/src/main/java/com/yunbao/live/utils/LoadDian9TuUtil.java index b7c577d55..3d6100d25 100644 --- a/live/src/main/java/com/yunbao/live/utils/LoadDian9TuUtil.java +++ b/live/src/main/java/com/yunbao/live/utils/LoadDian9TuUtil.java @@ -70,6 +70,12 @@ public class LoadDian9TuUtil { setNinePathImage(context, imageView, bitmap, position); } + public void loadDian9TuAssets2(Context context, View imageView, String fileName, int position) { + Bitmap bitmap = getImageFromAssetsFile(context, fileName); + BITMAP_CACHE.add(bitmap); + setNinePathImage(context, imageView, bitmap, position); + } + /** * 从Assets中读取图片 * diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 604304be3..f25e3752f 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -148,6 +148,7 @@ import com.yunbao.live.presenter.LiveEnterRoomAnimPresenter; import com.yunbao.live.presenter.LiveGiftAnimPresenter; import com.yunbao.live.presenter.LiveLightAnimPresenter; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; +import com.yunbao.live.utils.LoadDian9TuUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -219,7 +220,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public TextView room_hot; public String touid, gotoroom; public static TextView fans; - public LinearLayout fans_btn, wishListLayout; + public LinearLayout fans_btn, wishListLayout, wishListLayout2, liveWksLayout; public static View d_pk_view; public static int isAttention = 0;//是否关注 0=没关注, public static String mNameText; @@ -309,7 +310,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private List wishlist = new ArrayList<>(); private TextView mHourRank, mHotText; private LinearLayout msg; //默认悬浮窗布局 - private LinearLayout mAnchorLayout; + private LinearLayout mAnchorLayout, hourRankLayout, liveRankPk2; private ImageView mGoodNumberIcon; private View msg2; //悬浮窗来私信的布局 private ConstraintLayout msgLayout; //悬浮窗 @@ -318,7 +319,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private FullServiceNotificationView fullScreen;//全副喇叭 private NobleNoticeView noble;//全副喇叭 private FaceManager manager; - private LinearLayout pkRankLayout; + private FrameLayout pkRankLayout; private ViewFlipper pkRankVf; private ImageView mPkRankIcon; private TextView mPkRankText; @@ -815,9 +816,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis fans = (TextView) findViewById(R.id.fans); fans_btn = (LinearLayout) findViewById(R.id.fans_btn); wishListLayout = (LinearLayout) findViewById(R.id.wish_list_layout); + wishListLayout2 = (LinearLayout) findViewById(R.id.wish_list_layout2); + liveWksLayout = (LinearLayout) findViewById(R.id.live_wks_layout2); mAnchorLayout = (LinearLayout) findViewById(R.id.group_1); + hourRankLayout = (LinearLayout) findViewById(R.id.hour_rank_layout2); + liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2); mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico); - pkRankLayout = (LinearLayout) findViewById(R.id.live_rank_pk); + pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk); pkRankVf = (ViewFlipper) findViewById(R.id.rank_pk_vf); mPkRankTopIcon = (ImageView) findViewById(R.id.icon_pk_top); mRedVal = (TextView) findViewById(R.id.pk_rank_red_val); @@ -940,6 +945,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis LiveRoomViewHolder.follow(); mLiveChatAdapter.removetItem(bean); } else if (bean.getType() == -2) { + if (!bean.isAttention()) { + LiveRoomViewHolder.follow(); + } mLiveChatAdapter.removetItem(bean); ((LiveActivity) mContext).sendChatMessage("Hi~", null, null); } else if (bean.getType() == -5) { @@ -1168,6 +1176,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis customFullServiceNotify = (ImageView) findViewById(R.id.custom_full_service_notify); reloadIM(); initStarChallengeStatus(); + + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1); + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1); + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1); } /** @@ -1630,9 +1642,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (flipper.getChildCount() > 0) { flipper.removeAllViews(); } - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(44), DpUtil.dp2px(16)); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(13), DpUtil.dp2px(13)); + params.leftMargin = DpUtil.dp2px(6); + params.rightMargin = DpUtil.dp2px(2); LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - textParams.leftMargin = DpUtil.dp2px(5); + textParams.leftMargin = DpUtil.dp2px(2); View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null); View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null); ImageView hotPic = hotView.findViewById(R.id.wish_pic); @@ -1645,8 +1659,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mHotText.setGravity(Gravity.CENTER); mHourRank.setGravity(Gravity.CENTER); setHourRankData(Long.parseLong(model.getRank())); - hotPic.setImageResource(WordUtil.isZh() ? R.drawable.live_tags_hot : R.drawable.live_tags_hot_en); - hourPic.setImageResource(WordUtil.isZh() ? R.drawable.live_tags_hour_list : R.drawable.live_tags_hour_list_en); + hotPic.setImageResource(R.drawable.icon_time_new); + hourPic.setImageResource(R.drawable.icon_heat_new); hotPic.setLayoutParams(params); hourPic.setLayoutParams(params); flipper.addView(hotView); @@ -1669,6 +1683,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis liveHDDialogFragment.setArguments(bundle); liveHDDialogFragment.show(((AbsActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); }); + new LoadDian9TuUtil().loadDian9TuAssets2(mContext, hourRankLayout, "rectangle_new.png", 1); } /** @@ -1700,7 +1715,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mHourRank.setGravity(Gravity.CENTER); setHourRankData(info.get(0).getRank()); hotPic.setImageResource(WordUtil.isZh() ? R.drawable.live_tags_hot : R.drawable.live_tags_hot_en); - hourPic.setImageResource(WordUtil.isZh() ? R.drawable.live_tags_hour_list : R.drawable.live_tags_hour_list_en); + hourPic.setImageResource(R.drawable.icon_heat_new); hotPic.setLayoutParams(params); hourPic.setLayoutParams(params); flipper.addView(hotView); @@ -1825,7 +1840,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void onError(String error) { - ToastUtil.show( R.string.net_error); + ToastUtil.show(R.string.net_error); } }); @@ -4188,4 +4203,22 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } } + /** + * 横竖屏聊天框的高度 + * + * @param landscape + */ + public void changeMessageLandscape(int landscape) { + RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) + mChatRecyclerView.getLayoutParams(); + if (landscape == 2) { + params1.height = DpUtil.dp2px(180); + + } else { + params1.height = DpUtil.dp2px(300); + } + mChatRecyclerView.setLayoutParams(params1); + + } + } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 5d1c3e7b7..2442b4f0d 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -303,6 +303,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveLinkMicPresenter.setLiveSdk(mLiveSDK); mLiveLinkMicAnchorPresenter.setLiveSdk(mLiveSDK); } + if (mLiveRyLinkMicPkPresenter == null) { mLiveRyLinkMicPkPresenter = new LiveRyLinkMicPkPresenter(mContext, mLivePlayViewHolder, false, null); } @@ -323,6 +324,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLivePlayViewHolder.removeDetailView(); mLivePlayViewHolder.setCover(mLiveBean.getAvatar()); mLivePlayViewHolder.setLiveBeanLandscape(mLiveBean.getLandscape()); + mLiveRoomViewHolder.changeMessageLandscape(mLiveBean.getLandscape()); //mLivePlayViewHolder.play(mLiveBean.getPull(), LiveRoomPlayViewHolder.PLAY_MODEL_DEF); mLivePlayViewHolder.setOnMicCallback(new LiveRoomPlayViewHolder.OnMicCallback() { @Override @@ -466,7 +468,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe //数据设置 if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.setLiveInfo(mLiveBean.getUid(), mLiveBean.getStream(), Integer.parseInt(data.getEnterRoomInfo().getUserlistTime()) * 4000); - mLiveRoomViewHolder.setFastMessage(greetings); +// mLiveRoomViewHolder.setFastMessage(greetings); mLiveRoomViewHolder.setVotes(data.getEnterRoomInfo().getVotestotal()); //真爱排行 数量 mLiveRoomViewHolder.setMedaRankNum(data.getEnterRoomInfo().getMedalRankNum()); diff --git a/live/src/main/res/drawable/icon_heat_new.png b/live/src/main/res/drawable/icon_heat_new.png new file mode 100644 index 0000000000000000000000000000000000000000..a6f4784c22b10b95509687a771cc60417f3ba7c3 GIT binary patch literal 1213 zcmV;u1Va0XP)Px(cS%G+RA@uhT7gj&K@3egkP4Ivln$fzq2r2?@6p#rf2r2?@6=|DP=4xaP= zWN-H8lHI-kj~Un*W{|tv%S-ZJvN=_r`O;@@zdSks0B=R)L_}VT$SeE#DI#a8`mnD9 z9|Zt_7b5aeL_UcKe~;F=s$M=h003zCMZ@r7^Qo$Se^LMdd=rt=L8A^;^?vZ)^tRPf z2*4i^c@w;ec}_#?Yd5M&UhKVA0RZ5u<$G-q4Zji*=J^j1A(_+k0l>(;6A?c5Wi&c_ z1F)R;WTeNBixB|+IZhm@>K)MlpfWM_YJkHL+6#ca{Fg~%@vb+X2L7$Q|DdV|X8Z?> zkXNc(RXrZbuYCdd)M5DP-HDu52MDsPjd1`zn_5M7UaRWa>HsWH=|L7EhM%6Lhs&C2 zI{=cE94PBXL`Zl_ZMMjP*7fPR;Rpb@77>P=>y|_lk=nEOs(R=xGSJNNvKXbTxRra> zjX+=oUqppr(Q3XldA7z$KrCqWUh9$A+5(2WPL(M1C#uTy*jhmf`CE=mIzys2(rk07 zn?fD3)%#O6nOYtI3m6>`ttr<7sSWq@n=}C=GMPCgYz-`e^lp^*(=(1^e8&(EdH`4* zYXY_+n)WsTNcOr=ai6Ik@E?KP^3UCVsRzKzB;_;fVbYK%#?1^2WVu_=QUIApg0f$t z!UGDWHe5l9@V+h3iDJDkbtl@m1)$dbDJL7=yi!#jVA2JE#ffrBK7{uN=@!DwZlkRokc*Ea8Bcux?k_OD&rpQCZkl`_tV_VS=7(79qYf zOQG2;$9nUf#^K52u3(;xVvN9HGwB_*q?y~fRY(prw1vjAUEVs1CMUs=hb;hXed~sb zFQW=9jzUmXX*@j~&On26c-rZ<0I-nwv+P#6@8!Kyl#=^&067&pB59}7==YA4J_@vH zRYh_j$-U;Rb(jN2Bt{{c300Q|Naz>O5X8FP5w+((dUZ-+wh-$|2IY#rPwa|V} zRKIq}_(cHBkcebUGNyMgfpa`F8&PHt4yBNP*ycCP+up#pXK-DOH{a8i)|s6ER81MV z!EXkwbZCK~rPx&gGod|RA@u(S&LCrK@gnIKr)aBln8_jBmyx4Ap#)+Ap#)+$v}uej6gGx4903} z)>`IfKX2cPp2b$Z;);8_J3Z6$J;;_XY`OgM1mJI5aGC{FbzekYhzS3_6p?545aYdw ze7EOLL~a4x%mBX%fT~i+V-b0m3EL|d0TIL*0Dc}?LjX+hQxkmXVz=pX6v$!#s!EN& zAJBLUD6Mb`;Hvdv{{12Vs(N10I(dF=wD?NC1K|I}EcV=dmE;(N7uq}to=)_#( z9eXFTLJ5G^K4bcBj{xR3ygWszMTsc`K?UYc&4_pAWhepgn~!=kq^jn7?*Z)e01y0u z^;Pb?;aM91tg2*4OKXu3s;ap#0GgpX0%*yT%E*0zq5DA<8v$UQ!$K{sO8{?swKxj^ z?^9JzB1=o4D2RE_$2sJoo*O4l7PxvG{sLMoR4_zcJcs=aB4Ox>>( zCKX{fSZgWSl&~}UoyJ9kA@wm@O5Y6@14#`4t>EkNztPlJ?`(}#qTcke$12rwzS%9Q zs;3euHPsS-Y_OGuG`5)h;ljsp&i0E#ryj4ZOuIMAhUmPe1uQSn9|*!v&5|`1jm53s zePcl)8t$_1<@E2@bi1~?0A!Yk=#)pPe{;N^YoIX}Zz-(y{m`^~kp(hK(Cp0Ce)KpB zfPO@OYEs5uFa#g~LI;ny+|oD&zZelb9lQ#FqZWTUNS0ChE00000NkvXXu0mjfG^@9f literal 0 HcmV?d00001 diff --git a/live/src/main/res/drawable/rectangle_new.png b/live/src/main/res/drawable/rectangle_new.png new file mode 100644 index 0000000000000000000000000000000000000000..4909ea8027b6bb7c7664586cd8e31e6befa6951b GIT binary patch literal 22338 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 diff --git a/live/src/main/res/layout/item_live_user.xml b/live/src/main/res/layout/item_live_user.xml index b7d2e4a27..b5847e3cb 100644 --- a/live/src/main/res/layout/item_live_user.xml +++ b/live/src/main/res/layout/item_live_user.xml @@ -2,9 +2,9 @@ + android:layout_width="32dp" + android:layout_marginEnd="1dp" + android:layout_height="32dp"> @@ -16,8 +16,8 @@ diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 063e7d89a..e3eee3bb8 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -19,7 +19,7 @@ @@ -136,8 +136,8 @@ @@ -153,23 +153,23 @@ @@ -217,18 +218,21 @@ - + android:orientation="horizontal"> + + @@ -250,11 +254,12 @@ - + - + + - + @@ -515,18 +526,22 @@ android:textSize="10sp" /> - + - + @@ -2307,7 +2323,7 @@ + android:layout_marginTop="60dp" + android:visibility="gone" /> \ No newline at end of file diff --git a/live/src/main/res/layout/view_noble_seat.xml b/live/src/main/res/layout/view_noble_seat.xml index dc53e7d07..8070ad8b1 100644 --- a/live/src/main/res/layout/view_noble_seat.xml +++ b/live/src/main/res/layout/view_noble_seat.xml @@ -6,27 +6,32 @@ android:orientation="vertical" tools:ignore="MissingDefaultResource"> - + + - + \ No newline at end of file diff --git a/live/src/main/res/layout/view_wish_list.xml b/live/src/main/res/layout/view_wish_list.xml index 5cb81637d..8ab47dfb7 100644 --- a/live/src/main/res/layout/view_wish_list.xml +++ b/live/src/main/res/layout/view_wish_list.xml @@ -7,16 +7,17 @@ + android:layout_width="12dp" + android:layout_height="12dp" /> Px;N=ZaPRCr$Poj-^jMHs-pfOn9~p>T?K!VBT9(0~yw6k?%;7B+UNVv|B^BZL%} zYr{2ZjF8GMg|SH?HnE6>f<|It&;;&;OTwkN3o0af5%Pq{Z`pb5+uMCRvwy$Yn}Nr> zT3(|UbWghz2mljY{Qz{0KC_&HV-n^j3r~yjg=+= z{r3l5H>7b0f}eSJpvYfCJphD0Wp)3*9T|!~4HUZSBET$dC7}_DUJcL}=WdEC0vrM>yGjOD1)fXP~^ zdxXNVW5=GqaN)uyb8~Y`Q&Uq1?%ut7?bNALpI^Rw`F@)`PM$ouw7k6h5pr-ckbM3T8^Ea zo%<(FoLE){`HFGVNx&-I^PM|)Rt_CHbTo@#TafeM8kyGC)~+5teE8GG?=t%fjNEh* zFuMVH(3q<7ovz-j}mtUJyHge_#3Iz56L1zG@B8(`(R6c->xkX`EX3@+-s0bnl| zwYz}HgX~g=hj0PB0btb;^rXPR1yCBY%ekJyMRoT8ta1j)HsW&uWgt^`*2F>9H9dw) zbD~6t_v^1*A=C1r^ruNdDx4{@z4xP`5`bC3(bQ{cT!g7~tP5nD3wdt2ril^Y_iY;N z!!dP1?g?Cw4SNNc7FC7ZBe;=G_6~3r$bEy`Tfk)?_YrOYoCqw6GG0E!AXzfvqSenN zxhl78Kio&iy%{E%o1iRQbAHbt_h%ejrr*u;3_XJU!248XU6z}M-4n=Bs?z(-W-e}- zXnA^i`hZQUvImg20POX%Ctcx^TOJGsv$m5BoQ`2}SeYx_oEN>YtgPjxhh#1{6z=-? z@#7yW+u^@!`zUQxxw_JJ`)FNo%UJUE_V%v}3kzp##_la06ZOAlKG2mIa%u5^duMEG+bNA%69nYK1PZ5 zsB_Z8Zb#?WF!C-I%p*A-+ zf9v7_WJZp~#l@q;;qagJ_4S|5o;~}OvIu(Qp0fb+e>~-#8KzMD(*S`L7Cb6hPn%Vp z^zcvTtx9b5IAJ7G7i_hvCO&=Uzlg$Zzv3|I@)@uVe^u_uCS9-Nwh^Tb~-Zkz`i#w?g zHplLdpW~q_yQN$2tw_h5?{{WWA@7PdfH_xPj=B{U>b}Uji13+MYyk&XU8Ko&f1emw zB}H)o99(s~5c95P<(kdOE`Wop)&Y3zy+}nOxdNs>uQ#g|DMb12yh7-fi;QIe6HSu< z32!HL(RB4=>34~mN3X53sj>`U>ZLyhviDEOvr&?QV}MISBU)$WQpy768dxxp!}!=m zpBPH$3T>oA)J@50p117JAq4=supZ6 z93YoQkb7cfxYS%1VCo8x>w{bi+`0jqKAETXgutsDYyv7K?@RZ&bq85l%?LxNa&Q?6 zv0?0Cxzn@Hs?$X$uMi-+Q35K_vhz5%=rTs6EPXBCt(Pt=INeCLs^Yr)2AXj#8L3Xd8YOE0 zY-9oSQV$jqbZW6(2U#{Q3fE0u+ow(F1W%+Fnfd9|VtoK?WMpV%VDqi90F!4@0k)Au zMb$=Ya?z98Vqm`@B6A%kO|VqbimIV%iK46AoLDqVhMsE}IDyjNBJxKJR+am;QJ^mt zT-27QMC6$mI!P4%=KuJc@2m(NYve;Aqr``Q^C$%V=3AxPEmB7E_x}O6O4B!dV2ad_5UwWtJNG1XZ^q6a=BWq7Vv-i^eG;XFDokp zMl>3&zP_H#W($Qv27^&hPyiSzmCESo==u41jYhM5`*x{RYHe-Z)YJsDz-ghQz#Tbke8Py5D02(Yk`fx7TbimY``drM!*w6U5CRDfg^BuY%m5Lc0fNA zLhvzLM~xgwJ!lj0y{jq0AL?af;vM9-&A=TF+w|$mii)wJDND$?e4clim7W{Z5xqOee;*=HA zJth}DKoWAXo7+uGY-2Fy4$_*sI#fyZtU;i#1k!HMk{|QKWJ$T+&<)u(hbHW-I*S5> z!?-i|vosJEi43K7xO<8#8}eOAXC=uj{`yXl*%MGs{=P}l#Na~506n8?9QW3d`;wfS z@7|x`BI$c*S3| zFjS0_AF5}{;}LVF=|(=)ibj#kSz6$w*IKJE_VL;o^TM4TO>xj=5@}`G@r2pCmAGCe zeX#R>uVNS#uw0}#msuEsPR`^P_v}?z;0DT7Q%M0jDT-{~Rp^e~I@}rWsQ0sOU}#K8 zvQIupdQ5r7JA!1@Zcx6^AAT(RqHryrVAO?QJ!mZHVXB^&o>jn*>Nm2RT^cPy5+r zs@KJS`Yq4zMWFq=gIts_qj6$(y48Nhn<8bjB+|-Q)M6a4#J1o-h{)baB8f+IzT<=k z>kfNVB~tyn>o9&ze0qDrRmP?%9?QwLOnno7Iw6qxq3{|Rf z+B%F~5uR_D)Z9CL!w|?bO#S9ohC&qwcD1n7HY0i`Pz+y4Lo9{4F4*r{TJx+wZ6_YJuSdegB1f?WLY(DXzvv>4brbiw zi+w%B<(_HAc4-;*X;TigaL2SKPHE20G@ie8+p&8(_x?Ek3*9}L5(uLox6hWkv1hfq YcFgd-%WYfEe)&?EU_7e!z|YKo0gBURNdN!< diff --git a/live/src/main/res/mipmap-mdpi/live_users_more.png b/live/src/main/res/mipmap-mdpi/live_users_more.png index fabba0e84836b12bd6f5716ba2863dd1fed26724..5e22404ff72d400ed9ddf8eaea56bee1dd096dd1 100644 GIT binary patch literal 3817 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

V(HvY6U{uw0LT4Iz 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 literal 3396 zcmV-K4ZHG*P)Px>{z*hZRA@uJTYHRF#TEa}{dN~v7FJmmks>dZhlN^1tSE{sSilyvb}?yeijO{0 zs`ZsL(k8}4SA1YeeY91Zw9zJwP!X%3Xrlr}(LgHH6F;EASOx@|n5U;2`N{7E_XHO@vPuK_RvQdX-$g#tr2?B0HF zrln`hBM?z5gnR`MPow{cmExz5AOEt#eJOzQp}Iaey7y)XaT}zpNrX|rG%jN?1JdHP z(^~Kz4E4Tffru8PP`yOly7XvIf%XWXa>MQW=0oBxKn_lHwT=~wO=EAZ5)w=M zAdPZ_Y(iAH6JM+Tb5Gp&3j>skrp-dJ_#mVlt6h+T@h#{7<|)82Fu8H+(azXf2@QzE z?c$cztGhZ$Kw;NHNL2i_B;HZUOc9y|1nJ9=`lq<-@)$v#l)>3F5SP}{JSH<o;i0Z{JR{h$K#|%J|=T@dx;ME4Rkc~Y%Vy{ZztSP|A z^MRV7KzW~R>^s5-sG+?LXxRzud0Q9DMI&iTN%%qt-3T!(Fy!jOH(MBgS(qe#_XxI$WL>%~qr5)d3T(EXCAmT$0xF+&*uF4Sxk1R%b2ACFf}+if#}KUi?$S zS@uR3&ifi6pleJ11h4q5fb@6h1YpKZU4Ron<%vL9dHA`GHlV#!zLvnt4*;KjkdhZC zD<01@LliaPCatEZSPc&?Qb+Ul17bOrCfU6$>`t;B7NjCa`)AjSA z>-aIC^}nTEyR{j3@vdw~;xmZ#swi40e*VI}2|(4)9cXL@U|JsTN=8t>rW`Z|xQwjF zYe%AQlf=3DL;)xezyN7?cDO}0y~mYmCT%x2kv+i`1f*FM0n*PF9kJ_Wn#e#bwZ_v z9s64#QQbv9=8AOjkAZ<_-HYHtPN#kqB4(hXRNOniOga$wlRFJz}o2sm-hEXNB8OE@3?3ut_Uk&3szF#|D2L_~x82VK}~?qk~)?3j9D{ZCt9$xJ1vql3{Z=gd?6LfNKC4 zI`kgoWacM(sx@mDFtytWS>CZ-69&Da1Y}i@=)4fMO?GspGL4=ts4?t`&08r8^+4ul{c@{$LP3X^m@MGZJ=k$xACCOlWM)O9yguJhIKLjOs zmR*%G0>r@E6Z(C~Il!40TI4LlGe%=WIUR}(gG6XPzvrgg*8Pc*x}#j#+|QF29~VX_?mXl@?OC4 z_EeERvG^@iBsw%e$cmKV%v-)NA_4}D0!|tZL}dVCT|*LmQ!zby8c?WkSF`=N4duPO zIE{-yiKO0gfC1MqHqqXL^Un;K4n>C$zBU%gWn3 z<)XEQWO(Q9RSDDyjGJYI^5u~LwLIHi2hO?}s2-F);CO*Y>weSBW9mo?@WDTUkyCWH zqFj#@l4waQXWOe$L++A>>}ldIjp+T=Q~ee7qTGYXL?~c56>Y4eFMx++lmkAStdDa`6n4=$Rl16JCS7vu`gIW1BL)YCuUd7Xj~GkKw!$l`N}P!T!Qf#o8pQ<_o{Lm zYBkSMpy^%Bq@m4KPC8|UNxEIybEpLZ)d|b-1zn#E2q3M+_4_&qlQeM@qE$88rfRPs(X7eQB?TVlHd8wLLi>mMK z>H(*F77`zC0(P!<36FO?)*z8sCazmvX8?YCE)YMLE>T#24s48^aS^?nh~Q$D?U)o*cci)85sYaFhF{h zQU%2!#Zdc^fJFjUC*i34E3ee#({V(TkJEM;i*8*F>{#a&-B#wLf@#6{lLv{3X32GJ=0mSu*6}cR|h&|;jVA_r0D6v#;em{CNuP+a$Hx@@QbK2z5RpB!#X4i)%=TelhsUb@-BMHjKBG9B5eo+;){&9d}F!wYEfI@VGnEz~c>E2kefab%S0gO$? z_FEGB!wG|d;THhar|Kk5uGN2_?kwzj>fyb*U{2h~@%uE7k!#lsPc2AEUoB6VxcjUb z*!>Q0hz>?6NsWt|FipFb22_>hZ@#EkAD%S}alA5(#Za!{`+KZQ7&AlHk4i2HY<&gT z^;SURoW#uD#l^JzVa94Z0IYi~=gf`KmQ_4oKPnVviytk^-#$w`>ycUaAT}GI?slg896EJFxZ<*F_14pFiEDih6PFvt4h1 zDkahu_QRJi2jaPU&)qw#qLj!x3M*(OF#UGm)X~76O~7kQ04j$0Qb*!WOgZ%3n3=$Y ztAS&m0dM>cXxWh}hE0{-UQiv)3d~>D{Vi+-^3l2~$Rq0^9c!*iu1*_f6F~9Qxc%EqypLTJV3`uJh$STkC|g5ULnGP*s?CqN=YTffn^T* zZ2@}CDFu$}-wkN*lX6$IJq;!Y1nxv-;s0|W*0ClP=!e>GhNL6SaZP$ojm0S^CPhkY|1mLEz$GKmf*6ZYRajzA zOmtPx&u1Q2eRA@u(nT>4}F%X4kI)DyH1&|I%1%wJ96_8XwQUOo_p#qW$2o(@2AXETU zFz7>e!Fxe0q_2eIR)Am57{XsdK5SC#{2+8Q*)Ct&8k* zAGOv#JnxP`I5aQj;5j|A*H9{$8AV@WtVs%%z;ppHvp0diYfc#|#!lwC6cP3Lia{`8w;F)F$f}|2VT_SAPLUJ!gFMRwCSV=dUeoAMVZ6*q?B$l&v*&Sih%n8H27mFg`m^7UYGW7rchvpydS_GFV{MB+@~=8c)VyT5de7IwmFzhejkvWE_3ifUNE6Z zZ(z+qSyu!C2xM(OpoQ|t(R*49S3xdA`P7azbnw#peEQKfC>sGlS1wJV>5{w<@3GFC z+@(%W*Dsn{cLNAfnEN}xXt`9GXQ&f9x$5bo(gBGI-j2VOwSbUjTwl8fyh9OiWHg%I z(>@#ot#d!M3nHzw{@*=f&XjL9fQ0&@_K6=M_G(%uUBCF(%f$d%IkD~M4*<69;nw~S i5omd6+t2qt0)GK3i@QK=XexIA0000qr4~-N< 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 MU&mOxM$10te