diff --git a/app/src/main/java/com/gh/common/util/PatternUtils.java b/app/src/main/java/com/gh/common/util/PatternUtils.java index eaedc0e1e2..4459437029 100644 --- a/app/src/main/java/com/gh/common/util/PatternUtils.java +++ b/app/src/main/java/com/gh/common/util/PatternUtils.java @@ -4,6 +4,8 @@ import android.util.Patterns; import java.util.regex.Matcher; +import kotlin.text.Regex; + /** * @author CsHeng * @Date 17/05/2017 @@ -32,6 +34,25 @@ public class PatternUtils { Matcher matcher = Patterns.PHONE.matcher(phone); return matcher.matches(); } + /** + * 判断字符串中是否有连续2个以上的空格 忽略 \t \r \n + */ + public static boolean isHasSpace(String text) { + String pattern = "[\\s|\\t|\\r|\\n]{2,}"; + Regex regex = new Regex(pattern); + return regex.find(text, 0) != null; + } + /** + * 替换字符串中连续2个以上的空格为一个空格 忽略 \t \r \n + */ + public static String replaceSpace(String text) { + String pattern = "[\\s|\\t|\\r|\\n]{2,}"; + String newText = text; + if (isHasSpace(text)) { + newText = text.replaceAll(pattern, " "); + } + return newText; + } } diff --git a/app/src/main/java/com/gh/common/util/TextHelper.kt b/app/src/main/java/com/gh/common/util/TextHelper.kt index 7441666ae1..df003272b4 100644 --- a/app/src/main/java/com/gh/common/util/TextHelper.kt +++ b/app/src/main/java/com/gh/common/util/TextHelper.kt @@ -61,6 +61,33 @@ object TextHelper { } } } + //限制最大长度(空格不算入字数判断)-Toast弹窗提示 + @JvmStatic + fun getFilterIgnoreBlank(maxLength: Int, msg: String): InputFilter{ + return InputFilter { source, start, end, dest, dstart, dend -> + val newMaxLength = maxLength + getBlankCount(source.toString()) + getBlankCount(dest.toString()) + val keep = newMaxLength - (dest.length - (dend - dstart)) + if (keep < end - start) { + ToastUtils.showToast(msg) + } + when { + keep <= 0 -> "" + keep >= end - start -> null + else -> source.subSequence(start, start + keep) + } + } + } + + private fun getBlankCount(text: String): Int { + var blankCount = 0 + val toCharArray = text.toCharArray() + toCharArray.forEach { + if (it == ' ') { + blankCount++ + } + } + return blankCount + } @JvmStatic fun highlightTextThatIsWrappedInsideWrapperByDefault(textView: TextView, text: String) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index 907ab1d553..9ddb368850 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -257,8 +257,8 @@ class UserHomeFragment : NormalFragment() { setBackgroundResource(R.drawable.questions_detail_tag_bg) } else { setText(R.string.concern) - setTextColor(Color.WHITE) - setBackgroundResource(R.drawable.button_normal_style) + setTextColor(R.color.text_1383EB.toColor()) + setBackgroundColor(R.color.background.toColor()) } } } else { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 98e8744cc9..dc835a99d9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -1068,7 +1068,7 @@ class AnswerDetailFragment : NormalFragment() { } else { mBinding.followTv.visibility = View.VISIBLE mBinding.followTv.background = DrawableView.getOvalDrawable(R.color.background, 2F) - mBinding.followTv.setTextColor(R.color.theme.toColor()) + mBinding.followTv.setTextColor(R.color.text_1383EB.toColor()) DrawableView.setTextDrawable( mBinding.followTv, R.drawable.answer_detail_follow_icon, diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt index 842e6deb80..decc22aafa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt @@ -120,7 +120,9 @@ class AnswerEditActivity : BaseRichEditorActivity() { override fun onMenuItemClick(item: MenuItem?): Boolean { if (item?.itemId == R.id.menu_answer_post && !ClickUtils.isFastDoubleClick(R.id.menu_answer_post, 5000)) { - readyPost() + debounceActionWithInterval(R.id.menu_answer_post,1000L) { + readyPost() + } } return super.onMenuItemClick(item) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 212efac4c1..98210ecde1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -417,7 +417,7 @@ class ArticleDetailActivity : ToolBarActivity() { mBinding.articleDetailFollow.text = "已关注" mBinding.articleDetailFollow.background = null - mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.theme)) + mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.text_999999)) mBinding.articleDetailFollow.postDelayed({ mBinding.articleDetailFollow.animate() .alpha(0f) @@ -431,8 +431,8 @@ class ArticleDetailActivity : ToolBarActivity() { .start() }, 2000L) } else { - mBinding.articleDetailFollow.background = ContextCompat.getDrawable(this, R.drawable.button_normal_style) - mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.all_white)) + mBinding.articleDetailFollow.background = ContextCompat.getDrawable(this, R.drawable.questions_detail_tag_bg) + mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.text_1383EB)) mBinding.articleDetailFollow.setText(R.string.concern) } } @@ -738,7 +738,7 @@ class ArticleDetailActivity : ToolBarActivity() { } mBinding.articleDetailTags.removeAllViews() - addTag(mViewModel.detailEntity?.community?.name.toString()) + addTag(mViewModel.detailEntity?.community?.name.toString(), true) for (tag in mViewModel.detailEntity!!.tags) { addTag(tag) } @@ -763,7 +763,7 @@ class ArticleDetailActivity : ToolBarActivity() { mBinding.tvBadgeName.visibility = View.VISIBLE ImageUtils.display(mBinding.sdvUserBadge, mViewModel.detailEntity?.user?.badge?.icon) mBinding.tvBadgeName.text = mViewModel.detailEntity?.user?.badge?.name - }else{ + } else { mBinding.sdvUserBadge.visibility = View.GONE mBinding.tvBadgeName.visibility = View.GONE } @@ -799,22 +799,28 @@ class ArticleDetailActivity : ToolBarActivity() { } } - private fun addTag(tag: String) { + private fun addTag(tag: String, isCommunityName: Boolean = false) { val view = LayoutInflater.from(this).inflate(R.layout.questionsdedit_tag_item, null) val tagTv = view as TextView tagTv.text = tag tagTv.background = DrawableView.getOvalDrawable(R.color.text_EEF5FB, 2F) - tagTv.setTextColor(R.color.theme.toColor()) + tagTv.setTextColor(if (!isCommunityName) R.color.theme.toColor() else R.color.text_333333.toColor()) + if(isCommunityName){ + tagTv.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(this,R.drawable.ic_video_detail_game),null,null,null) + tagTv.compoundDrawablePadding=4F.dip2px() + } val params = FlexboxLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) params.setMargins(0, DisplayUtils.dip2px(this, 5f), DisplayUtils.dip2px(this, 8f), DisplayUtils.dip2px(this, 5f)) tagTv.layoutParams = params - tagTv.setOnClickListener { - MtaHelper.onEvent("问题标签", mViewModel.detailEntity?.community?.name, mViewModel.detailEntity!!.title + "-" + tag) - startActivity(AskColumnDetailActivity.getIntentByTag(this, tag, - CommunityEntity(mViewModel.detailEntity!!.community.id, - mViewModel.detailEntity!!.community.name), mEntrance, "问题详情")) + if(isCommunityName) { + tagTv.setOnClickListener { + MtaHelper.onEvent("问题标签", mViewModel.detailEntity?.community?.name, mViewModel.detailEntity!!.title + "-" + tag) + startActivity(AskColumnDetailActivity.getIntentByTag(this, tag, + CommunityEntity(mViewModel.detailEntity!!.community.id, + mViewModel.detailEntity!!.community.name), mEntrance, "问题详情")) + } } mBinding.articleDetailTags.addView(view) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 1c08c72a2a..e206bef0ca 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -8,8 +8,13 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.Message -import android.text.* -import android.view.* +import android.text.Html +import android.text.InputFilter +import android.text.TextUtils +import android.view.Gravity +import android.view.MenuItem +import android.view.View +import android.view.Window import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.ProgressBar @@ -106,11 +111,17 @@ class ArticleEditActivity : BaseRichEditorActivity() { } } - mEditTitle.setTextChangedListener(action = { s, _, _, _ -> + mEditTitle.setTextChangedListener(action = { s, start, _, _ -> + if(PatternUtils.isHasSpace(s.toString())){ + mEditTitle.setText(PatternUtils.replaceSpace(s.toString())) + mEditTitle.setSelection(start) + return@setTextChangedListener + } mTitleCounter.text = ("(" + s.length + "/50)") }) - setEditTextInputSpace() + //setEditTextInputSpace() + mEditTitle.filters= arrayOf(TextHelper.getFilterIgnoreBlank(50, "最多输入50个字")) // 上传图片完成后的回调（本地图片） mViewModel.postImageLiveData.observe(this, Observer { @@ -424,14 +435,16 @@ class ArticleEditActivity : BaseRichEditorActivity() { override fun onMenuItemClick(item: MenuItem?): Boolean { if (item?.itemId == R.id.menu_answer_post) { - ifLogin("社区文章编辑-[发布]") { - mRichEditor.hideLinkStyle() - mRichEditor.postDelayed({ - mViewModel.title = mEditTitle.text.toString() - mViewModel.content = getReplaceRealContent() - mRichEditor.showLinkStyle() - mViewModel.checkDataAndLoadTitleTag() - }, 100) + debounceActionWithInterval(R.id.menu_answer_post,1000L){ + ifLogin("社区文章编辑-[发布]") { + mRichEditor.hideLinkStyle() + mRichEditor.postDelayed({ + mViewModel.title = mEditTitle.text.toString() + mViewModel.content = getReplaceRealContent() + mRichEditor.showLinkStyle() + mViewModel.checkDataAndLoadTitleTag() + }, 100) + } } } return super.onMenuItemClick(item) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index c8680fa13c..813f54c133 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt @@ -118,7 +118,7 @@ class QuestionEditActivity : ToolBarActivity() { // TitleEdit mBinding.questionseditTitle.addTextChangedListener(LimitTextWatcher(mBinding.questionseditTitle)) - mBinding.questionseditTitle.filters = arrayOf(TextHelper.getFilter(50, "标题最多50个字")) + mBinding.questionseditTitle.filters = arrayOf(TextHelper.getFilterIgnoreBlank(50, "标题最多50个字")) // ContentEdit mBinding.questionseditContent.filters = arrayOf(TextHelper.getFilter(300, "内容最多300个字")) @@ -250,12 +250,17 @@ class QuestionEditActivity : ToolBarActivity() { if (mEditText === mBinding.questionseditTitle) { val etContent = s.toString() - // 去空格 - if (etContent.contains(" ")) { - mBinding.questionseditTitle.setText(etContent.replace(" ".toRegex(), "")) + // 多个空格保留一个 + if(PatternUtils.isHasSpace(etContent)){ + mBinding.questionseditTitle.setText(PatternUtils.replaceSpace(etContent)) mBinding.questionseditTitle.setSelection(start) return } + /*if (etContent.contains(" ")) { + mBinding.questionseditTitle.setText(etContent.replace(" ".toRegex(), "")) + mBinding.questionseditTitle.setSelection(start) + return + }*/ } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt index 3b6a0b027e..f820d2bb3f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendWrapperFragment.kt @@ -35,6 +35,7 @@ class AskRecommendWrapperFragment : BaseFragment() { private val mSubjectViewPager by bindView(R.id.ask_recommends_subject_vp) private val mChangeBtn by bindView(R.id.ask_recommend_change) private val mEntranceContainer by bindView(R.id.ask_recommend_entrance_container) + private val containerLl by bindView(R.id.containerLl) val refreshLayout by bindView(R.id.refresh_layout) val refreshHeader by bindView(R.id.swipe_refresh_header) @@ -203,10 +204,13 @@ class AskRecommendWrapperFragment : BaseFragment() { private fun initViewPager(slide: List) { // init viewpager + containerLl.removeViewAt(0) val pageAdapter = AskRecommendsSubjectPageAdapter(context, slide) mSubjectViewPager.pageMargin = DisplayUtils.dip2px(10f) mSubjectViewPager.offscreenPageLimit = 3 mSubjectViewPager.adapter = pageAdapter + mSubjectViewPager.setCurrentItem(pageAdapter.actualFirstPositionInCenter,false) + containerLl.addView(mSubjectViewPager,0) mSubjectViewPager.addOnScrollStateChanged(onStateChanged = { pageAdapter.setScrollState(it) }) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java index f33476a4b8..664807e424 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskRecommendsSubjectPageAdapter.java @@ -7,9 +7,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import androidx.databinding.DataBindingUtil; -import androidx.viewpager.widget.ViewPager; - import com.gh.common.util.DirectUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MtaHelper; @@ -21,6 +18,9 @@ import com.gh.gamecenter.manager.UserManager; import java.util.List; +import androidx.databinding.DataBindingUtil; +import androidx.viewpager.widget.ViewPager; + /** * Created by khy on 1/04/18. */ @@ -81,6 +81,15 @@ public class AskRecommendsSubjectPageAdapter extends RecyclingPagerAdapter { @Override public int getCount() { if (mEntityList == null) return 0; - return mEntityList.size(); + return Integer.MAX_VALUE; + } + + public int getActualFirstPositionInCenter() { + if (mEntityList == null) return 0; + int index = getCount() / 2; + if (index % mEntityList.size() != 0) { + index = index - (index % mEntityList.size()); + } + return index; } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt index 47512f8a9e..32c789e209 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt @@ -1,11 +1,11 @@ package com.gh.gamecenter.qa.recommends import android.content.Context -import android.graphics.Color import android.view.ViewGroup import androidx.core.content.ContextCompat import com.gh.common.util.DirectUtils import com.gh.common.util.MtaHelper +import com.gh.common.util.toColor import com.gh.gamecenter.R import com.gh.gamecenter.databinding.AskRecommendsConcernListItemBinding import com.gh.gamecenter.manager.UserManager @@ -34,8 +34,8 @@ class RecommendConcernAdapter(context: Context, val entity = mListData[position] holder.binding.data = entity holder.binding.concernCommand.let { v -> - v.setBackgroundResource(R.drawable.button_normal_style) - v.setTextColor(Color.WHITE) + v.setBackgroundResource(R.drawable.questions_detail_tag_bg) + v.setTextColor(R.color.text_1383EB.toColor()) v.text = "关注" v.setOnClickListener { MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐关注-关注") @@ -43,7 +43,7 @@ class RecommendConcernAdapter(context: Context, override fun onFollowSuccess() { isFollowed = true v.setBackgroundResource(R.drawable.questions_detail_tag_bg) - v.setTextColor(ContextCompat.getColor(mContext, R.color.hint)) + v.setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) v.text = "已关注" v.postDelayed({ listViewModel.deleteFollowById(entity.id) diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java index 4fb8b8446b..c6a6c3687d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java @@ -20,6 +20,7 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.LogUtils; import com.gh.common.util.MtaHelper; +import com.gh.common.util.PatternUtils; import com.gh.common.util.PermissionHelper; import com.gh.common.util.TextHelper; import com.gh.gamecenter.R; @@ -158,6 +159,14 @@ public class AskSearchActivity extends ToolBarActivity { @Override public void onTextChanged(CharSequence s, int start, int before, int count) { + String etContent = s.toString(); + + // 多个空格保留一个 + if(PatternUtils.isHasSpace(etContent)){ + mSearchEt.setText(PatternUtils.replaceSpace(etContent)); + mSearchEt.setSelection(start); + return; + } if (s.length() > 0) { mSearchCancel.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt index fc8e93e474..9416ca709b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/user/UserAdapter.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.qa.search.user import android.content.Context -import android.graphics.Color import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat @@ -50,8 +49,8 @@ class UserAdapter(context: Context, } else -> { setText(R.string.concern) - setTextColor(Color.WHITE) - setBackgroundResource(R.drawable.button_normal_style) + setTextColor(ContextCompat.getColor(mContext, R.color.text_1383EB)) + setBackgroundResource(R.drawable.questions_detail_tag_bg) } } } diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_article.png b/app/src/main/res/drawable-xxhdpi/community_edit_article.png index 5485b8b655..937e0ee60d 100644 Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_article.png and b/app/src/main/res/drawable-xxhdpi/community_edit_article.png differ diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_close.png b/app/src/main/res/drawable-xxhdpi/community_edit_close.png index ad1df84d0f..c80d0ae2d7 100644 Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_close.png and b/app/src/main/res/drawable-xxhdpi/community_edit_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_question.png b/app/src/main/res/drawable-xxhdpi/community_edit_question.png index 5a873e3c6b..6f3a0ab158 100644 Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_question.png and b/app/src/main/res/drawable-xxhdpi/community_edit_question.png differ diff --git a/app/src/main/res/layout/activity_article_detail.xml b/app/src/main/res/layout/activity_article_detail.xml index 531a81a0af..78330febea 100644 --- a/app/src/main/res/layout/activity_article_detail.xml +++ b/app/src/main/res/layout/activity_article_detail.xml @@ -144,9 +144,9 @@ android:layout_width="60dp" android:layout_height="25dp" android:layout_marginRight="20dp" - android:background="@drawable/button_normal_style" + android:background="@drawable/questions_detail_tag_bg" android:gravity="center" - android:textColor="@android:color/white" + android:textColor="@color/text_1383EB" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/article_detail_Rd" diff --git a/app/src/main/res/layout/activity_help_and_feedback.xml b/app/src/main/res/layout/activity_help_and_feedback.xml index b35d5d32b8..fbd2915cb2 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -31,6 +31,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:tabMode="fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor="@color/text_1383EB" app:tabTextAppearance="@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/activity_tablayout_viewpager.xml b/app/src/main/res/layout/activity_tablayout_viewpager.xml index 20f9756b2c..7cb26af103 100644 --- a/app/src/main/res/layout/activity_tablayout_viewpager.xml +++ b/app/src/main/res/layout/activity_tablayout_viewpager.xml @@ -24,6 +24,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" app:tabMode = "fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor = "@color/theme" app:tabTextAppearance = "@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/activity_video_game.xml b/app/src/main/res/layout/activity_video_game.xml index 825b802589..d1fd96fe94 100644 --- a/app/src/main/res/layout/activity_video_game.xml +++ b/app/src/main/res/layout/activity_video_game.xml @@ -155,6 +155,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:tabMode="fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor="@color/theme" app:tabTextAppearance="@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/ask_recommends_concern_list_item.xml b/app/src/main/res/layout/ask_recommends_concern_list_item.xml index fea01254ca..dbebecd8d8 100644 --- a/app/src/main/res/layout/ask_recommends_concern_list_item.xml +++ b/app/src/main/res/layout/ask_recommends_concern_list_item.xml @@ -59,10 +59,10 @@ android:layout_width = "55dp" android:layout_height = "22dp" android:layout_marginTop = "10dp" - android:background = "@drawable/button_normal_style" + android:background = "@drawable/questions_detail_tag_bg" android:gravity = "center" android:text = "关注" - android:textColor = "@android:color/white" + android:textColor = "@color/text_1383EB" android:textSize = "10sp" app:layout_constraintLeft_toLeftOf = "parent" app:layout_constraintRight_toRightOf = "parent" diff --git a/app/src/main/res/layout/ask_recommends_subject.xml b/app/src/main/res/layout/ask_recommends_subject.xml index 671d792615..8c42c3b2b5 100644 --- a/app/src/main/res/layout/ask_recommends_subject.xml +++ b/app/src/main/res/layout/ask_recommends_subject.xml @@ -1,5 +1,6 @@ - - - - + + + + + + app:layout_constraintRight_toRightOf="parent" + android:layout_marginTop="24dp" + app:layout_constraintTop_toBottomOf="@+id/tv1"/> \ No newline at end of file diff --git a/app/src/main/res/layout/followers_or_fans_item.xml b/app/src/main/res/layout/followers_or_fans_item.xml index 627c3e8562..7f4685dea1 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -102,9 +102,9 @@ android:id = "@+id/follower_btn" android:layout_width = "60dp" android:layout_height = "26dp" - android:background = "@drawable/button_normal_style" + android:background = "@drawable/questions_detail_tag_bg" android:gravity = "center" - android:textColor = "@android:color/white" + android:textColor = "@color/text_1383EB" android:textSize = "12sp" app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintRight_toRightOf = "parent" diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index a6566fc4d4..a3bb6e50c2 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -101,8 +101,8 @@ android:drawablePadding="6dp" android:gravity="center" android:textStyle="bold" - android:textColor="@color/theme" - android:textSize="13sp" /> + android:textColor="@color/text_1383EB" + android:textSize="14sp" /> @@ -223,8 +223,8 @@ android:paddingLeft="12dp" android:drawablePadding="4dp" android:paddingRight="12dp" - android:textColor="@color/theme" - android:textSize="11sp" + android:textColor="@color/text_1383EB" + android:textSize="12sp" android:visibility="gone" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/rich_editor" diff --git a/app/src/main/res/layout/fragment_ask_questions.xml b/app/src/main/res/layout/fragment_ask_questions.xml index da046d7812..ce876d5b37 100644 --- a/app/src/main/res/layout/fragment_ask_questions.xml +++ b/app/src/main/res/layout/fragment_ask_questions.xml @@ -1,7 +1,8 @@ - + diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml index 1eecf90ab2..32a27fc0e0 100644 --- a/app/src/main/res/layout/fragment_community.xml +++ b/app/src/main/res/layout/fragment_community.xml @@ -111,6 +111,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:tabMode="fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor="@color/theme" app:tabTextAppearance="@style/BoldTabLayoutTextAppearance" app:tabTextColor="@color/text_333333" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 93cfc62d0f..1103b13cbf 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -88,11 +88,11 @@ android:layout_width="wrap_content" android:layout_height="28dp" android:layout_marginRight="20dp" - android:background="@drawable/game_item_btn_download_style" + android:background="@drawable/questions_detail_tag_bg" android:gravity="center" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@android:color/white" + android:textColor="@color/text_1383EB" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" app:layout_constraintRight_toRightOf="parent" @@ -398,6 +398,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" app:tabMode="scrollable" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor="@color/text_1383EB" app:tabTextAppearance="@style/HomeTabTextAppearance" /> diff --git a/app/src/main/res/layout/fragment_libao_wrapper.xml b/app/src/main/res/layout/fragment_libao_wrapper.xml index a94311d12f..f83e2ededa 100644 --- a/app/src/main/res/layout/fragment_libao_wrapper.xml +++ b/app/src/main/res/layout/fragment_libao_wrapper.xml @@ -30,6 +30,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" app:tabMode = "fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor = "@color/theme" app:tabTextAppearance = "@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/fragment_subject_tab.xml b/app/src/main/res/layout/fragment_subject_tab.xml index 8fa04d1b8b..5e18fa198f 100644 --- a/app/src/main/res/layout/fragment_subject_tab.xml +++ b/app/src/main/res/layout/fragment_subject_tab.xml @@ -32,6 +32,7 @@ android:layout_height="match_parent" app:tabIndicatorColor="@color/theme" app:tabMode="scrollable" + app:tabIndicatorHeight="0dp" app:tabRippleColor="@color/transparent" app:tabSelectedTextColor="@color/theme" app:tabTextAppearance="@style/HomeTabTextAppearance" /> diff --git a/app/src/main/res/layout/fragment_tablayout_viewpager.xml b/app/src/main/res/layout/fragment_tablayout_viewpager.xml index a9848c679d..6695e1c4d0 100644 --- a/app/src/main/res/layout/fragment_tablayout_viewpager.xml +++ b/app/src/main/res/layout/fragment_tablayout_viewpager.xml @@ -22,6 +22,7 @@ android:layout_width = "match_parent" android:layout_height = "match_parent" app:tabMode = "fixed" + app:tabIndicatorHeight="0dp" app:tabSelectedTextColor = "@color/theme" app:tabTextAppearance = "@style/TabLayoutTextAppearance" />