From aa94a834ce4b79b0bfc177beff8636aedfcf3d07 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 10 Mar 2023 16:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5UI=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/svga/living_black.svga | Bin 0 -> 3412 bytes .../adapter/MainMagicIndicatorAdapter.java | 6 +- .../app/home/fragment/PartyFragment.kt | 2 +- .../app/home/fragment/RecommendFragment.kt | 1 - .../nnbc123/app/ui/user/UserGiftActivity.java | 7 +- .../nnbc123/app/ui/user/UserInfoActivity.java | 53 ++- .../user/adapter/UserInfoDynamicAdapter.java | 1 - .../app/ui/user/view/UserInfoInfoFragment.kt | 138 +------- .../ic_userinfo_arrow_right.png | Bin 0 -> 422 bytes .../res/drawable-xhdpi/ic_userinfo_hall.png | Bin 0 -> 2006 bytes .../drawable-xhdpi/icon_home_page_edit.png | Bin 0 -> 1118 bytes app/src/main/res/drawable/shape_58559d.xml | 22 +- .../res/drawable/shape_bg_userinfo_top.xml | 15 + .../main/res/drawable/shape_circle_fef411.xml | 8 + .../res/drawable/shape_f3f5fa_corner_8dp.xml | 5 + .../res/drawable/shape_f8f8fb_radius_4dp.xml | 5 + .../main/res/layout/activity_user_gift.xml | 4 +- .../main/res/layout/activity_user_info.xml | 301 +++++++++--------- app/src/main/res/layout/fragment_home.xml | 3 +- app/src/main/res/layout/fragment_party.xml | 2 +- .../res/layout/fragment_user_info_gift.xml | 10 +- .../main/res/layout/fragment_userinfo_cp.xml | 7 +- .../res/layout/fragment_userinfo_dynamic.xml | 4 +- .../res/layout/fragment_userinfo_userinfo.xml | 270 +--------------- .../res/layout/list_item_gift_wall_info.xml | 13 +- .../drawable-xhdpi/icon_dy_list_comment.png | Bin 1355 -> 1536 bytes .../res/drawable-xhdpi/icon_dy_list_like.png | Bin 1029 -> 1655 bytes .../icon_dy_list_like_false.png | Bin 1304 -> 1460 bytes .../res/drawable-xhdpi/icon_dy_list_share.png | Bin 1247 -> 1511 bytes .../res/layout/item_userinfo_dynamic.xml | 20 +- 30 files changed, 301 insertions(+), 596 deletions(-) create mode 100644 app/src/main/assets/svga/living_black.svga create mode 100644 app/src/main/res/drawable-xhdpi/ic_userinfo_arrow_right.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_home_page_edit.png create mode 100644 app/src/main/res/drawable/shape_bg_userinfo_top.xml create mode 100644 app/src/main/res/drawable/shape_circle_fef411.xml create mode 100644 app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml create mode 100644 app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml diff --git a/app/src/main/assets/svga/living_black.svga b/app/src/main/assets/svga/living_black.svga new file mode 100644 index 0000000000000000000000000000000000000000..e1d14828498ee633b8cd41f76676a9ad216429de GIT binary patch literal 3412 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java index f9e6f90da..294d0880e 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java +++ b/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java @@ -20,7 +20,7 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter { private int textSize = 24; private float minScale = 1f; private boolean showIndicator = true; - private int resId = R.drawable.ic_home_indicator_top; + private int resId = R.drawable.ic_home_indicator_center; public MainMagicIndicatorAdapter(Context context, List charSequences ) { this.mContext = context; @@ -36,8 +36,8 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerTitleView getTitleView(Context context, final int i) { ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true); - scaleTransitionPagerTitleView.setNormalColor(0xFF8A8CAB); - scaleTransitionPagerTitleView.setSelectedColor(0xFF3D3D3D); + scaleTransitionPagerTitleView.setNormalColor(0xFF878B9C); + scaleTransitionPagerTitleView.setSelectedColor(0xFF282828); scaleTransitionPagerTitleView.setMinScale(minScale); scaleTransitionPagerTitleView.setTextSize(textSize); int padding = UIUtil.dip2px(context, 5); 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 484900af3..793f974d3 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 @@ -74,7 +74,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList .onEvent(StatisticsProtocol.EVENT_HOME_BANNER_CLICK, "首页_banner") } } - + homeViewModel.getBannerInfo() } override fun onResume() { diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt index d8fe58eea..a0a159631 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt @@ -200,7 +200,6 @@ class RecommendFragment : BaseFragment(), } private fun loadData() { - homeViewModel.getBannerInfo() homeViewModel.getHomeResource() homeViewModel.getHomeSingleAnchorList() } diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java index 5de751a42..7caa5a198 100644 --- a/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java @@ -9,6 +9,7 @@ import androidx.viewpager.widget.ViewPager; import com.netease.nim.uikit.StatusBarUtil; import com.nnbc123.app.R; import com.nnbc123.app.base.BaseActivity; +import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter; import com.nnbc123.app.ui.user.adapter.UserInfoIndicatorAdapter; import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter; import com.nnbc123.app.ui.widget.magicindicator.MagicIndicator; @@ -37,10 +38,14 @@ public class UserGiftActivity extends BaseActivity { tagList.add("幸运礼物"); CommonNavigator commonNavigator = new CommonNavigator(context); commonNavigator.setTitleWrapContent(true); - UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList); + MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(context, tagList); magicIndicatorAdapter.setOnItemSelectListener((position, view) -> { viewPager.setCurrentItem(position); }); + magicIndicatorAdapter.setTextSize(14); + magicIndicatorAdapter.setMinScale(1f); + magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center); + commonNavigator.setTitleWrapContent(true); commonNavigator.setAdapter(magicIndicatorAdapter); magicIndicator.setNavigator(commonNavigator); commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java index df4f04c9b..0ab19c4c6 100644 --- a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java @@ -5,6 +5,7 @@ import static com.nnbc123.app.ui.user.UserInfoActivity.IdentityState.OWN; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.view.View; @@ -15,6 +16,7 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; import androidx.core.widget.NestedScrollView; import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.viewpager.widget.ViewPager; @@ -36,6 +38,7 @@ import com.nnbc123.app.databinding.ActivityUserInfoBinding; import com.nnbc123.app.family.view.activity.FamilyHomeActivity; import com.nnbc123.app.family.view.activity.FamilyMemberListActivity; import com.nnbc123.app.family.view.activity.FamilyMemberSearchActivity; +import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter; import com.nnbc123.app.relation.cp.fragment.UserInfoCpFragment; import com.nnbc123.app.ui.im.avtivity.NimFriendModel; import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity; @@ -46,6 +49,7 @@ import com.nnbc123.app.ui.user.adapter.UserInfoPhotoAdapter; import com.nnbc123.app.ui.user.view.UserInfoDynamicFragment; import com.nnbc123.app.ui.user.view.UserInfoInfoFragment; import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel; +import com.nnbc123.app.ui.utils.ImageLoadKt; import com.nnbc123.app.ui.utils.ImageLoadUtils; import com.nnbc123.app.ui.widget.ButtonItem; import com.nnbc123.app.ui.widget.ObservableScrollView; @@ -56,6 +60,8 @@ import com.nnbc123.app.ui.widget.rollviewpager.RollPagerView; import com.nnbc123.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; import com.nnbc123.app.utils.RegexUtil; import com.nnbc123.app.vip.VipHelper; +import com.nnbc123.core.module_hall.hall.bean.ClanAndHallInfo; +import com.nnbc123.core.module_hall.hall.bean.ClanInfo; import com.nnbc123.xchat_android_constants.XChatConstants; import com.nnbc123.core.auth.AuthModel; import com.nnbc123.core.im.friend.IMFriendModel; @@ -117,7 +123,7 @@ public class UserInfoActivity extends BaseBindingActivity { + if (clanAndHallInfo != null && clanAndHallInfo.getClan() != null && clanAndHallInfo.getClan().getId() != 0) { + ClanInfo clanInfo = clanAndHallInfo.getClan(); + mBinding.tvHallDesc.setVisibility(View.VISIBLE); + if (clanInfo.isUserIsElder()) { + mBinding.tvHallDesc.setText(clanInfo.getName() + "公会会长"); + } else { + mBinding.tvHallDesc.setText(clanInfo.getName() + "公会签约成员"); + } + } else { + mBinding.tvHallDesc.setVisibility(View.GONE); + } + }); + } @@ -152,7 +172,6 @@ public class UserInfoActivity extends BaseBindingActivity { mBinding.viewPager.setCurrentItem(position); }); + magicIndicatorAdapter.setTextSize(18); + magicIndicatorAdapter.setMinScale(0.77f); + magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center); + commonNavigator.setTitleWrapContent(true); commonNavigator.setAdapter(magicIndicatorAdapter); mBinding.magicIndicator.setNavigator(commonNavigator); commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); @@ -324,6 +352,7 @@ public class UserInfoActivity extends BaseBindingActivity(), View.OnClickListener { - private var giftAdapter: GiftAdapter? = null private var skillAdapter: SkillCardAdapter? = null private val vm: UserInfoViewModel by activityViewModels() - @SuppressLint("SetTextI18n") - private fun initClanAndHall(clanAndHallInfo: ClanAndHallInfo) { - val hallInfo: HallInfo? = clanAndHallInfo.hall - val clanInfo: ClanInfo? = clanAndHallInfo.clan - val showApply = false - if (hallInfo != null && hallInfo.hallId > 0) { - binding.llModuleHall.visibility = View.VISIBLE - binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString() - binding.tvHallName.text = hallInfo.hallName - binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount - binding.tvHallErbanId.text = "ID:" + hallInfo.ownerErbanNo - GlideApp.with(this) - .load(hallInfo.ownerAvatar) - .placeholder(R.drawable.default_avatar) - .into(binding.ivHallAvatar) - if (showApply) { - binding.tvApplyHall.visibility = View.VISIBLE - binding.tvApplyHall.setOnClickListener { applyJoinHall(hallInfo.hallId) } - } else { - binding.tvApplyHall.visibility = View.GONE - } - } else { - binding.llHall.isVisible = false - binding.ivClanArrow.isVisible = false - binding.tvHallDetail.text = "公会" - } - - if (clanInfo != null && clanInfo.id > 0) { - binding.llModuleHall.visibility = View.VISIBLE - binding.llClan.visibility = View.VISIBLE - binding.tvClanId.text = "公会ID:" + clanInfo.id - binding.tvClanName.text = clanInfo.name - binding.tvClanMemberNum.text = "公会人数:" + clanInfo.clanMemberNum - binding.tvClanHallNum.text = "房间数量:" + clanInfo.clanHallNum - GlideApp.with(this) - .load(clanInfo.avatar) - .placeholder(R.drawable.default_cover) - .into(binding.ivClanAvatar) - GlideApp.with(this) - .load(clanInfo.levelIcon) - .placeholder(R.drawable.default_cover) - .into(binding.ivClanLevel) - if (hallInfo != null && hallInfo.hallId > 0) { - binding.tvHallDetail.text = "公会·房间" - } - } else { - binding.llClan.visibility = View.GONE - if (hallInfo == null || hallInfo.hallId <= 0) { - binding.llModuleHall.visibility = View.GONE - } else { - binding.llHall.isVisible = true - binding.tvHallDetail.text = "房间" - } - } - - binding.ivHallAvatar.setOnClickListener { - if (hallInfo != null && hallInfo.hallId != 0L) { - ModuleHallActivity.start( - context, - hallInfo.hallId, - hallInfo.ownerUid, - vm.userId - ) - } - } - - binding.ivClanAvatar.setOnClickListener { - ModuleClanActivity.start(context, vm.userId) - } - - binding.ivClanArrow.setOnClickListener { - binding.ivClanArrow.animate() - .rotationBy(180f) - .setDuration(200) - .start() - binding.llHall.isVisible = !binding.llHall.isVisible - } - } - /** * 礼物列表 * @@ -154,31 +61,20 @@ class UserInfoInfoFragment : BaseViewBindingFragment viewPager.currentItem = position } + magicIndicatorAdapter.textSize = 14 + magicIndicatorAdapter.minScale = 1f + magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center) commonNavigator.adapter = magicIndicatorAdapter magicIndicator.navigator = commonNavigator commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE viewPager.offscreenPageLimit = 2 viewPager.adapter = pagerAdapter ViewPagerHelper.bind(magicIndicator, viewPager) - viewPager.addOnPageChangeListener(object : OnPageChangeListener { - override fun onPageScrolled( - position: Int, - positionOffset: Float, - positionOffsetPixels: Int - ) { - } - - override fun onPageSelected(position: Int) { - viewPager.requestLayout() - } - - override fun onPageScrollStateChanged(state: Int) {} - }) - } /** @@ -216,20 +112,6 @@ class UserInfoInfoFragment : BaseViewBindingFragment() { - override fun onErrorMsg(error: String) { - toast(error) - } - - override fun onSuccess(s: String) { - toast(s) - } - }) - } - private fun createSkillEmptyView(): View { val textView = TextView(mContext) val textViewHeight = UIUtil.dip2px(mContext, 47.0) @@ -248,7 +130,7 @@ class UserInfoInfoFragment : BaseViewBindingFragmentPx$U`a$lR9Hvt)UiqfK@bMue-0sn$%EKvVkd%e@2<136;fFE7)h(Xft7`oU}2$! zP4pJzu=L^+B-(0WAIQjoVi1pT&JK6QUVA&s$3HtmsQE`V_rU|D9r6kK1f>Z`>-`(7 zG(l^}%QJlJ&lqp9Y2OkNOF_TuMJ-P3=!}8G{8DBAsBR=|6kJp#1(jnY7h5*#Mk zE`hFy(9lAPfH`WIWP1d<)Iy4Z+DIorO{6oR7SbtD1L+)CjHHvuto6$-a}{6_l9+p8 z*tsaP%+-L`Y1&$uHXjIR|A2T9na)w=z#P|_Hg6c%nOoqm#Jn9v8!wdt|H1*71ZWsz zRwrd}`B|qec8zli)WA6dYT=v!HF08~Hckw@v(M)QKA4-#e@|=Cbc?1qv7?lMt*^_S z;~XUT6cd6|fZvybpx5oLkIU}4Mdw8cF1p;se-D(V=o9n_N)wRQ*ZvKD0+YS7DU&5Q QbN~PV07*qoM6N<$f+}&mKmY&$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png b/app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png new file mode 100644 index 0000000000000000000000000000000000000000..5bfc9cca9e27a475b347b815d23ef51127f91315 GIT binary patch literal 2006 zcmV;{2Pyc8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2Wv@0K~z{rtygJm zR8BWj3Rh?=-0O&~F108NMn{YK2m&T5CNW8l`rpLJxJvsH@ke-qqd{_-f@!6}9`ufpHPrzh9RON3C^+ z!ee}#o4m!c&LY#P;loKVTT@RW{2U4WKnJGyp^ffq2}}1%p7| z1Ry_5|7N5r>GDqf$4Y4IQ#WtHGV#J7j%{`@{-j%lO zp}!kw)ZIrHiU1=v{i;N2HT0^RN7!>2iS3rt7qJ@IER*y#{sF`?9QbJ$GrbJKKW(mp z;EBb&c|dbB(0kTZ`Va~MSFqnrYiCZLam9@pPHVH=kN22*cKmbPZFPOCLxWOiNFd|E5x~!9;s8d zE?LSLt*d4zw6toR$UuJ2?;0^iaoJ*pP+oe!h}ae%;!Au|m4tL+2C8M^07E^@C8ef; ze^|Mk=am8b<|m!jFVfFb{NrAY@C0R#%``@Aiw~P9eTr{C(ul<^JzX~D;9zo!JXyL> z;o_+Z2M%jA^E8UCpn%c2PNAeEG46-oG)|q-n9ay8X4*ZyUu+-rB|iC>gbb-fsZ5Hp zCi{(uR9&uc6Vr3HPvf)Q3F3>cQCQ9sT1mp5F2>6G-e(#^5n#pj3Jd3_lRNLjyP5cq zPK+y%!FJVl!!DA``g7L`?mc$C`zg~k+csI9?4W>idc`30}G%xNu-~(Y}*GG-u{FsJe7#n^-PnH-u1I{B0at5^cd5R@R@x&Cb3MDdgT-dbL7pyGH#HN3Upc z^?eEt-<_D>bW)>{C)j)TB$&@%*Qf2=hfEQxmq|JDKI7HJPU#48`!aCOk_p9=InfQfUrLLBRk!ga z-3RR0o!rMi(;Nc-g9ys38D zY8w@-`cK{uloaqid0eBti*<}CDJ`Tk?zvLx<@V}9itTgTv|SoJ6w^k<i05?&N@nQ9x#TJ>zrI4+7FUiwZm3EKV$ky~urQPwKHoG%19 zjMUUB=L<@}d;j+5Z&0h9r*vdYrHAGMtTFlFAlH*14OTKGVeStvE!m39k-1_+Y>Ca| zw9V#-7&T&oNBE^w(T}bChCKiI7G){uX$Sgvb+N>A1{h3vAxlCjPj+tD=cd=RPE`i- zw*QyUH$Pr@JEl>=O~TiR2l?O?k}-MJxNhW{9pWAmGD#o2aSlGscy(LY@I>C2en(BE zA67>k`fwChdz^>BdA&#l&mn9cDV$7;^SUorlgu;kj21+pflqjWGx zqpia*{)j*|(Gd%ZMV;jmwaN0Ij&NMB34>z;fAX}naZyA3niLz9Y>+)Mu2eIdI!Yp9 zyfY4?C5GV9D1r@9ULrue0u!V$32HmDjQs&7V$HxC1F)=R0Y;x`|olrN# z_Uo}|tZMzExp%~e^-RR@28oE?A;iTv}&_QEsT$!(L zsw?unv>dFfJ69G81|HXOy@ngVoWIa^zJZOKi^uevJ+azemROa~8Gk9m*c>x^-`TRI zlIL-B)Yi7bSL*C*n%RerV&C61U8bjI4=0UE5a!r3=GFg*)r&RCXK1hq^j# o44ms*39b5G*;4qus~!QszYsM#nm--F4gdfE07*qoM6N<$f`>uV)&Kwi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_home_page_edit.png b/app/src/main/res/drawable-xhdpi/icon_home_page_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..59f2dd68cfc739cb761f78f34e39e2c79b256fc7 GIT binary patch literal 1118 zcmV-k1flzhP)Px(7)eAyRA@uxo4Jb>K@f+(_7-mu#QQ!_L_EOE*hJ98M8PXC68r-M5sXdD1wj*2 z6GLNBP(0Ul6;BX!z45l?_pH&`@x8Y*-81h!cN#X>-R_$Hrn;)Ds(Tz2HShgsV3Pez z0LBAjfiZxy$9mv9@D2C^d{4qUoS%7Z-7DPoL)#N zEp$Rd9`3!L0?Y=crnFbe1OdUn170}i-p2}!0yfZjrp?&7V<*5_p;H2fSgh{o1EHX=iFeCN#q9h-m9-bXBBxs2l~D=aM}8>Ef=tD zG0Olsr(SGwW&?S)vSESEURMAUdyzCXr%yotaCY4m*fhK9KY&fR1>M(9(=CC`W~JF) zUB;~zoR+sV-PESr0Wa!72bI^VUOMLu8Gby048H<9oMI6}LEJrOXaL%`KG<2C`Z!)pPuvqS!9ISsrVm=+-XJRrMQ z8vt(SkfDBO+w|KD9Jc@O18(M!*{;i5=iGgDXaJjMUKg0WU$$i|h}~AQiJ4y-R&ovk z*JA`)5#feBb^@$w#r!~_S8Ut`;CP^nWLOsV6mTX|W-|P#bM8d~tay2Hpy0BAtArKW z2j^U$vjky%;BuCrGJvawZCI{ML%=G$DM<)zvA~^xP1yPcJO`K?N*k%+PQnWDxqy`< zs7@8yLN(lJSn&-CI5fISUQh^dH()j2j{?^IJ1$hc0ZY0ltRgP$@j8WwZC?evA!q#C z>S0ARToiT>a6~m|U}r2X@KeAWBetX>+fq?j$vy^bH_*)`0Q*h>hrm__T=kL;g{=a( zv81bXS~0Ly05_agRol{5;AG0~LK1devfIf+yLVAGa3gt;Cc2#-wt_Ab_;-4!CwcE<3IJu7coKNs_BjXWm{!HS zErDi{4EtRGFyNRHPr8VwLfM_ji6z6=7_5F*F@0C0+#w|%T{j9X;)RxJi_Bl%{$h~< znZ8=ie~Wmg<2=0`0fSj(*s(+s*k$E5}=k6oVwaf4PBvmRF-64&9qug|3x)3Tzl`dnKwXay1V zxR{n&+Hzv`xO$j^mZs}*xike`pXw0_wkO5bQHS$05$mTV*`HZIt kcs)MUYL?0N>Zf?W0IJr!B0pbHtN;K207*qoM6N<$f`0S{7ytkO literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/shape_58559d.xml b/app/src/main/res/drawable/shape_58559d.xml index 185d4a2f0..2728a98d0 100644 --- a/app/src/main/res/drawable/shape_58559d.xml +++ b/app/src/main/res/drawable/shape_58559d.xml @@ -1,9 +1,15 @@ - - - - \ No newline at end of file + + + + diff --git a/app/src/main/res/drawable/shape_bg_userinfo_top.xml b/app/src/main/res/drawable/shape_bg_userinfo_top.xml new file mode 100644 index 000000000..805687a99 --- /dev/null +++ b/app/src/main/res/drawable/shape_bg_userinfo_top.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/shape_circle_fef411.xml b/app/src/main/res/drawable/shape_circle_fef411.xml new file mode 100644 index 000000000..1c8b39f41 --- /dev/null +++ b/app/src/main/res/drawable/shape_circle_fef411.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml b/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml new file mode 100644 index 000000000..c5ced74fb --- /dev/null +++ b/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml b/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml new file mode 100644 index 000000000..2a13c73d4 --- /dev/null +++ b/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml index 802e7fd94..3ee4fbd45 100644 --- a/app/src/main/res/layout/activity_user_gift.xml +++ b/app/src/main/res/layout/activity_user_gift.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_normal_1c1b22" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 706429199..ed367c3e7 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -7,8 +7,7 @@ - - @@ -32,7 +31,7 @@ app:contentScrim="@color/white" app:layout_scrollFlags="scroll|exitUntilCollapsed"> - @@ -44,36 +43,36 @@ + android:layout_height="237dp" + android:background="@drawable/shape_bg_userinfo_top" /> + android:textSize="12dp" /> @@ -97,12 +96,22 @@ + + + + + + android:layout_marginTop="47dp"> + tools:text="KiKing天地天地King天地天地ng天地天地" /> - - - - - - - - - - - - - - - - - - + tools:text="金牛座" /> + app:layout_constraintTop_toBottomOf="@id/tv_nick"> @@ -283,57 +226,133 @@ + android:textColor="@color/text_normal_282828" + android:textSize="13sp" + android:visibility="gone" + tools:text="XX公会签约成员" + tools:visibility="visible" /> - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -398,13 +407,12 @@ android:id="@+id/fl_indicator" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="20dp" - android:paddingBottom="5dp"> + android:paddingTop="11dp"> @@ -416,7 +424,6 @@ android:id="@+id/view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_14" android:layout_marginBottom="@dimen/dp_60" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> @@ -426,9 +433,9 @@ android:id="@+id/vs_bottom_layout" android:layout_width="match_parent" android:layout_height="74dp" - android:layout_alignParentBottom="true" + android:layout_gravity="bottom" android:layout="@layout/user_info_bottom_layout" /> - + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 73a22147d..51281726a 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="bottom" - android:paddingTop="40dp" + android:paddingTop="50dp" android:paddingBottom="@dimen/dp_10" app:layout_constraintTop_toTopOf="parent"> @@ -46,6 +46,7 @@ android:layout_width="0dp" android:layout_height="30dp" android:layout_gravity="end" + android:layout_marginStart="15dp" android:layout_marginEnd="15dp" android:layout_weight="1" android:background="@drawable/shape_room_temp" diff --git a/app/src/main/res/layout/fragment_party.xml b/app/src/main/res/layout/fragment_party.xml index 9099f8978..41ebfb5fc 100644 --- a/app/src/main/res/layout/fragment_party.xml +++ b/app/src/main/res/layout/fragment_party.xml @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="15dp" - android:visibility="gone" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="345:80" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_user_info_gift.xml b/app/src/main/res/layout/fragment_user_info_gift.xml index d794a10e1..e29933be2 100644 --- a/app/src/main/res/layout/fragment_user_info_gift.xml +++ b/app/src/main/res/layout/fragment_user_info_gift.xml @@ -7,15 +7,15 @@ + android:layout_height="match_parent"> + android:layout_height="match_parent" + android:paddingStart="12dp" + android:paddingEnd="12dp" /> + - diff --git a/app/src/main/res/layout/fragment_userinfo_cp.xml b/app/src/main/res/layout/fragment_userinfo_cp.xml index bbeb20bdb..fdc42d357 100644 --- a/app/src/main/res/layout/fragment_userinfo_cp.xml +++ b/app/src/main/res/layout/fragment_userinfo_cp.xml @@ -3,13 +3,15 @@ + android:layout_height="match_parent" + android:background="#F8F8FB"> + android:layout_gravity="center" /> diff --git a/app/src/main/res/layout/fragment_userinfo_dynamic.xml b/app/src/main/res/layout/fragment_userinfo_dynamic.xml index 1f894c2f4..57290aff6 100644 --- a/app/src/main/res/layout/fragment_userinfo_dynamic.xml +++ b/app/src/main/res/layout/fragment_userinfo_dynamic.xml @@ -5,8 +5,6 @@ android:id="@+id/rv_dynamic" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingStart="7dp" - android:paddingEnd="7dp" - android:layout_marginTop="@dimen/dp_14" /> + android:background="#F8F8FB" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml index c3e164fbf..eefa799a5 100644 --- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml +++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml @@ -7,15 +7,15 @@ + android:layout_height="wrap_content" + android:background="#F8F8FB"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="25dp" + android:layout_gravity="center_horizontal" /> + android:paddingBottom="5dp"> @@ -47,9 +51,8 @@ android:layout_marginTop="3dp" android:drawableStart="@drawable/ic_gift_diamond" android:gravity="center_vertical" - android:textColor="@color/color_999999" + android:textColor="@color/text_secondary_878b9c" android:textSize="11dp" tools:text="10" /> - \ No newline at end of file diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png index ffb423a2ab59a037da3cf9e4b518c905d475c706..63df1c5ecb7c5a2176a0949f35f6773aa2e2e412 100644 GIT binary patch delta 1519 zcmVPx)x=BPqR9HvNn0;&$br{FL&$TNXV~_#9 zpa=v}RAfDb$Pk#lyN;Ko3lMY>5raXE_!obu7=k)ujE0z)_=gcOBnAb8sF_ zGTt9yx3t7RzvLGuC`TY6V)yGXz9G;!)0r6t5p6XR@i)rLXPp{|{7p@*6I^chs|MpK zB1pDRhXhg;#d{=IjGREGGCJ^W8V1}hv1^5@mh2q}NPo6XINbIy!`KeOZ7C>^TPmHO zL#bXs=9)3MxcR>_@o^)eYXeoq3AnNG;2kbcUL%3-wQQK%&YkTlt*UycE7PYJP1iP_f*lS)`GTE-7UehYxxEhfSyzfWH82oww+nhYuLsJ)xmMbLacSq!F3 zPCi0J=YQ#pz4n@l$D!Z1NSS#&W#2=gP&oD>h@Y|PxB7kZn(GOZiWLe+-UrdzTzS$! z<_TO_G@_jdg#agvgnsAsDpmHR>P2k4hxvqA31;r>zI6!tMZs3WJ!k(iRc*sH<|aNU$sQYD4B?+ z6o2_kQ{>|R2Po13&{!uRi`Lxo=Q@7Qud1rjhZ0H%;Wkj*X?Fv?OBNE5R)A(&i(bc6 zzh6G)07P|l%`44!ot?k!=mR`$7YNM#GqIG`zVspGb1&}zTKwy&#e zeuCN9W(V3!NG_*o2y2j;u08_BszbqqA36L05X4sL}Uvw z;y-kqTbC>;Ys=*q+7qh;^Vim#8Gqdg(x*ALAEr?-9NR?1FD8TWSqYvwiZU(Tuk;1i z-#a1N?$Oz3Cc@|>5WnSDXQZ0J{c~xdh*^Gy+Pz3suYJx+<&2Ga?IMC@IF*Cp#hk83_}>WJwv$38z4t?lW; zu2lK#66ypBf$)`)NHoXeXO3mdo=e3{AaY4d)v}VBTz36_N;fvf3f&%51I9Xl+zutX z2%yiqj~NAas{wM6UoG>R>S*^G{Q{*tEVbNNPi+3#Km~(cO8`zMx@pS7h2Bfo1e9{F zuWuQdUpPF#I{P587tE8HX=JWHA~F-2r#}(3!bm)?X|uj}n$Un1x&}qA%Jqf=`WL|L VQ$w|-lG*?O002ovPDHLkV1oFP!WaMm delta 1337 zcmV-91;+Y-49g0TBYy=FNklh()G6c znVkhiNppxWd89AAte$y*H2yo z^b%t)3;r2E|9==ELnNt|3Cjow5Ba83q&bh<9UmO<#>zk|;>PSi0o?%RxXN>qc>PU* zlkMqrdSHwo71QGJcum0xw@HcD0Zek0zd;5U+V*=Vlw1ai#1gvzj=M&GL6cAT$*%>F z=OfbCynr3;^Px;o+P0EUmVtD=d7i`KM-NZ{%Pq^?dw(q(-q|UJ^ZC?C52&fBDR`nc@C?9OO@PwrwE2%8cFCGG6Q=h~ zic3bYZ-3gkkGi&Rzv$OTB5S9R7FrFEGb>#DIF(8jJiV?r&vaOniW$IZ+cIZ(K2%srvVxs*W@0x1^GbTg z9y@2QD80E)BxY2seN`Y`Pt-chM=H`ssI#-?9)C5~u&QM-N!st%v%sQ!##HSCu~g-5Bs__Mt(d?PU8h@Uny72-t+5rkl$PJy=){Xuzu8$e5 z0)Kc%jgi2*T*fs0`Uc&2jhNO0d{GE$wKB;ao?g}G@t%O!bT8PJInhhm?*ML5hEj8C zJ3F@h;&-ZQB^*8^uGF!WV`cCE5dVDDp?iDplfw_whQ`*r$&o*~wnuHtywltEogl0% z0Re5Dmf2oWH{&EU=*COLc-JlXPwbpoUw;CM#afyqXxrerblA3%YFCu2e>`~V>e@nq zkaL89+uU?F=Q8HD5>PyDOztm0rERK`1;nG4)!sE8AiiSW0-)8EPZ#>N+jsBY(l>Ot zMicEIPPkF}!nTr+jR%mb$H`NB-WCEcd;Uov;cbR8P<`WzcM3;4+E2_hK_&>EO==Rp{E)+=D>ia9q*~;DtyHs#dy3e+&|!$Agms~CPx*F-b&0R9Hvtmr0BiRUF2@SNqb-OpGz{ zq%j;da^j%Fq5*^;OdN-02xx*55d@S#1c?C+BBQn_xWz;WK}p1Yxfl-|JYbBBVgt{nAQz23=Z(Wz}R<)8y^GTe8g6tZDtSRAC8)^?-_yNJ_v@pVAwaoFzBpH zV8-__@CmM5Ji}H$RqX`q3B=zXUjx@G0sLm5CGVp>4O1@D0!#zo{5M3^Eo}YvZ|M?# zdVC3-@HiOe0Dl}{Os?b}8!#P!nHSNDcClq+XR=UTK(qzkIQ%LMwgb%wXvP3<(YJtM zNC<+lEOm%UzqJt6_X=>!It<=4d`GD;MmQQEA#_k*2 z*#*R3*t;AizCyLa5Y>RV4zw}~nQHScAVUJsLux3Y4m||jqg8bPhk$&*2>>UQ%MLi= z#wxaa?8`(UK00dR_FH~Iy?h&L6(Gteq&F8ElR`=*`b^)^p<*XeU4aoy0;E;7Qy@14 z+?-r?j(@ED6IU=N1=_!D7)|~uDpw(aYCw}LBl%S<2p|n*NHB^k5$q}eG>C{D^__SK zvYCKf!0`bB^74R7t00x)@n{OPXUi$nDjQIl0O|y!?P{vPR9U8>ECnVk(V3(Gs4@s3 z0#(23m?I#UEDHfY4|oN+2+Fk1q(D11{ff%O9DfN^mFiIZWMd(T2Nf40>-1->h*FEx zNq`i*tyS^>PbuUV0DnLN+5R6X(Bm6xn7HhsG6^)uu1MM?EYRv?o><3@_@6mk+ozRD z9zt0xZ1Vs&kO~n{FbMcXil-i@-hSv*+oFQmSi_?J4gWvr8+Fi+NGgHGN?Er zAb&3h1Vtbikjo$7DbU7|e=s>QfT{)}yL3TRc91>Vrp^O9p}Q1PCBvp#xs2GDrlzz6t*hMG>}J@DTTs8fR-Enm;$XCK7v|# zPZ~p15IZt#M(cXOX&_r$<^TdHFV)EnN`HlHr<4MXth@tp{Q}C9Otg)dYLF^&LM4?w z!nRCsw|!PMsqLCfCQ|B?Lar;bEXV+bgB-2Koo&60uUhsws+E|m8g0w0(K#G0M#-3Qw4s`#LThVM?K($;DsUNGa#R;(HT=wvu-@Cj0ip9%OZ+wPY#TMOOG*>l$B~X2& zc(!O#K_nPbhhY2=2+6J@tr&(e!Zz>wV#@JDw8*84#t=oP(5RUyl$vjn!q-tOd!;$4 zLqG{kkWr`Dg6V8zTlc@OhqT@k8xTh)QLh^^p0b0Q?pae4x1tdrL!-t-JS9+S&Piel=@=sFjfSxRmx5Tqgk)6# z$Q3wDXD8cz==Hv5YJDNUcm57U(NQ$&Y33y@r6ZPfqZR3`Z6X*S2q}p31b;)S?P5NNW>FCl_yRB z*dRt+8ZF4KFpyR`-Us;M=Z9tkb4`|YJ|-U?UI*9S2FIBT&tdSqpWs+;vR95J?VvAd l)J4~<&}8dy?dyfDB002ovPDHLkV1j=p;n4s9 delta 1008 zcmVhP_#fMUgSP%ps6fIFvt5_+b zPZm-7ShRvoqRX~R8^|W99h0Bw<5l16%kq#|DY5tSX889k>W!|u?iu^ zW{>P7+1)#HXLdJ;H+RG`d$i1WxD3>2M}JZkvf;zmL9T#!0C7EN z1@I%XlgtIjG_d`%ti^5Lk+p~|NcUr0i>w`V4%vIm@VdgzX&nBL@4ZYP}o zleV?HfxW;=Cx4L>QvETD>{0c09BPADx{5B)o{8@fH@ZF0 zERavdy5$>#f2D!$+gzZ5Lo z#d~Akqg;E5k0lkG)3Z-kjJFnPeJ@@BR=X!GUXiatPmeT$OdgmE+WX9!7|;tJVY=^s z0ZMN5$A1d*8(pB%*a&95si!Pe_GVOTprY)c!a|h0W{ka~cVJXpy7nZbZ?-pD-0FZk z6&9l0P6q24J%j9~I-;awXEk-Iab~Lct%i0~bGksg4sIpT8%qXCwSf#<2yB~%ic^a@ zU7#(;a;*F5G~#AQn#@;5Gp8(dtG}b|;w=ipiht#}=V@`kiqCH(D4$HceE$2UHdKB{ z`*%C{sf1@%z^piO2&v#Uc&z1GQq7}cpd%XD)#W;9$_>YgV^_iKCtw{l8}P7uRm-(V*OjBFtDD_0RlB;v$z;?e+)q#LvI%&*bvpt#$XPSX&8EA1)%MWb=CV=^OQ1X6r z7E?hl_rKpPh*L_dK~b}ZVZd*>M;1N|?!}_p=I2OL{Jr`uz1sQDQr2y{hnBMVQerLx eHBxQaDfBO-mg6P8tTZ+N0000Px)Zb?KzR9HvtmtAZWRTRhnXQta05K&7>6b%n*HGFgztU)k9XJ^}DrG&4n1Pw%u z0R$uQMf{4Z34$+b6jWlAphDtWX@sUC?CxykJ2rH?q>(iGpcss_7!+w~clI7LyR+MA z*^kbG2@lNM%suCx-~8`6_nu3*&L6tY`EUd9YF8+)f_}fhxNO3GOTl6Z7!QKz4rT}< zJ_Dv>Bva!LT2r&n=Mz>KpU)@FRTeMcI4=Y7EM~fk2ojjjg770ra#PQrryIRq??A4f z$O#x~?O4ch@ji$qq@Wgg z3&6&aE)g@wB}sb0uoptSLqzgOeF1Dy71zrEc(_kSz(6SSCJ|n<7bEa z@L=0GNp|c8alJXt5~Ny1sSH@{hbU+y_MCZ(Isx3DFk&1y-_up^^?KvEmTTX>w$Y=< zINk$^Cz5{Bm%W!_8yXs_dUN^t{eHP@d_@ZgwaIYw)8W>psn&uU0vHTO9|4ONbJ7d_ zeWIeienz*ATr%dnB9C(Ux3rurFBv6u0k|b$M^e37UHM(gX9!>*9Ql+OPnm;8;=W`9 zu3*!k7TKICNG5#dsdhb`5il5P?*!50gxn;}_Ec9MD>$kR$3Qqbi&z{rT{>08H8nG! z*4_)ys03iVf4s*t^Sq5X1)Bx}C(1}J=}E+8T=KYGH)R2gr1R(JF1>j5>Z(}5QEfPG z-`?i9r=lozqOhvCq-=oa0F)bp@tBxcTRY>djW`9H27{4_knp=XLAR>7();7EDsDdl zrrC*NVrfyXBdB1S435EYWHA_fl2yz{)#~XFXH+m0?%2f4#*t&}6<>K2*Yax#l5MV_ z*6}sK%aY?mPn01FhC-1kOgLqpA}oPsD~j{@{|OlmM`y)Z97)C0p--+;s!nHA(D)eC zB8Jq9O%>0Gn0V;_%EcD#_?;yvH3XQL&<^;wUCJ}rl{!qRQF@_kupik z6~)<@=|}T))X^0pF1|>#>dDGJ-1o0um#<67rf9P3kq?5BTUnyXmF1Q0d6m1f`Q*Km zXj){A0F3rMY0C)pUeX)vLMGvg_JQCwVORpzDvE1+t`x}&Xjb-m03W0#Vxal2ZpTuu zcS_C+Ps-l!?<~HpJhq2`N7LH}(K>gv)A;e6&xim`$QO;fLwYvmy%Jqmswj${D?;L& zy;p7o(L#&eMpbdWoe$0!A2DDOvcm`P>uD8$T|M1htFm?6M#nt9ykaKg%GYJzPkmB3?De1Q62G2V;0WD^ms zw9Ndms<@uDdtWJNi3ck)Q+{3fvy>-K^T|`t5?dk5CRBU^hLMAr=ysex*Y!-kYilmZ zs{%|-9MC$J5yX0c9x%Q!&<4;pPnP2=pK8|eYXWE|pk3P=fOZudZvP*wWDZ37Q4IwE O0000h;LM2VONo*+}_OIH4&9|VQk*4mf1-~K?{XgQgZ0d zhA&4*1vRxhJ9}5rA97{V8C_^)5fUU3>IvPUrFXYC^Th1VuIssbvu^i?f%Dhy@AtfX z=J`D@zad;?4_#zDxCG>NBLBY#H7SwVLe~E*m>&S)dH^DTKN$E@gz%nWZ0jBW)=QUm z)J?7Xr;S-?0r(aMe8f0nGo=Oic9>@8@k)`JC_*I5>INH#0hn4b)Xe(`VtYEh?MFu@ z9F8_w%-aFXs-QDO0&Peq<2%dkmj#MMBL1Vt#a%?S!t2a)`;1`{@w~;jLSSqJyo<%Q z@m9B~ZOCbtJY|7GQu_`fda5YL=p!G!#@RD_PtLHj^@DZum^cE^;{XRLKp!QdO|UtY z4ImrH(h?hZ72sP7^31$3lTN%mAy9KzeGrV#N`yKW&Tm*Bi^c5mj+w?^Q5o(syJs{kZKMA~>F|;Qq zI=05Pwkgwwrs@Q0a^?23HFj?%v;A~Ay;v+J^dC5$F3K~RW;!mF1yU6C@{uft+)A>> z{J8d0T|4HLM~b2ZhO<|FK%jX+zqnY}x1N|tC)B#;X0q>$$4+hZ^d8dt+nH|8pV~ z4oBx$%)jOZ`8U%@+~@^U*jE%qJcBE*>DJ%*vl^X{tPT(`(~%wXV^-nC&jFI8HFKHl zAKc^mDPw4Jt1(`SOtTa{0^-?@u1}!rlF9gyG7(zcV6jkWS|?3In?AlQYjHka$2sDW zY{MzHLOJLU*6I3|Gv@(03(d0XGb5lCu{E@z8-T!BF=%Qy7&BnBr7N>L*9 zBU#_?0GxCH1iITy#=oivW-Dhs<=YaEjxj z?C6kNqAP5hce@ZHEYhOPC-Fo76)M+OY(5CWlw1M}cqE(oS|};3u4G1+J0G3&O_^z}wNk_N0zxPhxr{{L9sqX~plsrf?o{G! zFDNP89%Uw{=M?srd4#p7#2jlVk9*u*Uq`fPXtyIkYh0az2WK`?baNjS{-`nT>`okA+HE{?f(mj#?3TRLdW|6 O0000Px)p-DtRR9HvNm}_iQMHI*X=kE3e6i_HC z5($NXk+gde0>qMZXYZC2Fu@oFO^kscG10_FjDjd>RnTBej1NA5_((JnD@kcImC(IA zEiFi6>E11(L6ndflt3Dw)WCMT_n5nn?z7#y&=1VFJ2PkIcYn`g&YU6KW{qw$9uy4J z($ZC4UOs6RgS`N`K$ydfDMa`O#SX7lQ}tKoPqw!9R+N+~`vERxax{2FwQn><*akWz zPs}TZW2?#hBoR%>wIC5~^SE8_Wsdp%!RMHGccP!cEmZ7$B^P{Npr)o{Wp_?5dy9x( z0#G!DiO+=*seh{%i~r09G8QuUD2S$vKrx1h@ZsRV;Lf#cS6oZ((tC8p|JjzTlUu4EcBFxAs%Q&xj)LA)!qCQhGp*v|N?l)mR zTqhP=fVP{Zk$Ll-TbTLv(Sji9inEQzIJ05Fu|-G6TmW@w!X*mvnO1px zRtZXfPQWl@NKvr$Nc+K$ED&o|UGJR@g?AL`3*yc3k?opL zcYoLg(skorD10Vq26|N!t`Bm_`~5+UiMN38gXUI0$()k}YB##Uv8Yhs5JFU?sd_9p zzcfB&;Q6=*pXlspS(<7FyFZp@GF=8P0W{s}42Oni*4Hoj*Um!CGBCBAaX#UDOpcXa zca;@od7G4{<}nRF&Jm?a(_*)T5e@nLMt_J1#a3tkrJ|C2xhb)m-X7QtroHj+fF{%j z^OD3T=rV8)pxFSnwm}(Ppb%rEGg@F@Ospe43ilb6S=Dp zlUWo}2A?*GP0g)-WB1%Te7JX}qewX)SJov>sL?z(E>3ONM5*(nJn1$Ok@3E6O@FA- z^J`qf{$_yu?Z$Ryyd5>@EL$Vi_Z&(5r26gwJ^xKQ~TSEU7T`3BUXgR;*4!#o6o$OrIL0k=>(t3`Gp0b3i0M3G` wj~wi~c4hFV)Q1E+KVe%#b`~3tIkz3q|1aiMLsqeoM*si-07*qoM6N<$f?}h{qyPW_ delta 1228 zcmV;-1T*{R3*QNlBYy;@NklomJF_s-4=e&~LhJLf#l`Q88Xa?T-~We=TYJb(Bf$S)!-DHMyP=1b!1 zCF2qhe^tus-*^kA(`oVj{=pSeQhQwp!2{DnZExmsubuMdG!3+L+3G96%0ogT3ShqH zND`hb7qTyU@8OvCFc{l?6(L@07W7QhK(SbAR)zT`0#*W0Y8RR;P_11cg~IXFZLoMJ z2=i({{sPk;5PyCapps$q?5Pgfz8{X=Z?U|{{*OUKj1B^Bt@a_oPn8XQQ(%Q65lv-6 z4nW(OBSs$twzP$geUZ!MhW*0Q-Q9i8(E;TxB6`42*@g-^%1C?$@HE%a2?$Vpn}aFzWYIAp5YJ)4x!egKZ-0Du1?6}hC`yX~i-Fp0#fnL{IO zWdd&TY#6j1j1xrsL~}q=$nt6Sv=OYr+x|s2<{VoJ`8Trinb*s$ou;1+) zJOW^@<4)m4X0QHv5TIx@b(aJi0M2#ipAfz)NG z1!VC7cfy}HTzA3TbUH2lfFg0NlO?@ZRguSusei*XGkg7PtH;NceKe}wCjn1hvuI@P zEu!HQiEA25yiwJ`53?ffF7@^t^0TcS9|xqywDrVz*{J}DSIfoh`bJLGSaKsVJ$rf% z9VF((rkOq5ER2&PwMJ@8dzu)}I|O|FozL*@9|s}OY*3Yp`LY{D^Z zF@H3$Z6?B_P85hAD;M<5b(4BB zIb=Jtt20RQ+jG^ZRwO{Re+y8jVPtkqd6oI8;*Gm)We~tDCui7NV4Bq`SgBYR=PKIBN+LZ|kF3V%nEeIUBWDH_SImx{WROLY~p2U^|B>OqC$ z$uK0D?s!EiR(tK~q3(G|t=a8~anodb%V;I8xy*w2_VgZyw~I!0RV{pdpqld#1HXod zmJ|w^AN|5oJMQlO9}{r7J9b1Nx^|*|b;eJOZkXNyaJ~!k_h={Azntj9d=L5Icz?13 z7JUT5^f3oMXX->EG3}qqoI4?TotMClEn^4@FE8fx-St%V1+opp@wE$K$qyUdI+!s+ z;F(Ogn1F=<&il`zj6a}=&SJjj>qa3D1msp;!+TkSMJ#6C5fWm9-ySz%WAsZ{`{qg` zLL)()0PLn#?>Wkh4>)A$&0GuuD@8QXs*%X*b|}g<&fOlY0AwjlzcE)1RBs1 @@ -180,7 +181,7 @@ android:layout_height="@dimen/dp_30" android:layout_marginStart="6.5dp" android:gravity="center_vertical" - android:textColor="@color/text_normal_282828" + android:textColor="@color/text_secondary_878b9c" android:textSize="@dimen/sp_12" tools:text="0" /> @@ -207,6 +208,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="@dimen/dp_6" + android:rotation="90" android:scaleType="centerInside" android:src="@drawable/icon_dy_item_more" android:layout_alignParentEnd="true" @@ -214,16 +216,4 @@ - - \ No newline at end of file