From fa457fa3375a7f652d69145bcd2dd3e8307293ea Mon Sep 17 00:00:00 2001 From: liuyirong Date: Wed, 31 Aug 2022 10:17:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV5.13.0=E3=80=91=E6=B8=B8=E6=88=8F=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=88=E7=AC=AC9?= =?UTF-8?q?=E6=9C=9F=EF=BC=89(0831UI=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98)?= =?UTF-8?q?=20https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2011#?= =?UTF-8?q?note=5F167425?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/search/SearchDefaultFragment.kt | 4 +++- app/src/main/res/layout/fragment_search_default.xml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index 6276443521..d392666e1f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.search import android.graphics.Color import android.graphics.LinearGradient import android.graphics.Shader +import android.graphics.Typeface import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.text.TextUtils @@ -131,7 +132,7 @@ open class SearchDefaultFragment : BaseFragment() { } private fun initRankViewPager() { - mRankList = mRankList?.filter { it.content.isNotEmpty() } + mRankList = mRankList?.filter { it.content.isNotEmpty() }?.take(6) if (mRankList.isNullOrEmpty()) return mBinding.run { @@ -284,6 +285,7 @@ open class SearchDefaultFragment : BaseFragment() { flexCell.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_smart_search, 0, 0, 0) flexCell.compoundDrawablePadding = 4F.dip2px() flexCell.gravity = Gravity.CENTER_VERTICAL + flexCell.typeface = Typeface.DEFAULT_BOLD flexCell.textSize = 12F flexCell.text = SMART_TAG_TEXT flexCell.setTextColor(Color.WHITE) diff --git a/app/src/main/res/layout/fragment_search_default.xml b/app/src/main/res/layout/fragment_search_default.xml index 11f7be79d5..7f2b0886c5 100644 --- a/app/src/main/res/layout/fragment_search_default.xml +++ b/app/src/main/res/layout/fragment_search_default.xml @@ -118,9 +118,10 @@ android:id="@+id/rankTabLayout" android:layout_width="match_parent" android:layout_height="66dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:paddingTop="16dp" + android:clipToPadding="false" app:tabMaxWidth="0dp" app:tabMinWidth="0dp" app:tabPaddingStart="8dp"