From 09f0704ad23d20639015c16231241daec55ef9c6 Mon Sep 17 00:00:00 2001 From: "kehaoyuan@ghzhushou.com" Date: Wed, 5 Feb 2020 17:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BB=E9=A2=98=E8=89=B2?= =?UTF-8?q?=E5=B9=B6=E5=8C=BA=E5=88=86=E8=89=B2=E5=9D=97=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=8E=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=20https://gitlab.?= =?UTF-8?q?ghzs.com/pm/halo-app-issues/issues/767?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialog/GameOffServiceDialogFragment.kt | 2 +- .../java/com/gh/common/util/CommentUtils.java | 10 +++++----- .../java/com/gh/common/util/DialogUtils.java | 8 ++++---- .../java/com/gh/common/util/Extensions.kt | 2 +- .../java/com/gh/common/util/GameUtils.java | 2 +- .../java/com/gh/common/util/LibaoUtils.java | 12 +++++------ .../java/com/gh/common/util/TextHelper.kt | 4 ++-- .../gh/common/view/DownloadProgressBar.java | 12 +++++------ .../com/gh/common/view/ExpendTextView.java | 2 +- .../gh/common/view/HighlightableTextView.kt | 2 +- .../gh/gamecenter/NetworkDiagnosisActivity.kt | 2 +- .../gamecenter/adapter/CleanApkAdapter.java | 2 +- .../download/GameDownloadFragment.java | 2 +- .../download/GameDownloadFragmentAdapter.java | 12 +++++------ .../download/GameUpdateFragmentAdapter.java | 2 +- .../gh/gamecenter/fragment/LoginFragment.java | 6 +++--- .../game/upload/GameUploadFragment.kt | 4 ++-- .../rating/RatingCommentItemViewHolder.kt | 4 ++-- .../gamedetail/rating/RatingReplyAdapter.kt | 4 ++-- .../rating/logs/CommentLogsAdapter.kt | 2 +- .../gh/gamecenter/help/HelpCategoryAdapter.kt | 2 +- .../gh/gamecenter/info/ConcernFragment.java | 4 ++-- .../gh/gamecenter/libao/Libao2Fragment.java | 2 +- .../gh/gamecenter/libao/Libao3Fragment.java | 2 +- .../message/KeFuFragmentAdapter.java | 2 +- .../message/MessageDetailFragment.java | 2 +- .../mygame/MyFollowedGameAdapter.kt | 2 +- .../mygame/MyFollowedGameFragment.kt | 2 +- .../gamecenter/mygame/MyPlayedGameAdapter.kt | 2 +- .../mygame/MyReservationFragment.kt | 2 +- .../newsdetail/NewsDetailAdapter.java | 6 +++--- .../personalhome/FollowersOrFansAdapter.kt | 2 +- .../personalhome/UserHomeFragment.kt | 2 +- .../qa/answer/detail/AnswerDetailFragment.kt | 12 +++++------ .../article/detail/ArticleDetailActivity.kt | 10 +++++----- .../article/edit/ArticleTagsSelectFragment.kt | 6 +++--- .../qa/comment/CommentFragment.java | 2 +- .../qa/comment/NewCommentFragment.kt | 2 +- .../gh/gamecenter/qa/editor/VideoActivity.kt | 2 +- .../gamecenter/qa/follow/AskFollowFragment.kt | 8 ++++---- .../detail/QuestionsDetailAdapter.kt | 6 +++--- .../qa/questions/edit/TagsSelectFragment.kt | 6 +++--- .../invite/QuestionsInviteViewHolder.java | 2 +- .../qa/recommends/RecommendConcernAdapter.kt | 2 +- .../gamecenter/qa/search/user/UserAdapter.kt | 2 +- .../gh/gamecenter/qa/select/OpenedAdapter.kt | 4 ++-- .../search/SearchGameDetailFragment.java | 2 +- .../search/SearchGameListFragment.java | 2 +- .../gamecenter/servers/GameServersActivity.kt | 4 ++-- .../servers/GameServersPublishFragment.kt | 14 ++++++------- .../servers/GameServersTestFragment.kt | 20 +++++++++---------- .../servers/add/AddKaiFuActivity.kt | 2 +- .../gamecenter/video/detail/VideoAdapter.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 4 ++-- .../assistant/fragment/AboutFragment.java | 2 +- .../assistant/fragment/SettingsFragment.java | 4 ++-- .../fragment/myconcern/MyConcernAdapter.java | 2 +- .../res/color/community_text_tabbar_style.xml | 8 ++++---- app/src/main/res/color/home_tabbar_style.xml | 8 ++++---- app/src/main/res/color/tab_selector.xml | 4 ++-- .../main/res/color/text_downloading_style.xml | 2 +- app/src/main/res/color/text_tabbar_style.xml | 8 ++++---- app/src/main/res/color/theme_and_333.xml | 2 +- app/src/main/res/color/vote_selector.xml | 4 ++-- .../res/drawable/ask_voting_button_border.xml | 2 +- app/src/main/res/drawable/border_blue_dim.xml | 2 +- .../main/res/drawable/border_normal_bg.xml | 2 +- .../drawable/button_border_1383eb_oval.xml | 2 +- .../res/drawable/button_border_blue_oval.xml | 2 +- .../res/drawable/button_normal_border.xml | 2 +- .../main/res/drawable/comment_border_bg.xml | 2 +- .../detail_download_open_rect_style.xml | 2 +- .../drawable/detail_download_open_style.xml | 2 +- .../detail_downloading_normal_rect_style.xml | 6 +++--- .../detail_downloading_normal_style.xml | 6 +++--- .../drawable/dialog_community_negative.xml | 2 +- app/src/main/res/drawable/et_line.xml | 2 +- .../drawable/game_item_btn_downloading_bg.xml | 2 +- app/src/main/res/drawable/libao_search_bg.xml | 2 +- .../drawable/question_edit_popup_border.xml | 2 +- .../res/layout/activity_article_detail.xml | 4 ++-- .../main/res/layout/activity_ask_search.xml | 2 +- .../res/layout/activity_help_and_feedback.xml | 4 ++-- .../main/res/layout/activity_rating_edit.xml | 2 +- app/src/main/res/layout/activity_share_gh.xml | 2 +- .../res/layout/activity_share_gh_wifi.xml | 10 +++++----- .../res/layout/activity_sharecard_pic.xml | 2 +- app/src/main/res/layout/activity_suggest.xml | 2 +- .../layout/activity_tablayout_viewpager.xml | 2 +- .../main/res/layout/activity_video_game.xml | 2 +- .../main/res/layout/amway_comment_item.xml | 2 +- app/src/main/res/layout/answer_draft_item.xml | 2 +- .../main/res/layout/app_updating_dialog.xml | 2 +- .../ask_recommends_concern_list_item.xml | 2 +- .../layout/ask_recommends_item_refresh.xml | 2 +- .../main/res/layout/ask_search_actionbar.xml | 2 +- .../layout/community_article_draft_item.xml | 2 +- app/src/main/res/layout/dialog_alert.xml | 4 ++-- .../layout/dialog_communities_select_hint.xml | 2 +- app/src/main/res/layout/dialog_community.xml | 4 ++-- .../res/layout/dialog_download_traffic.xml | 2 +- app/src/main/res/layout/dialog_plugin.xml | 4 ++-- app/src/main/res/layout/dialog_reserve.xml | 2 +- .../main/res/layout/dialog_reserve_game.xml | 4 ++-- app/src/main/res/layout/dialog_sign.xml | 2 +- .../main/res/layout/dialog_strategy_item.xml | 2 +- .../layout/dialog_strategy_select_game.xml | 2 +- .../main/res/layout/dialog_suggest_voting.xml | 2 +- .../main/res/layout/dialog_usage_stats.xml | 2 +- .../res/layout/dialog_verified_confirm.xml | 2 +- .../res/layout/dialog_video_upload_draft.xml | 2 +- app/src/main/res/layout/downloadmanager.xml | 2 +- .../res/layout/downloadmanager_item_head.xml | 2 +- .../res/layout/editor_insert_container.xml | 2 +- .../res/layout/followers_or_fans_item.xml | 2 +- .../main/res/layout/fragment_amway_search.xml | 2 +- .../res/layout/fragment_amway_success.xml | 2 +- .../fragment_answer_comment_conversation.xml | 2 +- .../res/layout/fragment_answer_detail.xml | 6 +++--- .../main/res/layout/fragment_apk_cleaner.xml | 2 +- .../main/res/layout/fragment_ask_follow.xml | 2 +- .../main/res/layout/fragment_ask_search.xml | 2 +- .../res/layout/fragment_comment_detail.xml | 4 ++-- .../res/layout/fragment_help_contaier.xml | 2 +- .../main/res/layout/fragment_help_content.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 10 +++++----- .../res/layout/fragment_info_strategy.xml | 2 +- app/src/main/res/layout/fragment_login.xml | 2 +- .../res/layout/fragment_message_detail.xml | 2 +- .../res/layout/fragment_suggest_select.xml | 14 ++++++------- app/src/main/res/layout/fragment_vote.xml | 2 +- app/src/main/res/layout/fragment_web.xml | 2 +- .../main/res/layout/game_download_dialog.xml | 4 ++-- .../main/res/layout/game_download_item.xml | 2 +- app/src/main/res/layout/game_head_item.xml | 2 +- app/src/main/res/layout/game_item.xml | 2 +- app/src/main/res/layout/game_plugin_item.xml | 2 +- app/src/main/res/layout/game_subject_item.xml | 2 +- app/src/main/res/layout/game_test_item.xml | 2 +- app/src/main/res/layout/gamedetail_body.xml | 2 +- .../res/layout/gamedetail_item_answer.xml | 2 +- .../layout/gamedetail_item_custom_column.xml | 2 +- .../main/res/layout/gamedetail_item_news.xml | 2 +- .../res/layout/gamedetail_item_server.xml | 2 +- app/src/main/res/layout/home_amway_item.xml | 2 +- .../item_question_detail_recommended_user.xml | 2 +- .../layout/layout_menu_article_publish.xml | 2 +- .../res/layout/layout_menu_game_comment.xml | 2 +- .../res/layout/layout_menu_my_ask_draft.xml | 2 +- .../layout_menu_question_and_answer.xml | 2 +- app/src/main/res/layout/layout_menu_text.xml | 2 +- app/src/main/res/layout/list_section_item.xml | 2 +- app/src/main/res/layout/message_item.xml | 2 +- .../res/layout/newsdetail_item_comment.xml | 2 +- .../main/res/layout/personal_home_item.xml | 2 +- .../main/res/layout/questionsdetail_item.xml | 6 +++--- .../res/layout/questionsdetail_tag_item.xml | 2 +- .../main/res/layout/questionsinvite_item.xml | 2 +- .../res/layout/questionsinvite_top_item.xml | 2 +- .../main/res/layout/rating_comment_item.xml | 2 +- .../main/res/layout/reuse_no_connection.xml | 2 +- app/src/main/res/layout/toolbar_search.xml | 2 +- app/src/main/res/layout/vote_item.xml | 2 +- app/src/main/res/layout/voting_top_item.xml | 2 +- app/src/main/res/values/colors.xml | 6 ++++-- 165 files changed, 277 insertions(+), 275 deletions(-) diff --git a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt index dc1e17c907..bbc780ef4b 100644 --- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt @@ -38,7 +38,7 @@ class GameOffServiceDialogFragment : BaseTrackableDialogFragment() { topMargin = DisplayUtils.dip2px(12f) } siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f) - siteTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme)) + siteTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) siteTv.text = site.text siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG siteTv.setOnClickListener { diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index 68bffaaff8..97d744f3e5 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -218,12 +218,12 @@ public class CommentUtils { public static void postVote(final Context context, final CommentEntity commentEntity, final TextView commentLikeCountTv, final ImageView commentLikeIv, final OnVoteListener listener) { - if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) { + if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) { Utils.toast(context, "已经点过赞啦！"); return; } commentEntity.setVote(commentEntity.getVote() + 1); - commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme)); + commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); commentLikeIv.setImageResource(R.drawable.vote_icon_select); commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); @@ -284,12 +284,12 @@ public class CommentUtils { entrance = "社区文章详情-评论-点赞"; } CheckLoginUtils.checkLogin(context, entrance, () -> { - if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) { + if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) { Utils.toast(context, "已经点过赞啦！"); return; } commentEntity.setVote(commentEntity.getVote() + 1); - commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme)); + commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); commentLikeIv.setImageResource(R.drawable.vote_icon_select); commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); @@ -346,7 +346,7 @@ public class CommentUtils { holder.commentLikeCountTv.setVisibility(View.GONE); } else { // 检查是否已点赞 if (userDataEntity != null && (userDataEntity.isCommentVoted())) { - holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); holder.commentLikeIv.setImageResource(R.drawable.vote_icon_select); } holder.commentLikeCountTv.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 41201a231d..f5d5032d85 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -646,9 +646,9 @@ public class DialogUtils { Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); positiveBtn.setTextSize(13); - positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); negativeBtn.setTextSize(13); - negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); if (mesage != null) { mesage.setGravity(Gravity.CENTER); mesage.setTextSize(24); @@ -938,7 +938,7 @@ public class DialogUtils { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ContextCompat.getColor(activityContext, R.color.text_1383EB)); + ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font)); ds.setUnderlineText(false); } @@ -954,7 +954,7 @@ public class DialogUtils { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ContextCompat.getColor(activityContext, R.color.text_1383EB)); + ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font)); ds.setUnderlineText(false); } diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index e12c50f1c0..e737f2f729 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -390,7 +390,7 @@ fun FragmentActivity.checkStoragePermissionBeforeAction(action: (() -> Unit)) { fun TextView.setTextWithHighlightedTextWrappedInsideWrapper(text: CharSequence, wrapper: String = Constants.DEFAULT_TEXT_WRAPPER, @ColorRes - highlightColorId: Int = R.color.theme, + highlightColorId: Int = R.color.theme_font, copyClickedText: Boolean = false, highlightedTextClickListener: (() -> Unit)? = null) { TextHelper.highlightTextThatIsWrappedInsideWrapper(this, text, wrapper, highlightColorId, object : SimpleCallback { diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index 89539bca2f..acd647c89c 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -57,7 +57,7 @@ public class GameUtils { downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else if ("打开".equals(status) || "启动".equals(status)) { downloadBtn.setBackgroundResource(R.drawable.detail_download_open_style); - downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); } else { downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 266c5e3307..d87ff183c7 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -166,12 +166,12 @@ public class LibaoUtils { case "coming": libaoBtn.setText(R.string.libao_coming); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "used_up": libaoBtn.setText(R.string.libao_used_up); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "finish": libaoBtn.setText(R.string.libao_finish); @@ -181,12 +181,12 @@ public class LibaoUtils { case "linged": libaoBtn.setText(R.string.libao_linged); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "taoed": libaoBtn.setText(R.string.libao_taoed); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "copy": libaoBtn.setText(R.string.libao_copy); @@ -195,7 +195,7 @@ public class LibaoUtils { case "repeatLing": libaoBtn.setText(R.string.libao_repeat_ling); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "repeatLinged": libaoBtn.setText(R.string.libao_repeat_ling); @@ -204,7 +204,7 @@ public class LibaoUtils { case "repeatTao": libaoBtn.setText(R.string.libao_repeat_tao); libaoBtn.setBackgroundResource(R.drawable.button_normal_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); break; case "repeatTaoed": libaoBtn.setText(R.string.libao_repeat_tao); 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 afb1327030..cd101064cd 100644 --- a/app/src/main/java/com/gh/common/util/TextHelper.kt +++ b/app/src/main/java/com/gh/common/util/TextHelper.kt @@ -92,7 +92,7 @@ object TextHelper { @JvmStatic fun highlightTextThatIsWrappedInsideWrapperByDefault(textView: TextView, text: String?) { - textView.text = getHighlightedSpannableStringThatIsWrappedInsideWrapper(textView.context, text ?: "", "###", R.color.theme, object : SimpleCallback { + textView.text = getHighlightedSpannableStringThatIsWrappedInsideWrapper(textView.context, text ?: "", "###", R.color.theme_font, object : SimpleCallback { override fun onCallback(arg: String) { val application = HaloApp.getInstance().application val cmb = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager @@ -122,7 +122,7 @@ object TextHelper { text: CharSequence, wrapper: String = "###", @ColorRes - highlightColorId: Int = R.color.theme, + highlightColorId: Int = R.color.theme_font, highlightedTextClickListener: SimpleCallback? = object : SimpleCallback { override fun onCallback(arg: String) { val application = HaloApp.getInstance().application diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index 562150a926..e80add42a7 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -92,7 +92,7 @@ public class DownloadProgressBar extends ProgressBar { super.onDraw(canvas); if (TextUtils.isEmpty(mText)) return; - mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.theme) : mDefaultColor); // 初始化颜色 + mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.theme_font) : mDefaultColor); // 初始化颜色 mPaint.setTextSize(mTextSize); mFakeTextPaint.setTextSize(mTextSize); mFakeTextPaint.setStyle(Paint.Style.FILL_AND_STROKE); @@ -116,7 +116,7 @@ public class DownloadProgressBar extends ProgressBar { if (DOWNLOAD_IMAGE_STYLE == mDownloadStyle) { color = Color.BLACK; } else if (DOWNLOAD_SLIDE_STYLE == mDownloadStyle) { - color = getResources().getColor(R.color.theme); + color = getResources().getColor(R.color.theme_font); } mPaint.setColor(color); // 反向颜色 } @@ -200,7 +200,7 @@ public class DownloadProgressBar extends ProgressBar { switch (mDownloadStyle) { case DOWNLOAD_RECT_STYLE: setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_rect_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); break; case DOWNLOAD_IMAGE_STYLE: setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_image_style)); @@ -208,7 +208,7 @@ public class DownloadProgressBar extends ProgressBar { break; default: setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); break; } setProgress(0); @@ -217,7 +217,7 @@ public class DownloadProgressBar extends ProgressBar { switch (mDownloadStyle) { case DOWNLOAD_RECT_STYLE: setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_rect_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); break; case DOWNLOAD_IMAGE_STYLE: case DOWNLOAD_SLIDE_STYLE: @@ -226,7 +226,7 @@ public class DownloadProgressBar extends ProgressBar { break; default: setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); break; } break; diff --git a/app/src/main/java/com/gh/common/view/ExpendTextView.java b/app/src/main/java/com/gh/common/view/ExpendTextView.java index 7fa886deb6..d37c97c1fd 100644 --- a/app/src/main/java/com/gh/common/view/ExpendTextView.java +++ b/app/src/main/java/com/gh/common/view/ExpendTextView.java @@ -100,7 +100,7 @@ public class ExpendTextView extends AppCompatTextView { @Override public void updateDrawState(TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ContextCompat.getColor(getContext(), R.color.theme)); + ds.setColor(ContextCompat.getColor(getContext(), R.color.theme_font)); ds.setUnderlineText(false); } diff --git a/app/src/main/java/com/gh/common/view/HighlightableTextView.kt b/app/src/main/java/com/gh/common/view/HighlightableTextView.kt index a3d8e2879f..d008f9e6d6 100644 --- a/app/src/main/java/com/gh/common/view/HighlightableTextView.kt +++ b/app/src/main/java/com/gh/common/view/HighlightableTextView.kt @@ -21,7 +21,7 @@ class HighlightableTextView @JvmOverloads constructor(context: Context, attrs: A } override fun setText(text: CharSequence?, type: BufferType?) { - super.setText(TextHelper.getHighlightedSpannableStringThatIsWrappedInsideWrapper(context, text.toString(), "###", R.color.theme, object : SimpleCallback { + super.setText(TextHelper.getHighlightedSpannableStringThatIsWrappedInsideWrapper(context, text.toString(), "###", R.color.theme_font, object : SimpleCallback { override fun onCallback(arg: String) { val application = HaloApp.getInstance().application val cmb = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt index 5e6f8d6972..9d47533654 100644 --- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt @@ -211,7 +211,7 @@ class NetworkDiagnosisActivity : ToolBarActivity() { builder.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme) + ds.color = resources.getColor(R.color.theme_font) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 720d74c5a2..85ae97651c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -220,7 +220,7 @@ public class CleanApkAdapter extends BaseRecyclerAdapter if (gameEntity.getInstallStatus() == INSTALLED) { holder.gameSize.setText(R.string.installed); - holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); } else { holder.gameSize.setText(R.string.installed_not); holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.red)); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 075151c099..f8ea7c2be3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -389,7 +389,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi } DownloadManager.getInstance(getContext()).pauseAll(); mDownloadmanagerAllstartTv.setText("全部开始"); - mDownloadmanagerAllstartTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mDownloadmanagerAllstartTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); } private void startAll() { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index f87aebcfae..fc98e4db1f 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -196,14 +196,14 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; viewHolder.dmDownloads.setLayoutParams(lparams); - viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); viewHolder.dmDownloads.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); viewHolder.dmDelete.setVisibility(View.GONE); viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg); viewHolder.dmStartorpause.setText("暂停"); - viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } } else if (status.equals(DownloadStatus.waiting)) { @@ -272,7 +272,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { 0, LinearLayout.LayoutParams.WRAP_CONTENT); lparams.weight = 4; viewHolder.dmDownloads.setLayoutParams(lparams); - viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmDownloads.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); viewHolder.dmDownloads.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), @@ -281,7 +281,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_downloading_bg); viewHolder.dmStartorpause.setText("暂停"); - viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); statusMap.put(url, DownloadStatus.downloading.getStatus()); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); @@ -399,7 +399,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.btn_gray)); } else { viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_start); - viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); } viewHolder.dm_item_head_tv_allstart.setOnClickListener(v -> { @@ -450,7 +450,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // DownloadManager.getInstance(mContext).pauseAll(); viewHolder.dm_item_head_tv_allstart.setText("全部开始"); - viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 6c6fabe8db..3b40928168 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -394,7 +394,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen } } else { viewHolder.guUpdate.setText(R.string.launch); - viewHolder.guUpdate.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.guUpdate.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); viewHolder.guUpdate.setBackgroundResource(R.drawable.detail_downloading_normal_style); } } else { diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index a82593f17d..0ccede7f41 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -93,7 +93,7 @@ public class LoginFragment extends NormalFragment implements LoginUtils.onCaptch mLoginCaptcha.setText(arg1 + "s后重新获取"); } else { mLoginCaptcha.setText("重新获取"); - mLoginCaptcha.setTextColor(ContextCompat.getColor(getContext(), R.color.text_1383EB)); + mLoginCaptcha.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); // mLoginCaptcha.setBackgroundResource(R.drawable.border_black_bg); mLoginCaptcha.setEnabled(true); } @@ -131,7 +131,7 @@ public class LoginFragment extends NormalFragment implements LoginUtils.onCaptch @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(getResources().getColor(R.color.theme)); + ds.setColor(getResources().getColor(R.color.theme_font)); ds.setUnderlineText(false); } @@ -148,7 +148,7 @@ public class LoginFragment extends NormalFragment implements LoginUtils.onCaptch @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(getResources().getColor(R.color.text_1383EB)); + ds.setColor(getResources().getColor(R.color.theme_font)); ds.setUnderlineText(false); } diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index 8e0d58d14d..f1c30232b2 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -91,7 +91,7 @@ class GameUploadFragment : NormalFragment() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme) + ds.color = resources.getColor(R.color.theme_font) ds.isUnderlineText = false } @@ -105,7 +105,7 @@ class GameUploadFragment : NormalFragment() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme) + ds.color = resources.getColor(R.color.theme_font) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index 27684ddbe3..25602d75dd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -211,7 +211,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme.toColor() + ds.color = R.color.theme_font.toColor() } override fun onClick(widget: View) { @@ -222,7 +222,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme.toColor() + ds.color = R.color.theme_font.toColor() } override fun onClick(widget: View) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt index e33041a205..06bf369b56 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt @@ -375,11 +375,11 @@ class RatingReplyAdapter(context: Context, holder.sectionTitle.text = ("全部回复(" + mEntityList[position].replyCount + ")") holder.sortPositive.setOnClickListener { holder.sortNegative.setTextColor(ContextCompat.getColor(mContext, R.color.title)) - holder.sortPositive.setTextColor(ContextCompat.getColor(mContext, R.color.theme)) + holder.sortPositive.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)) viewModel.sortList(RatingReplyViewModel.SORT_POSITIVE) } holder.sortNegative.setOnClickListener { - holder.sortNegative.setTextColor(ContextCompat.getColor(mContext, R.color.theme)) + holder.sortNegative.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)) holder.sortPositive.setTextColor(ContextCompat.getColor(mContext, R.color.title)) viewModel.sortList(RatingReplyViewModel.SORT_NEGATION) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsAdapter.kt index ca8ee84f1a..c6de2ba9e0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsAdapter.kt @@ -125,7 +125,7 @@ class CommentLogsAdapter(context: Context, msp.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) msp.setSpan( - BackgroundColorSpan(mContext.resources.getColor(R.color.theme)), + BackgroundColorSpan(mContext.resources.getColor(R.color.theme_font)), (msp.length - value.length), msp.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt index 7d72cc82de..d1a454b7f4 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt @@ -36,7 +36,7 @@ class HelpCategoryAdapter(context: Context, val entity = mCategoryList[position] holder.binding.content.text = entity.name holder.binding.content.setTextColor( - if (mSelectMap[position] == true) R.color.text_1383EB.toColor() + if (mSelectMap[position] == true) R.color.theme_font.toColor() else R.color.text_333333.toColor()) ImageUtils.display(holder.binding.icon, entity.icon) diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index 6ca8597935..139cc805a8 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -185,7 +185,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou if (TextUtils.isEmpty(UserManager.getInstance().getToken())) { mEmptyTv.setText(getString(R.string.login_hint)); - mEmptyTv.setTextColor(getResources().getColor(R.color.theme)); + mEmptyTv.setTextColor(getResources().getColor(R.color.theme_font)); } else { mEmptyTv.setText(getString(R.string.ask_none)); mEmptyTv.setTextColor(getResources().getColor(R.color.c7c7c7)); @@ -345,7 +345,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou } else { if (mAdapter.getItemCount() == 0) { mEmptyTv.setText("点击刷新"); - mEmptyTv.setTextColor(getResources().getColor(R.color.theme)); + mEmptyTv.setTextColor(getResources().getColor(R.color.theme_font)); mEmptyTv.setOnClickListener(v -> { refresh(); mEmptyTv.setOnClickListener(null); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 598103610f..63b573f7c4 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -138,7 +138,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mLoadingLayout.setVisibility(View.GONE); mEmptyLayout.setVisibility(View.VISIBLE); mNoDataTv.setText(R.string.login_hint); - mNoDataTv.setTextColor(getResources().getColor(R.color.theme)); + mNoDataTv.setTextColor(getResources().getColor(R.color.theme_font)); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 6b6cee8417..662a5709c9 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -119,7 +119,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O mLoadingLayout.setVisibility(View.GONE); mEmptyLayout.setVisibility(View.VISIBLE); mNoDataTv.setText(R.string.login_hint); - mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); } @OnClick({R.id.reuse_no_connection, R.id.reuse_tv_none_data}) diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 883b26cd9f..d6e4c337fa 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -168,7 +168,7 @@ public class KeFuFragmentAdapter extends ListAdapter { !"7moor".equals(link.getType()) && !"个人主页".equals(link.getType())) continue; TextView textView = new TextView(mContext); - textView.setTextColor(mContext.getResources().getColor(R.color.theme)); + textView.setTextColor(mContext.getResources().getColor(R.color.theme_font)); textView.setTextSize(12F); textView.setText(link.getDocument()); textView.setOnClickListener(v -> { diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index 02a002a4c7..d9ad5043ab 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -157,7 +157,7 @@ public class MessageDetailFragment extends NormalFragment implements OnCommentCa if (hasFocus) { mMessageDetailEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.hint)); } else { - mMessageDetailEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mMessageDetailEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); } }); diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt index be24df23c5..4bb67f995e 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt @@ -92,7 +92,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV binding.gameItemIncluded.downloadBtn.setOnClickListener { } } else { binding.gameItemIncluded.downloadBtn.text = "已关注" - binding.gameItemIncluded.downloadBtn.setTextColor(ContextCompat.getColor(binding.root.context, R.color.theme)) + binding.gameItemIncluded.downloadBtn.setTextColor(ContextCompat.getColor(binding.root.context, R.color.theme_font)) binding.gameItemIncluded.downloadBtn.setBackgroundResource(R.drawable.button_border_blue_oval) binding.gameItemIncluded.downloadBtn.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt index 57f6a2586c..7430ce4e14 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -43,7 +43,7 @@ class MyFollowedGameFragment : ListFragment super.onStart() if (!UserManager.getInstance().isLoggedIn) { noDataTv.text = getString(R.string.login_hint) - noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme)) + noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { noDataTv.text = getString(R.string.game_empty) noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.c7c7c7)) diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt index 9ab4cf5eed..397c3b429c 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt @@ -144,7 +144,7 @@ class MyPlayedGameAdapter(context: Context, private val mViewModel: PlayedGameVi content.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(mContext, R.color.theme) + ds.color = ContextCompat.getColor(mContext, R.color.theme_font) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt index bee8469fe0..99fc26f86e 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -30,7 +30,7 @@ class MyReservationFragment : ListFragment() super.onStart() if (TextUtils.isEmpty(UserManager.getInstance().userId)) { noDataTv.text = getString(R.string.login_hint) - noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme)) + noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { noDataTv.text = getString(R.string.game_empty) noDataTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.c7c7c7)) diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 247ca3dde9..4b01935c79 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -372,7 +372,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { if (mNewsDetailEntity.getMe() != null && mNewsDetailEntity.getMe().isGameConcerned()) { viewHolder.gameConcern.setText(R.string.cancel_concern); viewHolder.gameConcern.setBackgroundResource(R.drawable.button_normal_border); - viewHolder.gameConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.gameConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); } else { viewHolder.gameConcern.setText(R.string.concern); viewHolder.gameConcern.setBackgroundResource(R.drawable.button_normal_style); @@ -434,7 +434,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setText(R.string.cancel_concern); concern.setBackgroundResource(R.drawable.button_normal_border); - concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); Utils.toast(mContext, R.string.concern_success); viewHolder.gameConcern.setEnabled(true); @@ -640,7 +640,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { , ViewGroup.LayoutParams.WRAP_CONTENT)); textView.setText(("查看全部评论（" + NumberUtils.transSimpleCount(mCommentNum) + "）")); textView.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12)); - textView.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + textView.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); textView.setTextSize(15); linearLayout.addView(textView); diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt index 2f690e05a6..3bb4895f84 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -63,7 +63,7 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi setBackgroundResource(R.drawable.questions_detail_tag_bg) } else { setText(R.string.concern) - setTextColor(R.color.text_1383EB.toColor()) + setTextColor(R.color.theme_font.toColor()) setBackgroundResource(R.drawable.questions_detail_tag_bg) } } 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 40ec5ff714..ce2c2da79c 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -263,7 +263,7 @@ class UserHomeFragment : NormalFragment() { setBackgroundResource(R.drawable.questions_detail_tag_bg) } else { setText(R.string.concern) - setTextColor(R.color.text_1383EB.toColor()) + setTextColor(R.color.theme_font.toColor()) setBackgroundResource(R.drawable.questions_detail_tag_bg) } } 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 7657b610ad..85426f7521 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 @@ -434,7 +434,7 @@ class AnswerDetailFragment : NormalFragment() { // 是否已回答 when (mAnswerStatus) { ANSWERED_MY_ANSWER -> { - mBinding.statusTv.setTextColor(R.color.theme.toColor()) + mBinding.statusTv.setTextColor(R.color.theme_font.toColor()) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.question_detail_answer_icon, @@ -448,14 +448,14 @@ class AnswerDetailFragment : NormalFragment() { "我的回答") } NOT_ANSWERED_BUT_HAVE_DRAFT -> { - mBinding.statusTv.setTextColor(R.color.theme.toColor()) + mBinding.statusTv.setTextColor(R.color.theme_font.toColor()) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.question_detail_answer_icon, "继续回答") } NOT_ANSWERED_YET -> { - mBinding.statusTv.setTextColor(R.color.theme.toColor()) + mBinding.statusTv.setTextColor(R.color.theme_font.toColor()) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.question_detail_answer_icon, @@ -924,7 +924,7 @@ class AnswerDetailFragment : NormalFragment() { if (isCollected) { mBinding.bottomController.tvCollect.text = "已收藏" mBinding.bottomController.ivCollect.setImageResource(R.drawable.ic_collect_highlighted) - mBinding.bottomController.tvCollect.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme)) + mBinding.bottomController.tvCollect.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { mBinding.bottomController.tvCollect.text = "收藏" mBinding.bottomController.ivCollect.setImageResource(R.drawable.ic_collect_normal) @@ -1130,7 +1130,7 @@ class AnswerDetailFragment : NormalFragment() { } else { mBinding.followTv.visibility = View.VISIBLE mBinding.followTv.background = DrawableView.getOvalDrawable(R.color.background, 2F) - mBinding.followTv.setTextColor(R.color.text_1383EB.toColor()) + mBinding.followTv.setTextColor(R.color.theme_font.toColor()) DrawableView.setTextDrawable( mBinding.followTv, R.drawable.answer_detail_follow_icon, @@ -1143,7 +1143,7 @@ class AnswerDetailFragment : NormalFragment() { mBinding.bottomController.tvLike.text = "赞同 ${NumberUtils.transSimpleCount(voteCount)}" if (alreadyVoted) { mBinding.bottomController.ivLike.setImageResource(R.drawable.ic_like_highlighted) - mBinding.bottomController.tvLike.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + mBinding.bottomController.tvLike.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } else { mBinding.bottomController.ivLike.setImageResource(R.drawable.ic_like_normal) mBinding.bottomController.tvLike.setTextColor(ContextCompat.getColor(context!!, R.color.text_3a3a3a)) 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 d27642d833..1193c39634 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 @@ -429,7 +429,7 @@ class ArticleDetailActivity : ToolBarActivity() { }, 2000L) } else { mBinding.articleDetailFollow.background = ContextCompat.getDrawable(this, R.drawable.questions_detail_tag_bg) - mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.text_1383EB)) + mBinding.articleDetailFollow.setTextColor(ContextCompat.getColor(this, R.color.theme_font)) mBinding.articleDetailFollow.setText(R.string.concern) } } @@ -484,7 +484,7 @@ class ArticleDetailActivity : ToolBarActivity() { if (isCollected) { mBinding.includedLayout.tvCollect.text = "已收藏" mBinding.includedLayout.ivCollect.setImageResource(R.drawable.ic_collect_highlighted) - mBinding.includedLayout.tvCollect.setTextColor(ContextCompat.getColor(this, R.color.theme)) + mBinding.includedLayout.tvCollect.setTextColor(ContextCompat.getColor(this, R.color.theme_font)) } else { mBinding.includedLayout.tvCollect.text = "收藏" mBinding.includedLayout.ivCollect.setImageResource(R.drawable.ic_collect_normal) @@ -657,7 +657,7 @@ class ArticleDetailActivity : ToolBarActivity() { if (detailEntity.me.isCommunityArticleFavorite) { ivCollect.setImageResource(R.drawable.ic_collect_highlighted) tvCollect.text = "已收藏" - tvCollect.setTextColor(ContextCompat.getColor(this@ArticleDetailActivity, R.color.theme)) + tvCollect.setTextColor(ContextCompat.getColor(this@ArticleDetailActivity, R.color.theme_font)) } else { ivCollect.setImageResource(R.drawable.ic_collect_normal) tvCollect.text = "收藏" @@ -742,7 +742,7 @@ class ArticleDetailActivity : ToolBarActivity() { mBinding.includedLayout.tvLike.text = "赞同 ${NumberUtils.transSimpleCount(voteCount)}" if (alreadyVoted) { mBinding.includedLayout.ivLike.setImageResource(R.drawable.ic_like_highlighted) - mBinding.includedLayout.tvLike.setTextColor(ContextCompat.getColor(this, R.color.theme)) + mBinding.includedLayout.tvLike.setTextColor(ContextCompat.getColor(this, R.color.theme_font)) } else { mBinding.includedLayout.ivLike.setImageResource(R.drawable.ic_like_normal) mBinding.includedLayout.tvLike.setTextColor(ContextCompat.getColor(this, R.color.text_3a3a3a)) @@ -762,7 +762,7 @@ class ArticleDetailActivity : ToolBarActivity() { val tagTv = view as TextView tagTv.text = tag tagTv.background = DrawableView.getOvalDrawable(R.color.text_EEF5FB, 2F) - tagTv.setTextColor(if (!isCommunityName) R.color.theme.toColor() else R.color.text_333333.toColor()) + tagTv.setTextColor(if (!isCommunityName) R.color.theme_font.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() diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt index 29edbc9e42..61a5390f15 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt @@ -163,7 +163,7 @@ class ArticleTagsSelectFragment : BaseFragment() { if (text != null && text.toString() == tag) { mViewModel?.selectedTags?.add(tag) tagView.setBackgroundResource(R.drawable.comment_border_bg) - tagView.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagView.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } } } @@ -182,7 +182,7 @@ class ArticleTagsSelectFragment : BaseFragment() { tagTv.setOnClickListener { if (mViewModel?.selectTag(tagTv.text.toString())!!) { tagTv.setBackgroundResource(R.drawable.comment_border_bg) - tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } else { tagTv.setBackgroundResource(R.drawable.border_suggest_bg) tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.content)) @@ -192,7 +192,7 @@ class ArticleTagsSelectFragment : BaseFragment() { if (isSelect) { mViewModel?.selectedTags?.add(tag) tagTv.setBackgroundResource(R.drawable.comment_border_bg) - tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } mAllTags.add(tag) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java index 4ac26c571c..ac71147240 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentFragment.java @@ -147,7 +147,7 @@ public class CommentFragment extends ListFragment if (hasFocus) { commentEt.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.hint)) } else { - commentEt.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.theme)) + commentEt.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt index 225be51bf4..1e7881b00a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoActivity.kt @@ -88,7 +88,7 @@ class VideoActivity : ListActivity() { if (text != null && text.toString() == tag) { mViewModel?.selectedTags?.add(tag) tagView.setBackgroundResource(R.drawable.comment_border_bg) - tagView.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagView.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } } } @@ -311,7 +311,7 @@ class TagsSelectFragment : BaseFragment() { tagTv.setOnClickListener { if (mViewModel?.selectTag(tagTv.text.toString())!!) { tagTv.setBackgroundResource(R.drawable.comment_border_bg) - tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } else { tagTv.setBackgroundResource(R.drawable.border_suggest_bg) tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.content)) @@ -321,7 +321,7 @@ class TagsSelectFragment : BaseFragment() { if (isSelect) { mViewModel?.selectedTags?.add(tag) tagTv.setBackgroundResource(R.drawable.comment_border_bg) - tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme)) + tagTv.setTextColor(ContextCompat.getColor(context!!, R.color.theme_font)) } mAllTags.add(tag) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java index bb23ba25ed..0048a2bab3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java @@ -70,7 +70,7 @@ public class QuestionsInviteViewHolder extends BaseRecyclerViewHolder v.setBackgroundResource(R.drawable.questions_detail_tag_bg) - v.setTextColor(R.color.text_1383EB.toColor()) + v.setTextColor(R.color.theme_font.toColor()) v.text = "关注" v.setOnClickListener { MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, "推荐关注-关注") 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 9416ca709b..5d25efc662 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 @@ -49,7 +49,7 @@ class UserAdapter(context: Context, } else -> { setText(R.string.concern) - setTextColor(ContextCompat.getColor(mContext, R.color.text_1383EB)) + setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)) setBackgroundResource(R.drawable.questions_detail_tag_bg) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt index 66c2dca3da..e96df543d7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedAdapter.kt @@ -132,12 +132,12 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis holder.bind.isSelectRight = isSelectRight if (isSelectLeft) { - holder.bind.communityNameLeft.setTextColor(R.color.theme.toColor()) + holder.bind.communityNameLeft.setTextColor(R.color.theme_font.toColor()) } else { holder.bind.communityNameLeft.setTextColor(R.color.text_333333.toColor()) } if (isSelectRight) { - holder.bind.communityNameRight.setTextColor(R.color.theme.toColor()) + holder.bind.communityNameRight.setTextColor(R.color.theme_font.toColor()) } else { holder.bind.communityNameRight.setTextColor(R.color.text_333333.toColor()) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index d9fc16c4e9..f1c6a5054e 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -246,7 +246,7 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC @Override public void updateDrawState(TextPaint paint) { paint.setUnderlineText(false); - paint.setColor(ContextCompat.getColor(requireContext(), R.color.theme)); + paint.setColor(ContextCompat.getColor(requireContext(), R.color.theme_font)); } }; String tempString = spannableString.toString(); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index 508a7dd059..018e0d5c13 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -204,7 +204,7 @@ public class SearchGameListFragment extends BaseFragment implements OnRequestCal @Override public void updateDrawState(TextPaint paint) { paint.setUnderlineText(false); - paint.setColor(ContextCompat.getColor(requireContext(), R.color.theme)); + paint.setColor(ContextCompat.getColor(requireContext(), R.color.theme_font)); } }; String tempString = spannableString.toString(); diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt index 6ba0274c33..f3992fcefa 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt @@ -35,8 +35,8 @@ class GameServersActivity : ToolBarActivity() { setToolbarMenu(R.menu.menu_download) mServersPublish.isChecked = true - mServersTest.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme)) - mServersPublish.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme)) + mServersTest.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme_font)) + mServersPublish.setTextColor(DrawableView.getSelectorColorStyle(R.color.black, R.color.theme_font)) mServersTest.setOnClickListener { mViewpager.currentItem = mServersTestIndex } mServersPublish.setOnClickListener { mViewpager.currentItem = mServersPublishIndex } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt index 95089d41a3..6766353f95 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -92,7 +92,7 @@ class GameServersPublishFragment : BaseFragment() { MtaHelper.onEvent("开服表", "开服Tab-游戏分类", "点击游戏分类") v.isChecked = true - v.setTextColor(R.color.theme.toColor()) + v.setTextColor(R.color.theme_font.toColor()) val inflater = LayoutInflater.from(context) val layout = inflater.inflate(R.layout.popup_server_category, null) @@ -124,7 +124,7 @@ class GameServersPublishFragment : BaseFragment() { label.textSize = 13F label.text = name label.background = DrawableView.getOvalSelectorStyle(R.color.background, R.color.text_e6f3ff) - label.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) + label.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) label.setSingleLine(true) labelsContainer.addView(label) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { @@ -196,7 +196,7 @@ class GameServersPublishFragment : BaseFragment() { MtaHelper.onEvent("开服表", "开服Tab", "开服时间") v.isChecked = true - v.setTextColor(R.color.theme.toColor()) + v.setTextColor(R.color.theme_font.toColor()) val inflater = LayoutInflater.from(v.context) val layout = inflater.inflate(R.layout.popup_server_time, null) @@ -277,10 +277,10 @@ class GameServersPublishFragment : BaseFragment() { } } - all.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) + all.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) fillBackground.setOnClickListener { popupWindow.dismiss() diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt index f068125e60..ed920de26e 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -59,7 +59,7 @@ class GameServersTestFragment : BaseFragment() { MtaHelper.onEvent("开服表", "开测Tab", "测试状态") v.isChecked = true - v.setTextColor(R.color.theme.toColor()) + v.setTextColor(R.color.theme_font.toColor()) val inflater = LayoutInflater.from(context) val layout = inflater.inflate(R.layout.popup_server_status, null) @@ -76,10 +76,10 @@ class GameServersTestFragment : BaseFragment() { val fillBackground = layout.findViewById(R.id.fill_background) when (mType) { - "开测" -> all.setTextColor(R.color.theme.toColor()) - "公测" -> publishServer.setTextColor(R.color.theme.toColor()) - "不删档内测" -> notDeleteServer.setTextColor(R.color.theme.toColor()) - "删档内测" -> deleteServer.setTextColor(R.color.theme.toColor()) + "开测" -> all.setTextColor(R.color.theme_font.toColor()) + "公测" -> publishServer.setTextColor(R.color.theme_font.toColor()) + "不删档内测" -> notDeleteServer.setTextColor(R.color.theme_font.toColor()) + "删档内测" -> deleteServer.setTextColor(R.color.theme_font.toColor()) } fillBackground.setOnClickListener { @@ -121,7 +121,7 @@ class GameServersTestFragment : BaseFragment() { MtaHelper.onEvent("开服表", "开测Tab", "开测时间") v.isChecked = true - v.setTextColor(R.color.theme.toColor()) + v.setTextColor(R.color.theme_font.toColor()) val inflater = LayoutInflater.from(v.context) val layout = inflater.inflate(R.layout.popup_server_time, null) @@ -161,10 +161,10 @@ class GameServersTestFragment : BaseFragment() { hourContainer.removeAllViews() - all.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) - after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme)) + all.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) fillBackground.setOnClickListener { popupWindow.dismiss() diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt index cccd922196..f23921cfb4 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt @@ -109,7 +109,7 @@ class AddKaiFuActivity : ToolBarActivity() { .setTitleSize(15) .setOutSideCancelable(false) .isCyclic(false) - .setSubmitColor(ContextCompat.getColor(this, R.color.theme)) + .setSubmitColor(ContextCompat.getColor(this, R.color.theme_font)) .setCancelColor(ContextCompat.getColor(this, R.color.hint)) .setTitleBgColor(Color.WHITE) .setBgColor(Color.WHITE) diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt index 58d7a2a701..68ffce6a26 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt @@ -222,7 +222,7 @@ class VideoAdapter(val mContext: Context, val mRecyclerView: RecyclerView, val m downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style) } else if ("打开" == status || "启动" == status) { downloadBtn.setBackgroundResource(R.drawable.detail_download_open_style) - downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)) + downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font)) } else { downloadBtn.setBackgroundResource(R.drawable.video_detail_btn_download_up) } diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index 35f5b04b85..0b0878751b 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -456,7 +456,7 @@ class UploadVideoActivity : ToolBarActivity() { uploadProtocolText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme) + ds.color = resources.getColor(R.color.theme_font) ds.isUnderlineText = false } @@ -468,7 +468,7 @@ class UploadVideoActivity : ToolBarActivity() { uploadProtocolText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme) + ds.color = resources.getColor(R.color.theme_font) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java index a618f343ea..a3d1fa5351 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -55,7 +55,7 @@ public class AboutFragment extends NormalFragment { if (msg.what == 0) { final String version = (String) msg.obj; mAboutVersion.setText(StringUtils.buildString("发现新版本 V", version)); - mAboutVersion.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mAboutVersion.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); } else if (msg.what == 1) { mAboutVersion.setText(R.string.toast_upload_latest); } diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index 9a6092f581..392f51ff4e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -473,9 +473,9 @@ public class SettingsFragment extends NormalFragment { Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); positiveBtn.setTextSize(14); - positiveBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + positiveBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); negativeBtn.setTextSize(14); - negativeBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + negativeBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); if (message != null) { message.setTextSize(14); message.setTextColor(ContextCompat.getColor(getContext(), R.color.system_bar)); diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index e6349662db..4fb60358c4 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -119,7 +119,7 @@ class MyConcernAdapter extends BaseRecyclerAdapter { holder.concern_item_concern.setBackgroundResource(R.drawable.button_border_gray_oval); } else { holder.concern_item_concern.setText(R.string.cancel_concern); - holder.concern_item_concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + holder.concern_item_concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); holder.concern_item_concern.setBackgroundResource(R.drawable.button_border_blue_oval); } holder.concern_item_concern.setOnClickListener(v -> { diff --git a/app/src/main/res/color/community_text_tabbar_style.xml b/app/src/main/res/color/community_text_tabbar_style.xml index 00b5f5f5ff..5f8e8dac85 100644 --- a/app/src/main/res/color/community_text_tabbar_style.xml +++ b/app/src/main/res/color/community_text_tabbar_style.xml @@ -1,10 +1,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/color/home_tabbar_style.xml b/app/src/main/res/color/home_tabbar_style.xml index c039c818c0..5f8e8dac85 100644 --- a/app/src/main/res/color/home_tabbar_style.xml +++ b/app/src/main/res/color/home_tabbar_style.xml @@ -1,10 +1,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/color/tab_selector.xml b/app/src/main/res/color/tab_selector.xml index c53796fd14..661207eae0 100644 --- a/app/src/main/res/color/tab_selector.xml +++ b/app/src/main/res/color/tab_selector.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/text_downloading_style.xml b/app/src/main/res/color/text_downloading_style.xml index 3822e17a1f..39acc8f48c 100644 --- a/app/src/main/res/color/text_downloading_style.xml +++ b/app/src/main/res/color/text_downloading_style.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/text_tabbar_style.xml b/app/src/main/res/color/text_tabbar_style.xml index 9d6a46db31..b11e71c744 100644 --- a/app/src/main/res/color/text_tabbar_style.xml +++ b/app/src/main/res/color/text_tabbar_style.xml @@ -1,10 +1,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/color/theme_and_333.xml b/app/src/main/res/color/theme_and_333.xml index 451e509014..09bc4e674b 100644 --- a/app/src/main/res/color/theme_and_333.xml +++ b/app/src/main/res/color/theme_and_333.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/vote_selector.xml b/app/src/main/res/color/vote_selector.xml index 1c9d366580..5b039a9aaa 100644 --- a/app/src/main/res/color/vote_selector.xml +++ b/app/src/main/res/color/vote_selector.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ask_voting_button_border.xml b/app/src/main/res/drawable/ask_voting_button_border.xml index 90f340322d..768e399f99 100644 --- a/app/src/main/res/drawable/ask_voting_button_border.xml +++ b/app/src/main/res/drawable/ask_voting_button_border.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/border_blue_dim.xml b/app/src/main/res/drawable/border_blue_dim.xml index b4de6d30b2..967cefc72c 100644 --- a/app/src/main/res/drawable/border_blue_dim.xml +++ b/app/src/main/res/drawable/border_blue_dim.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/border_normal_bg.xml b/app/src/main/res/drawable/border_normal_bg.xml index 2c2ea6bbc9..0f1f5a7e78 100644 --- a/app/src/main/res/drawable/border_normal_bg.xml +++ b/app/src/main/res/drawable/border_normal_bg.xml @@ -6,6 +6,6 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/button_border_1383eb_oval.xml b/app/src/main/res/drawable/button_border_1383eb_oval.xml index e3e77cb30c..36a9716d72 100644 --- a/app/src/main/res/drawable/button_border_1383eb_oval.xml +++ b/app/src/main/res/drawable/button_border_1383eb_oval.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/button_border_blue_oval.xml b/app/src/main/res/drawable/button_border_blue_oval.xml index dd72325aa3..36a9716d72 100644 --- a/app/src/main/res/drawable/button_border_blue_oval.xml +++ b/app/src/main/res/drawable/button_border_blue_oval.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/button_normal_border.xml b/app/src/main/res/drawable/button_normal_border.xml index 2579cb1ac8..7b52ee3dfc 100644 --- a/app/src/main/res/drawable/button_normal_border.xml +++ b/app/src/main/res/drawable/button_normal_border.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/comment_border_bg.xml b/app/src/main/res/drawable/comment_border_bg.xml index a721752799..12b099b7e1 100644 --- a/app/src/main/res/drawable/comment_border_bg.xml +++ b/app/src/main/res/drawable/comment_border_bg.xml @@ -4,7 +4,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/detail_download_open_rect_style.xml b/app/src/main/res/drawable/detail_download_open_rect_style.xml index d2b8708441..ae6fb13f36 100644 --- a/app/src/main/res/drawable/detail_download_open_rect_style.xml +++ b/app/src/main/res/drawable/detail_download_open_rect_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/detail_download_open_style.xml b/app/src/main/res/drawable/detail_download_open_style.xml index 7359053629..2adb563ac8 100644 --- a/app/src/main/res/drawable/detail_download_open_style.xml +++ b/app/src/main/res/drawable/detail_download_open_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml b/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml index db22536f6d..b983f18f87 100644 --- a/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml +++ b/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme_font" /> @@ -19,8 +19,8 @@ + android:endColor = "@color/theme_font" + android:startColor = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/detail_downloading_normal_style.xml b/app/src/main/res/drawable/detail_downloading_normal_style.xml index b2596c8fb5..e09980d732 100644 --- a/app/src/main/res/drawable/detail_downloading_normal_style.xml +++ b/app/src/main/res/drawable/detail_downloading_normal_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme_font" /> @@ -19,8 +19,8 @@ + android:endColor = "@color/theme_font" + android:startColor = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/dialog_community_negative.xml b/app/src/main/res/drawable/dialog_community_negative.xml index 349dd350f0..f78fb39c6a 100644 --- a/app/src/main/res/drawable/dialog_community_negative.xml +++ b/app/src/main/res/drawable/dialog_community_negative.xml @@ -2,7 +2,7 @@ + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/et_line.xml b/app/src/main/res/drawable/et_line.xml index e9b660ad9c..1bf75e0314 100644 --- a/app/src/main/res/drawable/et_line.xml +++ b/app/src/main/res/drawable/et_line.xml @@ -2,7 +2,7 @@ - + + android:color = "@color/theme_font" /> diff --git a/app/src/main/res/drawable/libao_search_bg.xml b/app/src/main/res/drawable/libao_search_bg.xml index 12a1b7c269..4edcc31f97 100644 --- a/app/src/main/res/drawable/libao_search_bg.xml +++ b/app/src/main/res/drawable/libao_search_bg.xml @@ -8,5 +8,5 @@ + android:color = "@color/theme_font" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/question_edit_popup_border.xml b/app/src/main/res/drawable/question_edit_popup_border.xml index 7828cf104d..9af08ed8b7 100644 --- a/app/src/main/res/drawable/question_edit_popup_border.xml +++ b/app/src/main/res/drawable/question_edit_popup_border.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/activity_article_detail.xml b/app/src/main/res/layout/activity_article_detail.xml index 1725585394..414c2b66bd 100644 --- a/app/src/main/res/layout/activity_article_detail.xml +++ b/app/src/main/res/layout/activity_article_detail.xml @@ -131,7 +131,7 @@ android:layout_height="wrap_content" android:layout_marginRight="5dp" android:text="喜欢就关注吧→" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/article_detail_follow" @@ -146,7 +146,7 @@ android:layout_marginRight="20dp" android:background="@drawable/questions_detail_tag_bg" android:gravity="center" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/article_detail_Rd" diff --git a/app/src/main/res/layout/activity_ask_search.xml b/app/src/main/res/layout/activity_ask_search.xml index fa74890131..881b1c2399 100644 --- a/app/src/main/res/layout/activity_ask_search.xml +++ b/app/src/main/res/layout/activity_ask_search.xml @@ -33,7 +33,7 @@ android:layout_alignParentRight = "true" android:padding = "20dp" android:text = "@string/ask_search_questions_hint" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13sp" /> 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 fbd2915cb2..c09efec184 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_alignParentBottom="true" - app:indicatorColor="@color/text_1383EB" /> + app:indicatorColor="@color/theme_font" /> diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml index 37513ddd3a..55c4ec081a 100644 --- a/app/src/main/res/layout/activity_rating_edit.xml +++ b/app/src/main/res/layout/activity_rating_edit.xml @@ -174,7 +174,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="《光环助手评论规则》" - android:textColor="@color/theme" /> + android:textColor="@color/theme_font" /> diff --git a/app/src/main/res/layout/activity_share_gh_wifi.xml b/app/src/main/res/layout/activity_share_gh_wifi.xml index ba097d5055..45a3f4bd04 100644 --- a/app/src/main/res/layout/activity_share_gh_wifi.xml +++ b/app/src/main/res/layout/activity_share_gh_wifi.xml @@ -34,7 +34,7 @@ android:background = "@drawable/oval_hint_white_bg" android:gravity = "center" android:text = "@string/share_ap_step_1" - android:textColor = "@color/theme" /> + android:textColor = "@color/theme_font" /> + android:textColor = "@color/theme_font" /> + android:textColor = "@color/theme_font" /> + android:textColor = "@color/theme_font" /> + android:textColor = "@color/theme_font" /> diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index fb3b6fe601..d84627625f 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -140,7 +140,7 @@ android:layout_alignParentRight = "true" android:layout_centerVertical = "true" android:layout_marginRight = "20dp" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:visibility = "gone" tools:text = "点击下载万能加速器" diff --git a/app/src/main/res/layout/activity_tablayout_viewpager.xml b/app/src/main/res/layout/activity_tablayout_viewpager.xml index 7cb26af103..e9a53e7b16 100644 --- a/app/src/main/res/layout/activity_tablayout_viewpager.xml +++ b/app/src/main/res/layout/activity_tablayout_viewpager.xml @@ -25,7 +25,7 @@ android:layout_height = "match_parent" app:tabMode = "fixed" app:tabIndicatorHeight="0dp" - app:tabSelectedTextColor = "@color/theme" + app:tabSelectedTextColor = "@color/theme_font" 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 d1fd96fe94..087002aabf 100644 --- a/app/src/main/res/layout/activity_video_game.xml +++ b/app/src/main/res/layout/activity_video_game.xml @@ -156,7 +156,7 @@ android:layout_height="match_parent" app:tabMode="fixed" app:tabIndicatorHeight="0dp" - app:tabSelectedTextColor="@color/theme" + app:tabSelectedTextColor="@color/theme_font" app:tabTextAppearance="@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml index 0d2fa92940..2207822c4a 100644 --- a/app/src/main/res/layout/amway_comment_item.xml +++ b/app/src/main/res/layout/amway_comment_item.xml @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@{String.valueOf(amway.game.star)}" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/starIv" app:layout_constraintLeft_toRightOf="@id/starIv" diff --git a/app/src/main/res/layout/answer_draft_item.xml b/app/src/main/res/layout/answer_draft_item.xml index e68dc616f7..bbe9c413a1 100644 --- a/app/src/main/res/layout/answer_draft_item.xml +++ b/app/src/main/res/layout/answer_draft_item.xml @@ -70,7 +70,7 @@ android:layout_height = "wrap_content" android:layout_marginTop = "10dp" android:text = "@string/resume_deit" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "11sp" app:layout_constraintTop_toBottomOf = "@id/answer_draft_item_img" /> diff --git a/app/src/main/res/layout/app_updating_dialog.xml b/app/src/main/res/layout/app_updating_dialog.xml index 6e82db82e6..b9ff0fafb3 100644 --- a/app/src/main/res/layout/app_updating_dialog.xml +++ b/app/src/main/res/layout/app_updating_dialog.xml @@ -13,7 +13,7 @@ android:layout_marginBottom = "10dp" android:layout_marginTop = "10dp" android:text = "@string/dialog_updating" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "16sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/ask_search_actionbar.xml b/app/src/main/res/layout/ask_search_actionbar.xml index b06d6e1b45..6485fe01d5 100644 --- a/app/src/main/res/layout/ask_search_actionbar.xml +++ b/app/src/main/res/layout/ask_search_actionbar.xml @@ -61,7 +61,7 @@ android:layout_height = "@dimen/appbar_height" android:gravity = "center" android:text = "@string/search_search" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/community_article_draft_item.xml b/app/src/main/res/layout/community_article_draft_item.xml index a17fa2dd0e..effacecffe 100644 --- a/app/src/main/res/layout/community_article_draft_item.xml +++ b/app/src/main/res/layout/community_article_draft_item.xml @@ -53,7 +53,7 @@ android:layout_below = "@id/article_draft_title" android:layout_marginTop = "15dp" android:text = "@string/resume_deit" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "11sp" /> diff --git a/app/src/main/res/layout/dialog_alert.xml b/app/src/main/res/layout/dialog_alert.xml index d9a9f1ce6d..6d5d7817b2 100644 --- a/app/src/main/res/layout/dialog_alert.xml +++ b/app/src/main/res/layout/dialog_alert.xml @@ -41,7 +41,7 @@ android:paddingLeft = "6dp" android:paddingRight = "6dp" android:paddingTop = "4dp" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "14sp" /> diff --git a/app/src/main/res/layout/dialog_communities_select_hint.xml b/app/src/main/res/layout/dialog_communities_select_hint.xml index c0c8cf8072..0e3e1424eb 100644 --- a/app/src/main/res/layout/dialog_communities_select_hint.xml +++ b/app/src/main/res/layout/dialog_communities_select_hint.xml @@ -40,7 +40,7 @@ android:layout_weight="1" android:gravity="center" android:text="关注" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/dialog_community.xml b/app/src/main/res/layout/dialog_community.xml index f365176298..036d574863 100644 --- a/app/src/main/res/layout/dialog_community.xml +++ b/app/src/main/res/layout/dialog_community.xml @@ -14,7 +14,7 @@ android:layout_marginTop="32dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="18sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -86,7 +86,7 @@ android:layout_width="0dp" android:layout_height="44dp" android:gravity="center" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/positive" diff --git a/app/src/main/res/layout/dialog_download_traffic.xml b/app/src/main/res/layout/dialog_download_traffic.xml index 1239efb947..2d0ff868b3 100644 --- a/app/src/main/res/layout/dialog_download_traffic.xml +++ b/app/src/main/res/layout/dialog_download_traffic.xml @@ -31,7 +31,7 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:text="允许一次" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/dialog_plugin.xml b/app/src/main/res/layout/dialog_plugin.xml index 0b226ac23e..da1605f188 100644 --- a/app/src/main/res/layout/dialog_plugin.xml +++ b/app/src/main/res/layout/dialog_plugin.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="插件化安装" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="16dp" android:textStyle="bold" /> @@ -61,7 +61,7 @@ android:paddingTop="4dp" android:paddingBottom="4dp" android:text="已确认，开始插件化" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_reserve.xml b/app/src/main/res/layout/dialog_reserve.xml index bc31c760fc..093e05f108 100644 --- a/app/src/main/res/layout/dialog_reserve.xml +++ b/app/src/main/res/layout/dialog_reserve.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="查看全部 >" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_reserve_game.xml b/app/src/main/res/layout/dialog_reserve_game.xml index aa795c6fc5..a3b2bbaa36 100644 --- a/app/src/main/res/layout/dialog_reserve_game.xml +++ b/app/src/main/res/layout/dialog_reserve_game.xml @@ -101,7 +101,7 @@ android:layout_weight="1" android:gravity="center" android:text="立即预约" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="15sp" /> @@ -163,7 +163,7 @@ android:layout_weight="1" android:gravity="center" android:text="设置微信提醒" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/dialog_sign.xml b/app/src/main/res/layout/dialog_sign.xml index f8246e6dfa..34d993c8da 100644 --- a/app/src/main/res/layout/dialog_sign.xml +++ b/app/src/main/res/layout/dialog_sign.xml @@ -16,7 +16,7 @@ android:layout_height = "wrap_content" android:layout_marginTop = "12dp" android:gravity = "center" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "16dp" android:textStyle = "bold" /> diff --git a/app/src/main/res/layout/dialog_strategy_item.xml b/app/src/main/res/layout/dialog_strategy_item.xml index 788422de28..e619e2c256 100644 --- a/app/src/main/res/layout/dialog_strategy_item.xml +++ b/app/src/main/res/layout/dialog_strategy_item.xml @@ -12,7 +12,7 @@ android:paddingBottom = "12dp" android:paddingTop = "12dp" android:text = "@string/string_description" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "16sp" /> diff --git a/app/src/main/res/layout/dialog_usage_stats.xml b/app/src/main/res/layout/dialog_usage_stats.xml index 624b0c6906..8e574f778e 100644 --- a/app/src/main/res/layout/dialog_usage_stats.xml +++ b/app/src/main/res/layout/dialog_usage_stats.xml @@ -68,7 +68,7 @@ android:layout_weight="1" android:gravity="center" android:text="去开启" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_verified_confirm.xml b/app/src/main/res/layout/dialog_verified_confirm.xml index 7ba44fd37d..a16bcaafb4 100644 --- a/app/src/main/res/layout/dialog_verified_confirm.xml +++ b/app/src/main/res/layout/dialog_verified_confirm.xml @@ -59,7 +59,7 @@ android:layout_weight="1" android:gravity="center" android:text="确定" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_video_upload_draft.xml b/app/src/main/res/layout/dialog_video_upload_draft.xml index d5fc2a046e..9ad6d611b3 100644 --- a/app/src/main/res/layout/dialog_video_upload_draft.xml +++ b/app/src/main/res/layout/dialog_video_upload_draft.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="25dp" android:text="确定要保存视频草稿吗？" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="15sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/downloadmanager.xml b/app/src/main/res/layout/downloadmanager.xml index 43ca38ec18..28aff65272 100644 --- a/app/src/main/res/layout/downloadmanager.xml +++ b/app/src/main/res/layout/downloadmanager.xml @@ -34,7 +34,7 @@ android:layout_alignParentRight = "true" android:layout_centerVertical = "true" android:text = "@string/download_startall" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/downloadmanager_item_head.xml b/app/src/main/res/layout/downloadmanager_item_head.xml index 250b167ac5..2226a3fec3 100644 --- a/app/src/main/res/layout/downloadmanager_item_head.xml +++ b/app/src/main/res/layout/downloadmanager_item_head.xml @@ -21,7 +21,7 @@ android:layout_alignParentRight = "true" android:layout_centerVertical = "true" android:text = "@string/download_startall" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index 60b4d6bf51..3ba05ea284 100644 --- a/app/src/main/res/layout/editor_insert_container.xml +++ b/app/src/main/res/layout/editor_insert_container.xml @@ -172,7 +172,7 @@ android:paddingRight = "20dp" android:paddingBottom = "10dp" android:text = "文章草稿" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:visibility = "gone" /> 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 56c192c71d..a28b76a3b3 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -104,7 +104,7 @@ android:layout_height = "26dp" android:background = "@drawable/questions_detail_tag_bg" android:gravity = "center" - android:textColor = "@color/text_1383EB" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf = "parent" diff --git a/app/src/main/res/layout/fragment_amway_search.xml b/app/src/main/res/layout/fragment_amway_search.xml index e1ddd62c36..fb9d7bbcf7 100644 --- a/app/src/main/res/layout/fragment_amway_search.xml +++ b/app/src/main/res/layout/fragment_amway_search.xml @@ -61,7 +61,7 @@ android:layout_marginTop="5dp" android:gravity="center" android:text="@string/loading_tap_to_retry" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/fragment_amway_success.xml b/app/src/main/res/layout/fragment_amway_success.xml index f1fcbe76fe..9de455fdd8 100644 --- a/app/src/main/res/layout/fragment_amway_success.xml +++ b/app/src/main/res/layout/fragment_amway_success.xml @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="《光环助手评论规则》" - android:textColor="@color/theme" /> + android:textColor="@color/theme_font" /> diff --git a/app/src/main/res/layout/fragment_answer_comment_conversation.xml b/app/src/main/res/layout/fragment_answer_comment_conversation.xml index 767ac26abc..d7b0744c0c 100644 --- a/app/src/main/res/layout/fragment_answer_comment_conversation.xml +++ b/app/src/main/res/layout/fragment_answer_comment_conversation.xml @@ -25,7 +25,7 @@ android:gravity = "center_vertical" android:paddingLeft = "20dp" android:singleLine = "true" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13dp" android:visibility = "gone" tools:visibility = "visible" /> diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 2615e6c591..5a5d87765d 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -101,7 +101,7 @@ android:drawablePadding="6dp" android:gravity="center" android:textStyle="bold" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> @@ -206,7 +206,7 @@ android:layout_height="wrap_content" android:layout_marginRight="5dp" android:text="喜欢就关注吧→" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/follow_tv" @@ -223,7 +223,7 @@ android:paddingLeft="12dp" android:drawablePadding="4dp" android:paddingRight="12dp" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" android:visibility="gone" android:textStyle="bold" diff --git a/app/src/main/res/layout/fragment_apk_cleaner.xml b/app/src/main/res/layout/fragment_apk_cleaner.xml index 95a50beb1d..05be5e1f08 100644 --- a/app/src/main/res/layout/fragment_apk_cleaner.xml +++ b/app/src/main/res/layout/fragment_apk_cleaner.xml @@ -80,7 +80,7 @@ android:background = "@drawable/detail_downloading_normal_style" android:gravity = "center" android:text = "@string/clean_scan_stop" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "14sp" /> diff --git a/app/src/main/res/layout/fragment_ask_follow.xml b/app/src/main/res/layout/fragment_ask_follow.xml index 3448242041..b8f97077fa 100644 --- a/app/src/main/res/layout/fragment_ask_follow.xml +++ b/app/src/main/res/layout/fragment_ask_follow.xml @@ -39,7 +39,7 @@ android:background="@drawable/border_blue_dim" android:gravity="center" android:text="保存" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="12sp" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/fragment_ask_search.xml b/app/src/main/res/layout/fragment_ask_search.xml index 2617fff799..6f5e1ccdff 100644 --- a/app/src/main/res/layout/fragment_ask_search.xml +++ b/app/src/main/res/layout/fragment_ask_search.xml @@ -26,7 +26,7 @@ android:layout_alignParentRight = "true" android:padding = "20dp" android:text = "@string/ask_search_questions_hint" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13sp" /> diff --git a/app/src/main/res/layout/fragment_comment_detail.xml b/app/src/main/res/layout/fragment_comment_detail.xml index 71c625e530..ea3c3964b3 100644 --- a/app/src/main/res/layout/fragment_comment_detail.xml +++ b/app/src/main/res/layout/fragment_comment_detail.xml @@ -15,7 +15,7 @@ android:gravity = "center_vertical" android:paddingLeft = "20dp" android:singleLine = "true" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13dp" android:visibility = "gone" /> @@ -79,7 +79,7 @@ android:drawablePadding = "4dp" android:hint = "@string/message_detail_comment_hint" android:textColor = "@color/black" - android:textColorHint = "@color/theme" + android:textColorHint = "@color/theme_font" android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "14sp" /> diff --git a/app/src/main/res/layout/fragment_help_contaier.xml b/app/src/main/res/layout/fragment_help_contaier.xml index 8968348fe9..b133880470 100644 --- a/app/src/main/res/layout/fragment_help_contaier.xml +++ b/app/src/main/res/layout/fragment_help_contaier.xml @@ -82,7 +82,7 @@ android:layout_marginLeft="16dp" android:layout_marginRight="20dp" android:text="搜索" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" app:layout_constraintLeft_toRightOf="@id/search_background" diff --git a/app/src/main/res/layout/fragment_help_content.xml b/app/src/main/res/layout/fragment_help_content.xml index 2a22b13ed8..eca0211291 100644 --- a/app/src/main/res/layout/fragment_help_content.xml +++ b/app/src/main/res/layout/fragment_help_content.xml @@ -55,7 +55,7 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="意见反馈" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 04da341d3c..3144b48a88 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -163,7 +163,7 @@ transSimpleCount="@{entity.count.follower}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="16sp" android:textStyle="bold" tools:text="50" /> @@ -191,7 +191,7 @@ transSimpleCount="@{entity.count.fans}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="16sp" android:textStyle="bold" tools:text="50" /> @@ -234,7 +234,7 @@ transSimpleCount="@{entity.count.vote}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="16sp" android:textStyle="bold" tools:text="50" /> @@ -352,7 +352,7 @@ android:layout_height="wrap_content" android:layout_marginRight="20dp" android:text="查看更多>" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="@id/playedGameTitleTv" app:layout_constraintRight_toRightOf="parent" @@ -400,7 +400,7 @@ app:layout_constraintTop_toTopOf="parent" app:tabMode="scrollable" app:tabIndicatorHeight="0dp" - app:tabSelectedTextColor="@color/text_1383EB" + app:tabSelectedTextColor="@color/theme_font" app:tabTextAppearance="@style/HomeTabTextAppearance" /> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 3572715780..24d7eb6215 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -66,7 +66,7 @@ android:layout_marginRight="4dp" android:gravity="center" android:text="@string/login_get_captcha" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_message_detail.xml b/app/src/main/res/layout/fragment_message_detail.xml index 4f90c98677..270fb59592 100644 --- a/app/src/main/res/layout/fragment_message_detail.xml +++ b/app/src/main/res/layout/fragment_message_detail.xml @@ -52,7 +52,7 @@ android:drawablePadding = "4dp" android:hint = "@string/message_detail_comment_hint" android:textColor = "@color/black" - android:textColorHint = "@color/theme" + android:textColorHint = "@color/theme_font" android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/fragment_suggest_select.xml b/app/src/main/res/layout/fragment_suggest_select.xml index 9beb735f06..a0ea77207e 100644 --- a/app/src/main/res/layout/fragment_suggest_select.xml +++ b/app/src/main/res/layout/fragment_suggest_select.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/suggest_type_normal" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/fragment_vote.xml b/app/src/main/res/layout/fragment_vote.xml index 368edec336..865af8c30b 100644 --- a/app/src/main/res/layout/fragment_vote.xml +++ b/app/src/main/res/layout/fragment_vote.xml @@ -12,7 +12,7 @@ android:layout_marginBottom = "8dp" android:background = "@color/all_white" android:gravity = "center" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "15sp" android:visibility = "gone" tools:text = "点击下载万能加速器" diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml index fbff19d90d..bb86c7f3fd 100644 --- a/app/src/main/res/layout/fragment_web.xml +++ b/app/src/main/res/layout/fragment_web.xml @@ -39,7 +39,7 @@ android:paddingRight = "23dp" android:paddingTop = "7dp" android:text = "@string/vote_web_comment" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "16sp" /> diff --git a/app/src/main/res/layout/game_download_dialog.xml b/app/src/main/res/layout/game_download_dialog.xml index e3fd308f2b..2726dc0676 100644 --- a/app/src/main/res/layout/game_download_dialog.xml +++ b/app/src/main/res/layout/game_download_dialog.xml @@ -25,7 +25,7 @@ android:gravity = "center" android:paddingLeft = "12dp" android:paddingRight = "12dp" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:visibility = "gone" /> @@ -47,7 +47,7 @@ android:gravity = "center" android:paddingLeft = "12dp" android:paddingRight = "12dp" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:visibility = "gone" /> diff --git a/app/src/main/res/layout/game_download_item.xml b/app/src/main/res/layout/game_download_item.xml index d6c6edda9b..bdf98cf94f 100644 --- a/app/src/main/res/layout/game_download_item.xml +++ b/app/src/main/res/layout/game_download_item.xml @@ -12,7 +12,7 @@ android:layout_width = "match_parent" android:layout_height = "20dp" android:gravity = "center" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index fd6107d732..a31bab1f29 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -156,7 +156,7 @@ android:gravity="right" android:singleLine="true" android:text="@string/game_percentage" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="9sp" /> diff --git a/app/src/main/res/layout/game_plugin_item.xml b/app/src/main/res/layout/game_plugin_item.xml index ab67823907..da86830f10 100644 --- a/app/src/main/res/layout/game_plugin_item.xml +++ b/app/src/main/res/layout/game_plugin_item.xml @@ -34,7 +34,7 @@ android:includeFontPadding="false" android:paddingTop="12dp" android:paddingBottom="12dp" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/game_subject_item.xml b/app/src/main/res/layout/game_subject_item.xml index d3c75e41a0..854ce3badc 100644 --- a/app/src/main/res/layout/game_subject_item.xml +++ b/app/src/main/res/layout/game_subject_item.xml @@ -80,7 +80,7 @@ android:layout_height = "match_parent" android:gravity = "center" android:text = "全部" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index ec526d9148..dd3db76d35 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -212,7 +212,7 @@ android:paddingTop="8dp" android:paddingBottom="24dp" android:text="展开剩余2条开服信息" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index 8719747d93..db47bd061d 100644 --- a/app/src/main/res/layout/gamedetail_body.xml +++ b/app/src/main/res/layout/gamedetail_body.xml @@ -133,7 +133,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="11sp" android:textStyle="bold" android:visibility="gone" diff --git a/app/src/main/res/layout/gamedetail_item_answer.xml b/app/src/main/res/layout/gamedetail_item_answer.xml index ab240a45d3..11495e70ea 100644 --- a/app/src/main/res/layout/gamedetail_item_answer.xml +++ b/app/src/main/res/layout/gamedetail_item_answer.xml @@ -32,7 +32,7 @@ android:layout_centerVertical="true" android:layout_marginRight="18dp" android:text="进入问答" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_news.xml b/app/src/main/res/layout/gamedetail_item_news.xml index 09eb7c8edb..900c663afc 100644 --- a/app/src/main/res/layout/gamedetail_item_news.xml +++ b/app/src/main/res/layout/gamedetail_item_news.xml @@ -36,7 +36,7 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:text = "@string/news_all" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13sp" /> diff --git a/app/src/main/res/layout/home_amway_item.xml b/app/src/main/res/layout/home_amway_item.xml index 661691a12b..16ebfee183 100644 --- a/app/src/main/res/layout/home_amway_item.xml +++ b/app/src/main/res/layout/home_amway_item.xml @@ -76,7 +76,7 @@ android:layout_marginLeft="6dp" android:includeFontPadding="false" android:text="@{data.game.star + ``}" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="12sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/amway_score_icon" diff --git a/app/src/main/res/layout/item_question_detail_recommended_user.xml b/app/src/main/res/layout/item_question_detail_recommended_user.xml index 6638918adc..c1e66724e8 100644 --- a/app/src/main/res/layout/item_question_detail_recommended_user.xml +++ b/app/src/main/res/layout/item_question_detail_recommended_user.xml @@ -43,7 +43,7 @@ android:background="@drawable/button_question_detail_invite" android:gravity="center" android:text="智能邀请" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/layout_menu_article_publish.xml b/app/src/main/res/layout/layout_menu_article_publish.xml index bc52af528f..5db88d77d2 100644 --- a/app/src/main/res/layout/layout_menu_article_publish.xml +++ b/app/src/main/res/layout/layout_menu_article_publish.xml @@ -11,7 +11,7 @@ android:gravity = "center" android:paddingRight = "20dp" android:text = "发文章" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13sp" /> diff --git a/app/src/main/res/layout/layout_menu_game_comment.xml b/app/src/main/res/layout/layout_menu_game_comment.xml index 87a982a714..103e9dfc5a 100644 --- a/app/src/main/res/layout/layout_menu_game_comment.xml +++ b/app/src/main/res/layout/layout_menu_game_comment.xml @@ -11,7 +11,7 @@ android:gravity = "center" android:paddingRight = "20dp" android:text = "提交" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "13sp" /> diff --git a/app/src/main/res/layout/layout_menu_my_ask_draft.xml b/app/src/main/res/layout/layout_menu_my_ask_draft.xml index 147e6da85f..aaef02bed7 100644 --- a/app/src/main/res/layout/layout_menu_my_ask_draft.xml +++ b/app/src/main/res/layout/layout_menu_my_ask_draft.xml @@ -14,7 +14,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:text="草稿" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/layout_menu_question_and_answer.xml b/app/src/main/res/layout/layout_menu_question_and_answer.xml index 37d1d07f10..6b713fde99 100644 --- a/app/src/main/res/layout/layout_menu_question_and_answer.xml +++ b/app/src/main/res/layout/layout_menu_question_and_answer.xml @@ -9,7 +9,7 @@ android:layout_height = "22dp" android:layout_centerInParent = "true" android:gravity = "center" - android:textColor = "@color/text_1383EB" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:paddingLeft="10dp" android:paddingRight="10dp" diff --git a/app/src/main/res/layout/layout_menu_text.xml b/app/src/main/res/layout/layout_menu_text.xml index 5793814c6f..e568636e5b 100644 --- a/app/src/main/res/layout/layout_menu_text.xml +++ b/app/src/main/res/layout/layout_menu_text.xml @@ -10,7 +10,7 @@ android:layout_centerInParent="true" android:gravity="center" android:paddingRight="20dp" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/list_section_item.xml b/app/src/main/res/layout/list_section_item.xml index 8697a6274b..c2a9cac954 100644 --- a/app/src/main/res/layout/list_section_item.xml +++ b/app/src/main/res/layout/list_section_item.xml @@ -28,7 +28,7 @@ android:paddingRight="10dp" android:paddingBottom="10dp" android:text="正序" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="11sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/personal_home_item.xml b/app/src/main/res/layout/personal_home_item.xml index fb339dcd0c..a4f41a3fa8 100644 --- a/app/src/main/res/layout/personal_home_item.xml +++ b/app/src/main/res/layout/personal_home_item.xml @@ -108,7 +108,7 @@ android:id="@+id/user_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="13sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/tv_badge_name" diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml index 5fc110374a..c9129b609a 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -104,7 +104,7 @@ android:gravity="center" android:text="@string/question_detail_invite" android:textStyle="bold" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> @@ -138,7 +138,7 @@ android:gravity="center" android:text="@string/question_detail_answer" android:textStyle="bold" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> @@ -176,7 +176,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="关联问题（已解决的同类问题）" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index 4a190c0bb1..93cb237006 100644 --- a/app/src/main/res/layout/questionsinvite_item.xml +++ b/app/src/main/res/layout/questionsinvite_item.xml @@ -107,7 +107,7 @@ android:background="@drawable/comment_border_bg" android:gravity="center" android:text="@string/invite" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/questionsinvite_top_item.xml b/app/src/main/res/layout/questionsinvite_top_item.xml index b261917532..bd6a0bda2f 100644 --- a/app/src/main/res/layout/questionsinvite_top_item.xml +++ b/app/src/main/res/layout/questionsinvite_top_item.xml @@ -23,7 +23,7 @@ android:background = "@drawable/comment_border_bg" android:gravity = "center" android:text = "@string/invite" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintRight_toRightOf = "parent" diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index ddcb206919..36af1df0ce 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -308,7 +308,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:text="查看更多回复" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="11sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/reply_content" /> diff --git a/app/src/main/res/layout/reuse_no_connection.xml b/app/src/main/res/layout/reuse_no_connection.xml index b0ca2a29c1..7e3a044500 100644 --- a/app/src/main/res/layout/reuse_no_connection.xml +++ b/app/src/main/res/layout/reuse_no_connection.xml @@ -27,7 +27,7 @@ android:layout_marginTop = "5dp" android:gravity = "center" android:text = "@string/loading_tap_to_retry" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_search.xml b/app/src/main/res/layout/toolbar_search.xml index d45a800072..05a49a9d6d 100644 --- a/app/src/main/res/layout/toolbar_search.xml +++ b/app/src/main/res/layout/toolbar_search.xml @@ -59,7 +59,7 @@ android:layout_height="@dimen/appbar_height" android:gravity="center" android:text="@string/search_search" - android:textColor="@color/theme" + android:textColor="@color/theme_font" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/vote_item.xml b/app/src/main/res/layout/vote_item.xml index efbe1f3363..414fe88e96 100644 --- a/app/src/main/res/layout/vote_item.xml +++ b/app/src/main/res/layout/vote_item.xml @@ -34,7 +34,7 @@ android:layout_alignParentRight = "true" android:gravity = "center" android:text = "@string/vote_btn" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "11sp" /> diff --git a/app/src/main/res/layout/voting_top_item.xml b/app/src/main/res/layout/voting_top_item.xml index 83164100de..2c53e95ea4 100644 --- a/app/src/main/res/layout/voting_top_item.xml +++ b/app/src/main/res/layout/voting_top_item.xml @@ -13,7 +13,7 @@ android:background = "@drawable/ask_voting_button_border" android:gravity = "center" android:text = "我要投票" - android:textColor = "@color/theme" + android:textColor = "@color/theme_font" android:textSize = "12sp" app:layout_constraintBottom_toBottomOf = "parent" app:layout_constraintLeft_toLeftOf = "parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 11459a7ba1..41600b74fa 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,10 @@ - #1A7BD5 + #2496FF + + #1383EB + @color/background @@ -132,7 +135,6 @@ #e6f3ff #2496FF #1F89EC - #1383EB #EEF5FB #C1BFC9 #FF5F14