diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index d3ad53fff7..df571b3327 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -229,7 +229,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy tv.setBackground(ContextCompat.getDrawable(this, R.color.theme)); if (BuildConfig.FLAVOR.equals("internal")) { envText = "测试环境"; - tv.setBackground(ContextCompat.getDrawable(this, R.color.red)); + tv.setBackground(ContextCompat.getDrawable(this, R.color.theme_red)); } tv.setText(envText); tv.setGravity(Gravity.CENTER); diff --git a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt index 63eb93991f..1cd7efae08 100644 --- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt +++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt @@ -118,8 +118,8 @@ object AddKaiFuBindingAdapter { @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition") fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) { if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) { - view.setTextColor(ContextCompat.getColor(view.context, R.color.red)) - view.setHintTextColor(ContextCompat.getColor(view.context, R.color.red)) + view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red)) + view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red)) } else if (position == 0) { view.setTextColor(ContextCompat.getColor(view.context, R.color.hint)) view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint)) diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 979f4dcc5d..a1f7e80942 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -861,7 +861,7 @@ public class BindingAdapters { view.setText(count + ""); } else { view.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); - view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_999999)); + view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc)); view.setText("-"); } } diff --git a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt index 0838f5b080..c7fe37004a 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -298,7 +298,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)) } else { holder.binding.statusTv.text = "未安装" - holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_FF4147)) + holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red)) } holder.binding.statusTv.visibility = View.VISIBLE } else { diff --git a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt index ddecd37fd3..78a7fba421 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -212,7 +212,7 @@ class SimulatorDownloadManager private constructor() { ToastUtils.showToast("该模拟器暂未提供下载") }, uiModificationCallback = { binding -> - binding.confirmTv.setTextColor(R.color.text_cccccc.toColor()) + binding.confirmTv.setTextColor(R.color.text_body.toColor()) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } diff --git a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt index 633d258e7e..2e9e0c37b6 100644 --- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt @@ -60,7 +60,7 @@ object BbsReportHelper { this, 1f, false, - R.color.text_f5f5f5 + R.color.background ) ) binding.reasonRv.adapter = reportReasonAdapter @@ -90,7 +90,7 @@ object BbsReportHelper { binding.otherReasonEt.doOnTextChanged { text, start, before, count -> val tvCount: Int = text.toString().length if (tvCount >= 500) { - binding.tvCount.setTextColor(R.color.text_FF4147.toColor()) + binding.tvCount.setTextColor(R.color.theme_red.toColor()) } binding.tvCount.text = "$tvCount/500" } 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 cd126073e0..d889105f07 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -50,7 +50,6 @@ import androidx.recyclerview.widget.RecyclerView; import kotlin.Unit; import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.facebook.drawee.view.SimpleDraweeView; @@ -63,7 +62,6 @@ import com.gh.common.view.FixLinearLayoutManager; import com.gh.common.view.LimitHeightLinearLayout; import com.gh.common.view.MaxHeightNestedScrollView; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.AboutActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.adapter.ReportReasonAdapter; @@ -88,7 +86,6 @@ import com.gh.gamecenter.entity.TrackableEntity; import com.gh.gamecenter.setting.GameDownloadSettingFragment; import com.gh.gamecenter.suggest.SuggestType; import com.halo.assistant.HaloApp; -import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.adapter.BaseRecyclerAdapter; import com.lightgame.download.DownloadEntity; import com.lightgame.utils.AppManager; @@ -378,7 +375,7 @@ public class DialogUtils { if (negative.isEmpty()) { cancelBtn.setVisibility(View.GONE); middleLine.setVisibility(View.GONE); - confirmBtn.setTextColor(ContextCompat.getColor(context, R.color.text_333333)); + confirmBtn.setTextColor(ContextCompat.getColor(context, R.color.text_title)); } if (positive.isEmpty()) { confirmBtn.setVisibility(View.GONE); @@ -1159,7 +1156,7 @@ public class DialogUtils { TextView negativeTv = contentView.findViewById(R.id.negative); TextView positiveTv = contentView.findViewById(R.id.positive); TextView content = contentView.findViewById(R.id.content); - positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.text_f5f5f5, 999)); + positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.background, 999)); negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999)); content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content))); @@ -1687,7 +1684,7 @@ public class DialogUtils { complaintCommentEt.setShadowLayer(complaintCommentEt.getExtendedPaddingBottom(), 0f, 0f, Color.TRANSPARENT); ExtensionsKt.setTextChangedListener(complaintCommentEt, (s, start, before, count) -> { - commitTv.setTextColor(ContextCompat.getColor(finalContext, s.toString().trim().isEmpty() ? R.color.text_999999 : R.color.theme_font)); + commitTv.setTextColor(ContextCompat.getColor(finalContext, s.toString().trim().isEmpty() ? R.color.text_subtitleDesc : R.color.theme_font)); return null; }); @@ -2036,7 +2033,7 @@ public class DialogUtils { return null; }); binding.reasonRv.setLayoutManager(new LinearLayoutManager(context)); - binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.text_f5f5f5)); + binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.background)); binding.reasonRv.setAdapter(reportReasonAdapter); binding.negativeBtn.setOnClickListener(v -> { @@ -2058,7 +2055,7 @@ public class DialogUtils { ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> { int tvCount = s.length(); if (tvCount >= 500) { - binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.text_FF4147)); + binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.theme_red)); } binding.tvCount.setText(tvCount + "/500"); return null; diff --git a/app/src/main/java/com/gh/common/util/PermissionHelper.kt b/app/src/main/java/com/gh/common/util/PermissionHelper.kt index 9bba8e7a47..ea91c2088f 100644 --- a/app/src/main/java/com/gh/common/util/PermissionHelper.kt +++ b/app/src/main/java/com/gh/common/util/PermissionHelper.kt @@ -236,7 +236,7 @@ object PermissionHelper { it.hintTv.setOnClickListener { DirectUtils.directToWebView(context, Constants.PERMISSION_SCENARIO_ADDRESS, "(权限弹窗)") } - it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_333333)) + it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_title)) } ) } diff --git a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt index 9121aef1fc..70af443e22 100644 --- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt +++ b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt @@ -186,7 +186,7 @@ object QuickLoginHelper { .setNavTextSize(18) //服务条款标题字体大小 // 手机号码 .setNumberSize(20, true) //手机号码字体大小 - .setNumberColor(R.color.text_333333.toColor()) //手机号码字体颜色 + .setNumberColor(R.color.text_title.toColor()) //手机号码字体颜色 .setNumFieldOffsetY(95) //号码栏Y偏移量 // 登录按钮 .setLogBtnImgPath("login_btn_bg") //登录按钮背景 @@ -257,7 +257,7 @@ object QuickLoginHelper { "用户协议", R.string.disclaimer_url.toResString(), "隐私政策", R.string.privacy_policy_url.toResString(), "", "", "", "") //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款) - .setPrivacyText(11, R.color.text_999999.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置 + .setPrivacyText(11, R.color.text_subtitleDesc.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置 .setPrivacyMargin(30, 32) //隐私条款距离手机左右边缘的边距 .setPrivacyOffsetY(280) //隐私条款Y偏移量 // 语言 diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt index 143f0ec6f3..f5628810c1 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt @@ -52,7 +52,7 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled binding.collection.setTextColor(R.color.text_05CBA3.toColor()) gameEntity.pluginDesc + "此版本" } else { - binding.collection.setTextColor(R.color.text_cccccc.toColor()) + binding.collection.setTextColor(R.color.text_body.toColor()) "查看合集" } } else "查看详情" 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 4e941e476a..5c5e1592a0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -32,12 +32,9 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -223,7 +220,7 @@ public class CleanApkAdapter extends BaseRecyclerAdapter 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)); + holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme_red)); } holder.gameDes.setText(mContext.getString(R.string.clean_apk_version, gameEntity.getGameVersion(), sizeName)); holder.gameDes.setTextColor(ContextCompat.getColor(mContext, R.color.content)); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 96b0fa638f..60f6df3bf7 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -51,8 +51,6 @@ import java.util.Locale; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; import retrofit2.HttpException; /** @@ -163,7 +161,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { }) .build(); viewHolder.hint.setText(builder); - viewHolder.hint.setTextColor(ContextCompat.getColor(mContext, R.color.text_666666)); + viewHolder.hint.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); viewHolder.hint.setMovementMethod(new LinkMovementMethod()); } } diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt index e8f0d81c33..b9173579ed 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt @@ -23,10 +23,10 @@ class AmwaySearchViewHolder(var binding: AmwaySearchItemBinding, val mViewModel: binding.hintTv.goneIf(gameEntity.showComment) if (gameEntity.showComment) { - binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_333333)) + binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_title)) binding.nameTv.setTypeface(binding.nameTv.typeface, Typeface.BOLD) } else { - binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_999999)) + binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_subtitleDesc)) binding.nameTv.setTypeface(binding.nameTv.typeface, Typeface.NORMAL) } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt index e7df675c51..aa1408afa1 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt @@ -33,8 +33,8 @@ class CatalogAdapter(context: Context, root.setBackgroundColor(R.color.white.toColor()) } else { selectedTag.visibility = View.GONE - catalogName.setTextColor(R.color.text_333333.toColor()) - root.setBackgroundColor(R.color.text_F5F5F5.toColor()) + catalogName.setTextColor(R.color.text_title.toColor()) + root.setBackgroundColor(R.color.background.toColor()) } root.setOnClickListener { if (catalogEntity.name != mViewModel.selectedCatalogName) { diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt index bb12c75439..6db77f1f16 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt @@ -81,7 +81,7 @@ class CatalogFragment : LazyFragment() { mBinding?.divider?.visibility = View.GONE mBinding?.root?.setBackgroundColor(Color.WHITE) mBinding?.root?.setPadding(0, 8F.dip2px(), 0, 0) - mBinding?.rvCatalog?.setBackgroundColor(R.color.text_F5F5F5.toColor()) + mBinding?.rvCatalog?.setBackgroundColor(R.color.background.toColor()) } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt index e0c9f6e817..f6909f18e7 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Adapter.kt @@ -33,8 +33,8 @@ class CategoryV2Adapter(context: Context, root.setBackgroundColor(R.color.white.toColor()) } else { selectedTag.visibility = View.GONE - catalogName.setTextColor(R.color.text_333333.toColor()) - root.setBackgroundColor(R.color.text_F5F5F5.toColor()) + catalogName.setTextColor(R.color.text_title.toColor()) + root.setBackgroundColor(R.color.background.toColor()) } root.setOnClickListener { if (catalogEntity.name != mViewModel.selectedCategoryName) { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index 067b6a8686..d5d7993b64 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -88,7 +88,7 @@ class CategoryV2Fragment : LazyFragment() { root.setBackgroundColor(Color.WHITE) root.setPadding(0, 8F.dip2px(), 0, 0) directoryRv.isNestedScrollingEnabled = false - categoryRv.setBackgroundColor(R.color.text_F5F5F5.toColor()) + categoryRv.setBackgroundColor(R.color.background.toColor()) } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt index 2a8df568aa..e2238cfea9 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt @@ -136,7 +136,7 @@ class CategoryV2ListAdapter(context: Context, initItemPadding() initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) hint.textSize = 12F - hint.setTextColor(R.color.text_999999.toColor()) + hint.setTextColor(R.color.text_subtitleDesc.toColor()) } } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index 791e737293..6a383fa1be 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -35,7 +35,7 @@ class SubCategoryAdapter(context: Context, } else { selectedIv.visibility = View.GONE container.setBackgroundResource(R.drawable.bg_shape_f8_radius_8) - name.setTextColor(R.color.text_333333.toColor()) + name.setTextColor(R.color.text_title.toColor()) } root.setOnClickListener { @@ -46,7 +46,7 @@ class SubCategoryAdapter(context: Context, categoryEntity.selected = false selectedIv.visibility = View.GONE container.setBackgroundResource(R.drawable.bg_shape_f8_radius_8) - name.setTextColor(R.color.text_333333.toColor()) + name.setTextColor(R.color.text_title.toColor()) mViewModel.run { if (selectedCount > 0) { selectedCount-- diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt index 0b90b10848..dfb13372b2 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -186,7 +186,7 @@ class GamesCollectionAdapter( itemEntity.count?.run { vote-- if (vote < 0) vote = 0 - voteCount.setTextColor(R.color.text_999999.toColor()) + voteCount.setTextColor(R.color.text_subtitleDesc.toColor()) voteCount.text = if (vote == 0) "赞同" else vote.toNewSimpleCount() } } 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 bd8f00018c..93ea2c91d5 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -225,7 +225,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); viewHolder.dmDownloads.setLayoutParams(lparams); - viewHolder.dmDownloads.setTextColor(mContext.getResources().getColor(R.color.red)); + viewHolder.dmDownloads.setTextColor(mContext.getResources().getColor(R.color.theme_red)); viewHolder.dmDownloads.setText("数据异常，请重新下载"); viewHolder.dmDelete.setVisibility(View.VISIBLE); viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt index 4045f0e31d..d63712b950 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt @@ -93,7 +93,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : } holder.binding.infoTv.text = itemData.header ?: itemData.ignoredUpdateHeader if (itemData.header != null) { - holder.binding.infoTv.setTextColor(R.color.text_333333.toColor()) + holder.binding.infoTv.setTextColor(R.color.text_title.toColor()) holder.binding.root.setOnClickListener(null) holder.binding.infoTv.setCompoundDrawablesWithIntrinsicBounds( null, @@ -102,7 +102,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : null ) } else { - holder.binding.infoTv.setTextColor(R.color.text_999999.toColor()) + holder.binding.infoTv.setTextColor(R.color.text_subtitleDesc.toColor()) holder.binding.root.setOnClickListener { mViewModel.toggleIgnoredUpdateVisibility() } @@ -121,7 +121,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : } is BlankDividerViewHolder -> { if (itemData.divider == UpdatableGameViewModel.GREY) { - holder.binding.container.setBackgroundColor(R.color.text_F5F5F5.toColor()) + holder.binding.container.setBackgroundColor(R.color.background.toColor()) } else if (itemData.divider == UpdatableGameViewModel.BLUE) { holder.binding.container.setBackgroundColor(R.color.bg_F2F7FC.toColor()) } else { diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt index c2a4d6efb5..114b683515 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt @@ -105,7 +105,7 @@ class CommodityAdapter(context: Context, timerContainer.visibility = View.VISIBLE timerContainer.setBackgroundResource(R.drawable.bg_shelve_timer) timerIv.setImageResource(R.drawable.ic_shelve) - timerTv.setTextColor(R.color.text_FFA142.toColor()) + timerTv.setTextColor(R.color.theme_yellow.toColor()) val duration = commodity.shelveTimestamp - TimeUtil.currentTime() if (duration > 86400) { val durationDay = duration / 86400 @@ -132,7 +132,7 @@ class CommodityAdapter(context: Context, timerContainer.visibility = View.VISIBLE timerContainer.setBackgroundResource(R.drawable.bg_off_shelve_timer) timerIv.setImageResource(R.drawable.ic_off_shelve) - timerTv.setTextColor(R.color.text_FF4147.toColor()) + timerTv.setTextColor(R.color.theme_red.toColor()) val duration = commodity.offShelveTimestamp - TimeUtil.currentTime() if (duration > 86400) { val durationDay = duration / 86400 diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt index e8bb2c0eab..42f4074d0d 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityFragment.kt @@ -84,7 +84,7 @@ class CommodityFragment : ListFragment() { sizeTv.setTextColor(R.color.white.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_00dba4) } else { - sizeTv.setTextColor(R.color.text_333333.toColor()) + sizeTv.setTextColor(R.color.text_title.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_ebf9fa) } @@ -124,7 +124,7 @@ class CommodityFragment : ListFragment() { root.layoutParams = params sizeTv.text = "更多 >" - sizeTv.setTextColor(R.color.text_333333.toColor()) + sizeTv.setTextColor(R.color.text_title.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_ebf9fa) root.setOnClickListener { @@ -212,7 +212,7 @@ class CommodityFragment : ListFragment() { sizeTv.setTextColor(R.color.white.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_00dba4) } else { - sizeTv.setTextColor(R.color.text_333333.toColor()) + sizeTv.setTextColor(R.color.text_title.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_ebf9fa) } @@ -242,7 +242,7 @@ class CommodityFragment : ListFragment() { root.layoutParams = params sizeTv.text = "更多 >" - sizeTv.setTextColor(R.color.text_333333.toColor()) + sizeTv.setTextColor(R.color.text_title.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_ebf9fa) root.setOnClickListener { @@ -279,7 +279,7 @@ class CommodityFragment : ListFragment() { sizeTv.setTextColor(R.color.white.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_00dba4) } else { - sizeTv.setTextColor(R.color.text_333333.toColor()) + sizeTv.setTextColor(R.color.text_title.toColor()) sizeTv.setBackgroundResource(R.drawable.button_round_ebf9fa) } } diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt index add79f3e6c..b010a08acb 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseFragment.kt @@ -353,7 +353,7 @@ class EnergyHouseFragment: BaseLazyFragment() { tv.setTextColor(R.color.white.toColor()) tv.setBackgroundResource(R.drawable.button_round_00dba4) } else { - tv.setTextColor(R.color.text_333333.toColor()) + tv.setTextColor(R.color.text_title.toColor()) tv.setBackgroundResource(R.drawable.button_round_ebf9fa) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index b2296bd7c0..308344e119 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -55,7 +55,7 @@ class ForumArticleAskListFragment : ListFragment currentTime) { binding.remarkDot.setRoundedColorBackground(R.color.theme, 5F) } else if (startTime == 0L && endTime == 0L) { - binding.remarkDot.setRoundedColorBackground(R.color.text_cccccc, 5F) + binding.remarkDot.setRoundedColorBackground(R.color.text_body, 5F) } else { - binding.remarkDot.setRoundedColorBackground(R.color.text_cccccc, 5F) + binding.remarkDot.setRoundedColorBackground(R.color.text_body, 5F) } } else { binding.firstRemark.visibility = View.INVISIBLE diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt index 5dc2400680..a3327cf575 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt @@ -95,7 +95,7 @@ class RankGameItemUi(override val ctx: Context) : Ui { private fun initNameTv() = textView { setSingleLine() - setTextColor(ContextCompat.getColor(context, R.color.text_333333)) + setTextColor(ContextCompat.getColor(context, R.color.text_title)) textSize = 13F typeface = Typeface.DEFAULT_BOLD } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index baef0af7c0..b76dacfe6e 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -189,7 +189,7 @@ class GameItemUi(override val ctx: Context) : Ui { includeFontPadding = false typeface = Typeface.DEFAULT_BOLD textSize = 14F - setTextColor(ContextCompat.getColor(context, R.color.text_333333)) + setTextColor(ContextCompat.getColor(context, R.color.text_title)) } private fun initServerTypeTv() = textView { @@ -211,7 +211,7 @@ class GameItemUi(override val ctx: Context) : Ui { setSingleLine() includeFontPadding = false ellipsize = TextUtils.TruncateAt.END - setTextColor(ContextCompat.getColor(context, R.color.text_999999)) + setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) } private fun initDownloadTv() = textView { @@ -275,7 +275,7 @@ class GameItemUi(override val ctx: Context) : Ui { setSingleLine() ellipsize = TextUtils.TruncateAt.END - setTextColor(ContextCompat.getColor(context, R.color.text_999999)) + setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) } private fun initDownloadProgressBar(): ProgressBar { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt index 7b3d094d64..59df213f81 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt @@ -6,13 +6,11 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.ItemViewType import com.gh.common.util.DisplayUtils -import com.gh.common.util.ToastUtils import com.gh.common.util.toColor import com.gh.common.util.toDrawable import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder import com.gh.gamecenter.databinding.GameItemBinding -import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.game.GameItemViewHolder import com.gh.gamecenter.qa.editor.GameAdapter import com.lightgame.utils.Utils @@ -43,7 +41,7 @@ class AddSearchAndPlayedGameAdapter(context: Context, val mChooseGamesViewModel: holder.binding.downloadBtn.text = if (isSelected) "删除" else "添加" holder.binding.downloadBtn.background = if (isSelected) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.download_button_normal_style.toDrawable() - holder.binding.downloadBtn.setTextColor(if (isSelected) R.color.text_999999.toColor() else R.color.white.toColor()) + holder.binding.downloadBtn.setTextColor(if (isSelected) R.color.text_subtitleDesc.toColor() else R.color.white.toColor()) holder.binding.downloadBtn.setOnClickListener { val chooseGameList = mChooseGamesViewModel.chooseGamesLiveData.value ?: arrayListOf() diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt index 53c8273aff..a6cb3bb4c3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt @@ -34,8 +34,7 @@ import com.gh.gamecenter.qa.comment.CommentPictureAdapter import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter import com.lightgame.download.DownloadEntity -import java.util.ArrayList -import java.util.HashMap +import java.util.* open class GameCollectionDetailAdapter( context: Context, @@ -223,11 +222,11 @@ open class GameCollectionDetailAdapter( binding.root.context, 0, prefix.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val parentUserNameSpan = SpanBuilder(parentUserName) .bold(0, parentUserName.length) - .click(0, parentUserName.length, R.color.text_666666) { + .click(0, parentUserName.length, R.color.text_subtitle) { DirectUtils.directToHomeActivity( binding.root.context, comment.user.id, @@ -241,7 +240,7 @@ open class GameCollectionDetailAdapter( binding.root.context, 0, colon.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val authorSpan = if (comment.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() @@ -411,7 +410,7 @@ open class GameCollectionDetailAdapter( binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty()) binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null) binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null) - binding.subCommentContainer.setRoundedColorBackground(R.color.text_F5F5F5, 5F) + binding.subCommentContainer.setRoundedColorBackground(R.color.background, 5F) subCommentList?.firstOrNull()?.let { binding.firstSubCommentTv.text = getSubCommentSpanned( diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt index 6049e2db63..1a207ba98e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt @@ -478,7 +478,7 @@ class GameCollectionDetailFragment : setTextColor(if (isFollow) R.color.white_alpha_60.toColor() else R.color.white.toColor()) } else { setBackgroundResource(if (isFollow) R.drawable.button_round_f5f5f5 else R.drawable.button_round_1a2496ff) - setTextColor(if (isFollow) R.color.text_999999.toColor() else R.color.theme.toColor()) + setTextColor(if (isFollow) R.color.text_subtitleDesc.toColor() else R.color.theme.toColor()) } } } @@ -489,7 +489,7 @@ class GameCollectionDetailFragment : visibility = View.VISIBLE text = if (isFollow) "已关注" else "关注" setBackgroundResource(if (isFollow) R.drawable.button_round_f5f5f5 else R.drawable.button_round_1a2496ff) - setTextColor(if (isFollow) R.color.text_999999.toColor() else R.color.theme.toColor()) + setTextColor(if (isFollow) R.color.text_subtitleDesc.toColor() else R.color.theme.toColor()) } mBinding?.toolbarFollowTv?.run { if (isLight ?: mIsLight) { @@ -498,7 +498,7 @@ class GameCollectionDetailFragment : visibility = View.VISIBLE text = if (isFollow) "已关注" else "关注" setBackgroundResource(if (isFollow) R.drawable.button_round_f5f5f5 else R.drawable.button_round_1a2496ff) - setTextColor(if (isFollow) R.color.text_999999.toColor() else R.color.theme.toColor()) + setTextColor(if (isFollow) R.color.text_subtitleDesc.toColor() else R.color.theme.toColor()) } } } @@ -517,7 +517,7 @@ class GameCollectionDetailFragment : bottomStarTv.setTextColor(R.color.theme_font.toColor()) } else { bottomStarIv.setImageResource(R.drawable.ic_article_detail_star_bottom_bar) - bottomStarTv.setTextColor(R.color.text_666666.toColor()) + bottomStarTv.setTextColor(R.color.text_subtitle.toColor()) } } } @@ -530,7 +530,7 @@ class GameCollectionDetailFragment : bottomLikeTv.setTextColor(R.color.theme_font.toColor()) } else { bottomLikeIv.setImageResource(R.drawable.ic_article_detail_like_bottom_bar) - bottomLikeTv.setTextColor(R.color.text_666666.toColor()) + bottomLikeTv.setTextColor(R.color.text_subtitle.toColor()) } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index d74c104a32..74a9b4839f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -275,7 +275,7 @@ class GameCollectionEditActivity : ToolBarActivity() { val tagBinding = ItemGameCollectionFlexTagBinding.inflate(LayoutInflater.from(this), null, false) tagBinding.tagNameTv.run { text = "选择标签" - setTextColor(R.color.text_333333.toColor()) + setTextColor(R.color.text_title.toColor()) textSize = 14f } tagBinding.divider.visibility = View.GONE @@ -285,12 +285,12 @@ class GameCollectionEditActivity : ToolBarActivity() { val tagBinding = ItemGameCollectionFlexTagBinding.inflate(LayoutInflater.from(this), null, false) tagBinding.tagNameTv.run { text = tag.name - setTextColor(R.color.text_333333.toColor()) + setTextColor(R.color.text_title.toColor()) textSize = 14f } tagBinding.divider.run { alpha = 0.2f - setBackgroundColor(R.color.text_333333.toColor()) + setBackgroundColor(R.color.text_title.toColor()) goneIf(index == tags.size - 1) setPadding(8f.dip2px(), 0, 8f.dip2px(), 0) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 5f8d3c82b7..8fd6e0be25 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -986,7 +986,7 @@ class GameDetailFragment : NormalFragment() { gameBigEvent.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_999999 + R.color.text_subtitleDesc ) ) gameBigEvent.background = diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 2b2fbc715a..2765a4ee76 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -309,7 +309,7 @@ class DescAdapter(context: Context, val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) .size(DisplayUtils.dip2px(0.5f)) .margin(DisplayUtils.dip2px(16f)) - .color(ContextCompat.getColor(mContext, R.color.text_f5f5f5)).build() + .color(ContextCompat.getColor(mContext, R.color.background)).build() viewHolder.binding.recyclerview.addItemDecoration(itemDecoration) viewHolder.binding.tvAll.setOnClickListener { EventBus.getDefault().post(EBReuse(GameDetailFragment.SKIP_RATING)) @@ -576,7 +576,7 @@ class DescAdapter(context: Context, val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) .size(DisplayUtils.dip2px(0.5f)) .margin(DisplayUtils.dip2px(16f)) - .color(ContextCompat.getColor(mContext, R.color.text_f5f5f5)).build() + .color(ContextCompat.getColor(mContext, R.color.background)).build() addItemDecoration(itemDecoration) } } @@ -759,7 +759,7 @@ class DescAdapter(context: Context, params.weight = 1f layoutParams = params textSize = 13F - setTextColor(ContextCompat.getColor(mContext, R.color.text_666666)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)) text = label if (hasDividingLine) { compoundDrawablePadding = DisplayUtils.dip2px(12f) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index eb60629c24..1ca1022b1d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -83,10 +83,10 @@ class DescCommentsAdapter(context: Context, when { commentData.isEditContent == null -> { - time.setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + time.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) time.text = if (commentData.ignore) { val s = "${NewsUtils.getFormattedTime(commentData.time)} 保护期评论不计入总分" - SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips).color(mContext, s.length - 10, s.length, R.color.text_666666).build() + SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips).color(mContext, s.length - 10, s.length, R.color.text_subtitle).build() } else { NewsUtils.getFormattedTime(commentData.time) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt index 658ea90b33..64836ec34e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt @@ -44,7 +44,7 @@ class GamePermissionAdapter(context: Context, val permissions: List) layoutParams = params textSize = 14F typeface = Typeface.DEFAULT_BOLD - setTextColor(ContextCompat.getColor(mContext, R.color.text_333333)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_title)) text = title } } @@ -55,7 +55,7 @@ class GamePermissionAdapter(context: Context, val permissions: List) params.topMargin = 6F.dip2px() layoutParams = params textSize = 12F - setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) text = desc } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt index c19d667349..fa35db3197 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt @@ -67,7 +67,7 @@ class GameTagsDialog : BaseTrackableDialogFragment() { val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext()) .margin(DisplayUtils.dip2px(20f)) .size(DisplayUtils.dip2px(1f)) - .color(ContextCompat.getColor(requireContext(), R.color.text_f5f5f5)).build() + .color(ContextCompat.getColor(requireContext(), R.color.background)).build() addItemDecoration(itemDecoration) val gameTagsAdapter = GameTagsAdapter(requireContext(), mTagStyles) adapter = gameTagsAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index 26107165fd..942b7f32a0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -211,9 +211,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.nextMonth.setTextColor(Color.WHITE) mBinding.curMonth.setBackgroundColor(0) - mBinding.curMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.curMonth.setTextColor(R.color.text_title.toColor()) mBinding.previousMonth.setBackgroundColor(0) - mBinding.previousMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.previousMonth.setTextColor(R.color.text_title.toColor()) mBinding.year.text = formatYearText.format(previousTime) } @@ -229,9 +229,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.curMonth.setTextColor(Color.WHITE) mBinding.nextMonth.setBackgroundColor(0) - mBinding.nextMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.nextMonth.setTextColor(R.color.text_title.toColor()) mBinding.previousMonth.setBackgroundColor(0) - mBinding.previousMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.previousMonth.setTextColor(R.color.text_title.toColor()) mBinding.year.text = formatYearText.format(curTime) } @@ -247,9 +247,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.previousMonth.setTextColor(Color.WHITE) mBinding.nextMonth.setBackgroundColor(0) - mBinding.nextMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.nextMonth.setTextColor(R.color.text_title.toColor()) mBinding.curMonth.setBackgroundColor(0) - mBinding.curMonth.setTextColor(R.color.text_333333.toColor()) + mBinding.curMonth.setTextColor(R.color.text_title.toColor()) mBinding.year.text = formatYearText.format(curTime) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt index 3574575902..2d838be788 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt @@ -40,7 +40,7 @@ class ServersCalendarAdapter(context: Context, val textView = TextView(mContext) textView.setPadding(0, 16F.dip2px(), 0, 21F.dip2px()) textView.gravity = Gravity.CENTER - textView.setTextColor(R.color.text_999999.toColor()) + textView.setTextColor(R.color.text_subtitleDesc.toColor()) textView.textSize = 12F WeekViewHolder(textView) } else { @@ -67,9 +67,9 @@ class ServersCalendarAdapter(context: Context, } else { holder.calendarDay.text = day.toString() if (day < viewModel.curDay && viewModel.selectedMonth == MonthType.CUR_MONTH || viewModel.selectedMonth == MonthType.PREVIOUS_MONTH) { - holder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + holder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) } else { - holder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_333333)) + holder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)) } } val calendarServer: List = entity.server @@ -84,7 +84,7 @@ class ServersCalendarAdapter(context: Context, } holder.calendarKaifu.text = if (TextUtils.isEmpty(remark)) if (calendarServer.size > 1) "新服×" + calendarServer.size else "新服" else remark if (day < viewModel.curDay && viewModel.selectedMonth == MonthType.CUR_MONTH || viewModel.selectedMonth == MonthType.PREVIOUS_MONTH) { - holder.calendarKaifu.background = DrawableView.getOvalDrawable(R.color.text_cccccc, 6F) + holder.calendarKaifu.background = DrawableView.getOvalDrawable(R.color.text_body, 6F) } else { holder.calendarKaifu.background = DrawableView.getOvalDrawable(if (TextUtils.isEmpty(remark)) R.color.tag_yellow else R.color.tag_orange, 6F) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt index 6ef799fa13..53a54af874 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt @@ -19,9 +19,9 @@ class ServersDetailViewHolder(val binding: DialogServersCalendearDetailItemBindi binding.time.text = data.getFormatTime("HH:mm") binding.remark.text = data.remark - binding.name.setTextColor(R.color.text_333333.toColor()) - binding.time.setTextColor(R.color.text_333333.toColor()) - binding.remark.setTextColor(R.color.text_333333.toColor()) + binding.name.setTextColor(R.color.text_title.toColor()) + binding.time.setTextColor(R.color.text_title.toColor()) + binding.remark.setTextColor(R.color.text_title.toColor()) if (meEntity?.isPartTime == true) { binding.name.paint.flags = Paint.UNDERLINE_TEXT_FLAG 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 73a1423f2b..4a37638083 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 @@ -57,10 +57,10 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR userIcon.display(commentData.user.border, commentData.user.icon, commentData.user.auth?.icon) when { commentData.isEditContent == null -> { - time.setTextColor(ContextCompat.getColor(context, R.color.text_999999)) + time.setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) time.text = if (commentData.ignore) { val s = "${NewsUtils.getFormattedTime(commentData.time)} 保护期评论不计入总分" - SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips).color(context, s.length - 10, s.length, R.color.text_666666).build() + SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips).color(context, s.length - 10, s.length, R.color.text_subtitle).build() } else { NewsUtils.getFormattedTime(commentData.time) } @@ -328,7 +328,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR private fun getSpan(context: Context, name: String, commentData: RatingComment): SpannableStringBuilder { val spanned = SpanBuilder(name) - .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_333333) + .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_title) .bold(0, commentData.replyData?.user?.name!!.length) .size(0, commentData.replyData?.user?.name!!.length, 13) .build() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt index 640d729fe2..37c9a20f06 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt @@ -42,7 +42,7 @@ class RatingItemViewHolder(val binding: RatingItemBinding) : BaseRecyclerViewHol val hitText = item.findViewById(R.id.hint_text) hitText.text = text - hitText.setTextColor(ContextCompat.getColor(view.context, if (text == selectedValue) R.color.theme_font else R.color.text_666666)) + hitText.setTextColor(ContextCompat.getColor(view.context, if (text == selectedValue) R.color.theme_font else R.color.text_subtitle)) item.setOnClickListener { popupWindow.dismiss() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index 9102e96a1e..0efa881e88 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -100,7 +100,7 @@ class RatingReplyActivity : ListActivity if (s.toString().trim().isNotEmpty()) { @@ -110,7 +110,7 @@ class RatingReplyActivity : ListActivity(context) { val view = CheckedTextView(context).apply { textSize = 14f gravity = Gravity.CENTER - setTextColor(ContextCompat.getColor(context,R.color.text_333333)) - background = DrawableView.getStrokeDrawable(R.color.text_eeeeee) + setTextColor(ContextCompat.getColor(context,R.color.text_title)) + background = DrawableView.getStrokeDrawable(R.color.divider) setPadding(12F.dip2px(), 5F.dip2px(), 12F.dip2px(), 5F.dip2px()) } return object : RecyclerView.ViewHolder(view) {} 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 32b0d84c45..72ed9ceb3e 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpCategoryAdapter.kt @@ -40,7 +40,7 @@ class HelpCategoryAdapter(context: Context, holder.binding.content.text = entity.name holder.binding.content.setTextColor( if (mSelectMap[position] == true) R.color.theme_font.toColor() - else R.color.text_333333.toColor()) + else R.color.text_title.toColor()) holder.binding.icon.goneIf(entity.icon.isEmpty()) ImageUtils.display(holder.binding.icon, entity.icon) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt index 75a24ee869..f1da3c7cf6 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContentAdapter.kt @@ -159,7 +159,7 @@ class HelpContentAdapter( is FooterViewHolder -> { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) holder.hint.text = "没有更多了~" - holder.hint.setTextColor(R.color.text_666666.toColor()) + holder.hint.setTextColor(R.color.text_subtitle.toColor()) holder.hint.textSize = 12f } } diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt index 5d847daef7..fbe0686f62 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaAdapter.kt @@ -24,7 +24,7 @@ class HelpQaAdapter(val context: Context, val helpCategoryEntity: HelpCategoryEn val helpView = TextView(context).apply { val params = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, 30f.dip2px()) layoutParams = params - setTextColor(ContextCompat.getColor(context, R.color.text_333333)) + setTextColor(ContextCompat.getColor(context, R.color.text_title)) textSize = 14f includeFontPadding = false gravity = Gravity.CENTER_VERTICAL diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt index 931d630c3b..0ecaf74749 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt @@ -73,7 +73,7 @@ class HelpQaCategoryFragment : NormalFragment() { layoutManager = LinearLayoutManager(context) addItemDecoration(HorizontalDividerItemDecoration.Builder(requireContext()) .size(8f.dip2px()) - .color(ContextCompat.getColor(requireContext(), R.color.text_f5f5f5)).build()) + .color(ContextCompat.getColor(requireContext(), R.color.background)).build()) mAdapter = HelpQaCategoryAdapter(requireContext(), mQaCollectionId) adapter = mAdapter } diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt index d4396ec1ac..a7bddd27da 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackReasonAdapter.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.help import android.content.Context -import android.view.Gravity import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView @@ -37,7 +36,7 @@ class QaFeedbackReasonAdapter( holder.binding.reasonTv.apply { holder.binding.reasonTv.background = if (mSelectPosition == position) R.drawable.qa_feedback_rg_button_checked.toDrawable() else R.drawable.qa_feedback_rg_button_normal.toDrawable() - holder.binding.reasonTv.setTextColor(if (mSelectPosition == position) R.color.theme_font.toColor() else R.color.text_333333.toColor()) + holder.binding.reasonTv.setTextColor(if (mSelectPosition == position) R.color.theme_font.toColor() else R.color.text_title.toColor()) } holder.binding.reasonTv.setOnClickListener { mSelectPosition = position diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index ad31d4d7da..8e3a9c1c16 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -669,7 +669,7 @@ class LegacyHomeFragmentAdapterAssistant( } else { holder.mPluginExtend.text = "收起" holder.mPluginExtend.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.home_plugin_bottom_close, 0) - holder.mPluginExtend.setTextColor(R.color.text_999999.toColor()) + holder.mPluginExtend.setTextColor(R.color.text_subtitleDesc.toColor()) } } else { holder.mExtendContainer.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt index 89d19a042d..afdfad4bac 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.home.skip import android.content.Context -import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView @@ -92,7 +91,7 @@ class PackageSkipAdapter(val context: Context, val games: ArrayList, } } else if (holder is FooterViewHolder) { holder.initFooterViewHolder(false, false, true) - holder.hint.setTextColor(ContextCompat.getColor(context, R.color.text_999999)) + holder.hint.setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) holder.hint.textSize = 12f } } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index 6e24490825..0c50bc8146 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -109,7 +109,7 @@ open class PlayedGameAdapter(context: Context, val runTimeView = TextView(mContext) runTimeView.setSingleLine(true) runTimeView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11f) - runTimeView.setTextColor(R.color.text_666666.toColor()) + runTimeView.setTextColor(R.color.text_subtitle.toColor()) runTimeView.text = ("游戏时长 " + NumberUtils.transSimpleUsageTime(gameEntity.playedTime)) holder.binding.gameItemIncluded.labelList.addView(runTimeView) @@ -146,7 +146,7 @@ open class PlayedGameAdapter(context: Context, is FooterViewHolder -> { holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) - holder.hint.setTextColor(R.color.text_999999.toColor()) + holder.hint.setTextColor(R.color.text_subtitleDesc.toColor()) } } } 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 edffbe736e..f092e6b370 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -59,11 +59,11 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi when { entity.id == UserManager.getInstance().userId -> { setText(R.string.myself) - setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) } entity?.me?.isFollower!! -> { setText(R.string.concerned) - setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) } else -> { setText(R.string.concern) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt index f6050de152..2f61c93db0 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt @@ -185,7 +185,7 @@ class AvatarBorderFragment : NormalFragment() { userAvatar.displayBorder(UserManager.getInstance().userInfoEntity?.iconBorder?.url) commitTv.text = "使用" commitTv.isEnabled = false - commitTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_cccccc)) + commitTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_body)) commitTv.background = ContextCompat.getDrawable(requireContext(), R.drawable.border_round_eee_999) } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt index f82f98c7fe..cf32493947 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt @@ -59,7 +59,7 @@ class ChooseAvatarBorderAdapter(context: Context, isEnable = false holder.binding.descTv.run { visibility = View.VISIBLE - setTextColor(R.color.text_FF4147.toColor()) + setTextColor(R.color.theme_red.toColor()) text = "${borderEntity.energy}光能" } } @@ -71,7 +71,7 @@ class ChooseAvatarBorderAdapter(context: Context, isEnable = true holder.binding.descTv.run { visibility = View.VISIBLE - setTextColor(R.color.text_999999.toColor()) + setTextColor(R.color.text_subtitleDesc.toColor()) text = if (borderEntity.expire!! == 0L) { "有效期9999天" } else { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt index 0eb76b96e9..c32557e017 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt @@ -178,7 +178,7 @@ class UserHistoryFragment : ListFragment { commentSubType.visibility = View.GONE arrowIv.visibility = View.GONE gameCollectionType.setBackgroundResource(R.drawable.button_round_fafafa) - gameCollectionType.setTextColor(R.color.text_333333.toColor()) + gameCollectionType.setTextColor(R.color.text_title.toColor()) gameType.setBackgroundResource(R.drawable.button_round_f0f8ff) gameType.setTextColor(R.color.theme_font.toColor()) commentType.setBackgroundResource(R.drawable.button_round_fafafa) - commentType.setTextColor(R.color.text_333333.toColor()) + commentType.setTextColor(R.color.text_title.toColor()) } else -> { commentSubType.visibility = View.VISIBLE arrowIv.visibility = View.VISIBLE gameCollectionType.setBackgroundResource(R.drawable.button_round_fafafa) - gameCollectionType.setTextColor(R.color.text_333333.toColor()) + gameCollectionType.setTextColor(R.color.text_title.toColor()) gameType.setBackgroundResource(R.drawable.button_round_fafafa) - gameType.setTextColor(R.color.text_333333.toColor()) + gameType.setTextColor(R.color.text_title.toColor()) commentType.setBackgroundResource(R.drawable.button_round_f0f8ff) commentType.setTextColor(R.color.theme_font.toColor()) } @@ -159,7 +159,7 @@ class UserGameFragment: NormalFragment() { if (mFilter == text) { (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { - (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) } container.addView(item) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt index fda7fed2c9..3ef0fdc0ba 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt @@ -82,14 +82,14 @@ class UserPlayedGameAdapter(context: Context, gameDes.run { setTextSize(TypedValue.COMPLEX_UNIT_SP, 11F) - setTextColor(R.color.text_666666.toColor()) + setTextColor(R.color.text_subtitle.toColor()) } labelList.removeAllViews() val runTimeView = TextView(mContext).apply { isSingleLine = true setTextSize(TypedValue.COMPLEX_UNIT_SP, 11F) - setTextColor(R.color.text_999999.toColor()) + setTextColor(R.color.text_subtitleDesc.toColor()) text = ("游戏时长: " + NumberUtils.transSimpleUsageTime(gameEntity.playedTime)) } labelList.addView(runTimeView) diff --git a/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt index aa1616cf75..961f867d94 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/all/AskAllFragment.kt @@ -14,7 +14,6 @@ import com.gh.gamecenter.R import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.qa.article.SimpleArticleListFragment import com.gh.gamecenter.qa.newest.AskQuestionsNewBodyFragment -import com.lightgame.utils.Utils import com.lightgame.view.NoScrollableViewPager import kotterknife.bindView @@ -43,8 +42,8 @@ class AskAllFragment : BaseFragment() { super.onViewCreated(view, savedInstanceState) mQuestionButton.background = DrawableView.getOvalSelectorStyle(R.color.background, R.color.theme) mArticleButton.background = DrawableView.getOvalSelectorStyle(R.color.background, R.color.theme) - mQuestionButton.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_666666, R.color.white)) - mArticleButton.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_666666, R.color.white)) + mQuestionButton.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_subtitle, R.color.white)) + mArticleButton.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_subtitle, R.color.white)) mQuestionButton.setOnClickListener { mViewPager.currentItem = 0 diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt index 9bd8ba07f3..02873febcf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt @@ -234,7 +234,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH } else { if (!entity.active) { voteIcon.setImageResource(R.drawable.community_vote_unavailable) - voteCount.setTextColor(R.color.text_cccccc.toColor()) + voteCount.setTextColor(R.color.text_body.toColor()) } else if (entity.me.isCommunityArticleVote || entity.me.isAnswerVoted || entity.me.isVoted) { voteIcon.setImageResource(R.drawable.community_vote_selector) voteIcon.isChecked = true @@ -242,7 +242,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH } else { voteIcon.setImageResource(R.drawable.community_vote_selector) voteIcon.isChecked = false - voteCount.setTextColor(R.color.text_999999.toColor()) + voteCount.setTextColor(R.color.text_subtitleDesc.toColor()) } } @@ -250,12 +250,12 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH val commentIcon = itemView.context.resources.getDrawable(R.drawable.community_comment_count) commentIcon.setBounds(0, 0, commentIcon.minimumWidth, commentIcon.minimumHeight) commentCount.setCompoundDrawables(commentIcon, null, null, null) - commentCount.setTextColor(R.color.text_999999.toColor()) + commentCount.setTextColor(R.color.text_subtitleDesc.toColor()) } else { val commentCloseIcon = itemView.context.resources.getDrawable(R.drawable.community_comment_count_unavailable) commentCloseIcon.setBounds(0, 0, commentCloseIcon.minimumWidth, commentCloseIcon.minimumHeight) commentCount.setCompoundDrawables(commentCloseIcon, null, null, null) - commentCount.setTextColor(R.color.text_cccccc.toColor()) + commentCount.setTextColor(R.color.text_body.toColor()) } } @@ -347,7 +347,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH entity.count.vote = entity.count.vote - 1 voteIcon.isChecked = false - voteCount.setTextColor(R.color.text_999999.toColor()) + voteCount.setTextColor(R.color.text_subtitleDesc.toColor()) voteCount.text = if (entity.count.vote > 0) entity.count.vote.toString() else "赞同" if (entity.type == "video") { @@ -466,7 +466,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH entity.count.vote = entity.count.vote - 1 entity.me.isCommunityArticleVote = false voteIcon.isChecked = false - voteCount.setTextColor(R.color.text_999999.toColor()) + voteCount.setTextColor(R.color.text_subtitleDesc.toColor()) voteCount.text = if (entity.count.vote > 0) entity.count.vote.toString() else "赞同" val communityId = if (entity.community.id.isEmpty()) entity.bbs.id diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt index 20b9b4c7a2..58d76dfebe 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt @@ -57,7 +57,7 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : B binding.title.visibility = View.GONE binding.content.textSize = 14F binding.content.setLineSpacing(DisplayUtils.sp2px(binding.root.context, 4F).toFloat(), 1.0F) - binding.content.setTextColor(R.color.text_333333.toColor()) + binding.content.setTextColor(R.color.text_title.toColor()) binding.content.maxLines = 3 } @@ -135,7 +135,7 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : B binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.hint)) } else { binding.content.paint.flags = Paint.ANTI_ALIAS_FLAG - binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_666666)) + binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_subtitle)) } binding.executePendingBindings() } 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 c95a6e392e..13dd7776ce 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 @@ -152,7 +152,7 @@ open class AnswerDetailFragment : NormalFragment() { mBinding.richEditor.setInputEnabled(false) mBinding.richEditor.setPadding(20, 15, 20, 15) mBinding.bottomController.replyTv.text = "说点什么吧" - mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.text_F5F5F5, 19F) + mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.background, 19F) mElapsedHelper = TimeElapsedHelper(this) // 只对显示在屏幕上的 fragment 计时 @@ -466,7 +466,7 @@ open class AnswerDetailFragment : NormalFragment() { "修改回答") } ANSWERED_NOT_MY_ANSWER -> { - mBinding.statusTv.setTextColor(R.color.text_999999.toColor()) + mBinding.statusTv.setTextColor(R.color.text_subtitleDesc.toColor()) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.question_detail_myanswer_icon, @@ -499,7 +499,7 @@ open class AnswerDetailFragment : NormalFragment() { private fun toggleComment(enable: Boolean, commentCount: Int) { if (enable) { mBinding.bottomController.bottomCommentIv.setImageResource(R.drawable.ic_article_detail_comment_bottom_bar) - mBinding.bottomController.bottomCommentTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + mBinding.bottomController.bottomCommentTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) mBinding.bottomController.bottomCommentTv.text = if (commentCount > 0) commentCount.toString() else "评论" } else { mBinding.bottomController.bottomCommentIv.setImageResource(R.drawable.community_content_detail_comment_close) @@ -727,7 +727,7 @@ open class AnswerDetailFragment : NormalFragment() { val iconIv = view.findViewById(R.id.iconIv) val actionNameTv = view.findViewById(R.id.actionNameTv) iconIv.setImageDrawable(ContextCompat.getDrawable(requireContext(), if (item.disableIcon > 0) item.disableIcon else item.normalIcon)) - actionNameTv.setTextColor(ContextCompat.getColor(requireContext(), if (item.disableIcon > 0) R.color.text_999999 else R.color.text_333333)) + actionNameTv.setTextColor(ContextCompat.getColor(requireContext(), if (item.disableIcon > 0) R.color.text_subtitleDesc else R.color.text_title)) view.isEnabled = item.disableIcon == 0 actionNameTv.text = item.text if (index > 0) { @@ -933,7 +933,7 @@ open class AnswerDetailFragment : NormalFragment() { } else { mBinding.bottomController.bottomStarIv.setImageResource(R.drawable.ic_article_detail_star_bottom_bar) mBinding.bottomController.bottomStarTv.text = "收藏" - mBinding.bottomController.bottomStarTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + mBinding.bottomController.bottomStarTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) } } @@ -1133,7 +1133,7 @@ open class AnswerDetailFragment : NormalFragment() { mBinding.followTv.visibility = View.VISIBLE if (isFollowed) { DrawableView.setTextDrawable(mBinding.followTv, null, "已关注") - mBinding.followTv.setTextColor(R.color.text_999999.toColor()) + mBinding.followTv.setTextColor(R.color.text_subtitleDesc.toColor()) } else { mBinding.followTv.background = DrawableView.getOvalDrawable(R.color.background, 2F) mBinding.followTv.setTextColor(R.color.theme_font.toColor()) @@ -1154,7 +1154,7 @@ open class AnswerDetailFragment : NormalFragment() { } else { mBinding.bottomController.bottomLikeIv.setImageResource(R.drawable.ic_article_detail_like_bottom_bar) mBinding.bottomController.bottomLikeTv.text = "赞同" - mBinding.bottomController.bottomLikeTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + mBinding.bottomController.bottomLikeTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt index ddffff2923..aac4b6a321 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt @@ -65,12 +65,12 @@ class ArticleDetailContentViewHolder( when (article.status) { "pending" -> { approvalStatusTv.text = "内容审核中" - approvalStatusTv.setTextColor(R.color.text_06CEA8.toColor()) + approvalStatusTv.setTextColor(R.color.theme_green.toColor()) approvalStatusTv.background = R.drawable.bg_approval_status_pending.toDrawable() } "fail" -> { approvalStatusTv.text = "审核不通过" - approvalStatusTv.setTextColor(R.color.red.toColor()) + approvalStatusTv.setTextColor(R.color.theme_red.toColor()) approvalStatusTv.background = R.drawable.bg_approval_status_fail.toDrawable() } } @@ -219,7 +219,7 @@ class ArticleDetailContentViewHolder( if (followBtn.visibility == View.GONE) return followBtn.text = "已关注" followBtn.background = null - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_999999)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_subtitleDesc)) } else { followBtn.setRoundedColorBackground(R.color.text_EEF5FB, 14F) followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.theme_font)) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index 11aaa9b9ed..2d6032defb 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -270,7 +270,7 @@ class ArticleDetailFragment : BaseCommentFragment(), Keyb return { mViewModel.selectActivityLabelEntity = it mActivityTitle.text = it?.name - mActivityTitle.setTextColor(if (it != null) R.color.text_FA8500.toColor() else R.color.text_333333.toColor()) + mActivityTitle.setTextColor(if (it != null) R.color.text_FA8500.toColor() else R.color.text_title.toColor()) } } @@ -515,7 +515,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb mForumIcon.visibility = View.VISIBLE mForumContainerView.background = ContextCompat.getDrawable(this, R.drawable.bg_shape_f5_radius_999) mGameName.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.ic_article_edit_choose_forum_arrow_gray), null) - mGameName.setTextColor(ContextCompat.getColor(this, R.color.text_333333)) + mGameName.setTextColor(ContextCompat.getColor(this, R.color.text_title)) } override fun onMenuItemClick(item: MenuItem?): Boolean { 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 3569fee419..78259fd574 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 @@ -14,8 +14,6 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.base.fragment.BaseDialogFragment -import com.gh.base.fragment.BaseDialogWrapperFragment import com.gh.base.fragment.BaseFragment import com.gh.common.AppExecutor import com.gh.common.util.* @@ -191,7 +189,7 @@ class ArticleTagsSelectFragment : BaseFragment() { tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_unselect) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt index 75246370ca..7bd05a4b70 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt @@ -67,10 +67,10 @@ class NewCommentAdapter( holder.itemView.context, 0, prefix.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .click(0, parentUserName.length, R.color.text_666666) { + .click(0, parentUserName.length, R.color.text_subtitle) { DirectUtils.directToHomeActivity( holder.itemView.context, commentEntity.user.id, @@ -83,7 +83,7 @@ class NewCommentAdapter( holder.itemView.context, 0, colon.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val authorSpan = if (commentEntity.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt index 5ea550c3fd..46b04749c1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt @@ -18,7 +18,6 @@ import com.gh.gamecenter.databinding.StairsCommentItemBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.manager.UserManager import com.halo.assistant.HaloApp -import io.reactivex.disposables.Disposable class StairsCommentViewHolder( val binding: StairsCommentItemBinding, @@ -66,7 +65,7 @@ class StairsCommentViewHolder( val name = "${entity.user.name} 回复 ${parentUser.name}" binding.commentUserName.text = SpanBuilder(name).color( (entity.user.name?.length - ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, R.color.text_666666 + ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, R.color.text_subtitle ).build() } else { binding.commentUserName.text = userInfo.name @@ -86,7 +85,7 @@ class StairsCommentViewHolder( val name = "${entity.user.name} 回复 ${parentUser.name}" binding.commentUserName.text = SpanBuilder(name).color( (entity.user.name?.length - ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, R.color.text_666666 + ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, R.color.text_subtitle ).build() } else { binding.commentUserName.text = entity.user.name diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index b608d15e20..e10604bb8a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -297,7 +297,7 @@ abstract class BaseCommentAdapter( val unselectedTextView = if (!isLatestSelected) filterLatestTv else filterOldestTv selectedTextView.setTextColor(R.color.theme_font.toColor()) - unselectedTextView.setTextColor(R.color.text_999999.toColor()) + unselectedTextView.setTextColor(R.color.text_subtitleDesc.toColor()) } } } @@ -427,11 +427,11 @@ abstract class BaseCommentAdapter( binding.root.context, 0, prefix.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val parentUserNameSpan = SpanBuilder(parentUserName) .bold(0, parentUserName.length) - .click(0, parentUserName.length, R.color.text_666666) { + .click(0, parentUserName.length, R.color.text_subtitle) { DirectUtils.directToHomeActivity( binding.root.context, comment.user.id, @@ -445,7 +445,7 @@ abstract class BaseCommentAdapter( binding.root.context, 0, colon.length, - R.color.text_999999 + R.color.text_subtitleDesc ).build() val authorSpan = if (comment.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() @@ -488,7 +488,7 @@ abstract class BaseCommentAdapter( binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty()) binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null) binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null) - binding.subCommentContainer.setRoundedColorBackground(R.color.text_F5F5F5, 5F) + binding.subCommentContainer.setRoundedColorBackground(R.color.background, 5F) subCommentList?.firstOrNull()?.let { binding.firstSubCommentTv.text = getSubCommentSpanned( diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt index 142d8af081..8eda96afc4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt @@ -149,7 +149,7 @@ class MoreFunctionPanelDialog : BaseDraggableDialogFragment() { setTextColor( ContextCompat.getColor( requireContext(), - if (itemEntity.isEnable) R.color.text_666666 else R.color.text_999999 + if (itemEntity.isEnable) R.color.text_subtitle else R.color.text_subtitleDesc ) ) includeFontPadding = false diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt index fa6a60b43c..baf7374ccf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt @@ -51,10 +51,10 @@ class LocalMediaFragment : BaseFragment(), AlbumMediaCollection.AlbumMediaC mBinding.previewTv.isEnabled = it.isNotEmpty() mBinding.confirmTv.isEnabled = it.isNotEmpty() if (it.isEmpty()) { - mBinding.previewTv.setTextColor(R.color.text_cccccc.toColor()) + mBinding.previewTv.setTextColor(R.color.text_body.toColor()) mBinding.confirmTv.alpha = 0.6f } else { - mBinding.previewTv.setTextColor(R.color.text_666666.toColor()) + mBinding.previewTv.setTextColor(R.color.text_subtitle.toColor()) mBinding.confirmTv.alpha = 1f } mBinding.numTv.text = "(${it.size}/${mAdapter.maxChooseSize})" diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt index 658a0dfaf3..df07a7af2e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowFragment.kt @@ -163,7 +163,7 @@ class AskFollowFragment : ListFragment { - holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.text_666666)) + holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)) DrawableView.setTextDrawable(holder.concern, R.drawable.ic_edit_question, "修改问题") } mQuestionEntity!!.me.isQuestionFollowed -> { - holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.text_666666)) + holder.concern.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)) DrawableView.setTextDrawable(holder.concern, R.drawable.ic_followed_question, "已关注") } else -> { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt index 02c96cabab..3228e7e654 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt @@ -495,7 +495,7 @@ class QuestionsDetailFragment : val iconIv = view.findViewById(R.id.iconIv) val actionNameTv = view.findViewById(R.id.actionNameTv) iconIv.setImageDrawable(ContextCompat.getDrawable(requireContext(), if (item.disableIcon > 0) item.disableIcon else item.normalIcon)) - actionNameTv.setTextColor(ContextCompat.getColor(requireContext(), if (item.disableIcon > 0) R.color.text_999999 else R.color.text_333333)) + actionNameTv.setTextColor(ContextCompat.getColor(requireContext(), if (item.disableIcon > 0) R.color.text_subtitleDesc else R.color.text_title)) view.isEnabled = item.disableIcon == 0 actionNameTv.text = item.text if (index > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt index b586df7e57..84f154a4be 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt @@ -276,7 +276,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), return { mViewModel.selectActivityLabelEntity = it mBinding.activityTitle.text = it?.name - mBinding.activityTitle.setTextColor(if (it != null) R.color.text_FA8500.toColor() else R.color.text_333333.toColor()) + mBinding.activityTitle.setTextColor(if (it != null) R.color.text_FA8500.toColor() else R.color.text_title.toColor()) } } @@ -765,7 +765,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), ContextCompat.getDrawable(this, R.drawable.ic_article_edit_choose_forum_arrow_gray), null ) - mBinding.chooseForumTv.setTextColor(ContextCompat.getColor(this, R.color.text_333333)) + mBinding.chooseForumTv.setTextColor(ContextCompat.getColor(this, R.color.text_title)) } private fun setEditHtml(html: String?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index 7bbad514a2..d0e14d0286 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -25,7 +25,6 @@ import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.qa.entity.QuestionsDetailEntity -import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity import com.google.android.flexbox.FlexboxLayout import com.lightgame.utils.Util_System_Keyboard @@ -307,7 +306,7 @@ class TagsSelectFragment : BaseFragment() { tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_unselect) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_666666)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt index eb9792a79b..b364e60168 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt @@ -173,7 +173,7 @@ class NewQuestionDetailFragment : val bbsType = if (mViewModel.questionDetail?.type == "game_bbs") "游戏论坛" else "综合论坛" mBinding.inputContainer.replyTv.text = "说点什么吧" - mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.text_F5F5F5, 19F) + mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.background, 19F) mBinding.inputContainer.replyTv.setDebouncedClickListener { clickToastByStatus(mViewModel.questionDetail?.status ?: "") { startCommentActivity() @@ -350,7 +350,7 @@ class NewQuestionDetailFragment : ) mBinding.inputContainer.bottomStarTv.setTextColor( if (mViewModel.questionDetail?.me?.isFavorite == true) - R.color.theme_font.toColor() else R.color.text_666666.toColor() + R.color.theme_font.toColor() else R.color.text_subtitle.toColor() ) mBinding.inputContainer.bottomStarTv.text = if (mViewModel.questionDetail?.me?.isFavorite == true) "已收藏" else "收藏" @@ -427,8 +427,8 @@ class NewQuestionDetailFragment : followBtn.setOnClickListener { mAdapter?.questionDetailVH?.binding?.followBtn?.performClick() } if (isFollow) { followBtn.text = "已关注" - followBtn.setRoundedColorBackground(R.color.text_f5f5f5, 999F) - followBtn.setTextColor(R.color.text_999999.toColor()) + followBtn.setRoundedColorBackground(R.color.background, 999F) + followBtn.setTextColor(R.color.text_subtitleDesc.toColor()) } else { followBtn.text = "关注" followBtn.setRoundedColorBackground(R.color.text_EEF5FB, 999F) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt index 2f98c5e896..7e41eb068f 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt @@ -61,12 +61,12 @@ class QuestionDetailContentViewHolder( when (question.status) { "pending" -> { approvalStatusTv.text = "内容审核中" - approvalStatusTv.setTextColor(R.color.text_06CEA8.toColor()) + approvalStatusTv.setTextColor(R.color.theme_green.toColor()) approvalStatusTv.background = R.drawable.bg_approval_status_pending.toDrawable() } "fail" -> { approvalStatusTv.text = "审核不通过" - approvalStatusTv.setTextColor(R.color.red.toColor()) + approvalStatusTv.setTextColor(R.color.theme_red.toColor()) approvalStatusTv.background = R.drawable.bg_approval_status_fail.toDrawable() } } @@ -207,7 +207,7 @@ class QuestionDetailContentViewHolder( if (followBtn.visibility == View.GONE) return followBtn.text = "已关注" followBtn.background = null - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_999999)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_subtitleDesc)) } else { followBtn.setRoundedColorBackground(R.color.text_EEF5FB, 14F) followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.theme_font)) diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt index a382a2a6dd..6f83bbb2bf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt @@ -43,7 +43,7 @@ class RecommendConcernAdapter(context: Context, override fun onFollowSuccess() { isFollowed = true v.setBackgroundResource(R.drawable.questions_detail_tag_bg) - v.setTextColor(ContextCompat.getColor(mContext, R.color.text_999999)) + v.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) v.text = "已关注" v.postDelayed({ listViewModel.deleteFollowById(entity.id) 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 d3ae2b04c0..ea1c786c62 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 @@ -11,7 +11,6 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import com.gh.common.constant.ItemViewType -import com.gh.common.util.ImageUtils import com.gh.common.util.dip2px import com.gh.common.util.toColor import com.gh.common.view.GameIconView @@ -136,12 +135,12 @@ class OpenedAdapter(context: Context, val mListViewModel: OpenedViewModel) : Lis if (isSelectLeft) { holder.bind.communityNameLeft.setTextColor(R.color.theme_font.toColor()) } else { - holder.bind.communityNameLeft.setTextColor(R.color.text_333333.toColor()) + holder.bind.communityNameLeft.setTextColor(R.color.text_title.toColor()) } if (isSelectRight) { holder.bind.communityNameRight.setTextColor(R.color.theme_font.toColor()) } else { - holder.bind.communityNameRight.setTextColor(R.color.text_333333.toColor()) + holder.bind.communityNameRight.setTextColor(R.color.text_title.toColor()) } holder.bind.communityNameLeft.setSelected(isSelectLeft, offsetCallback = { diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt index 6dfb555f41..b625966f4d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt @@ -14,7 +14,6 @@ import com.gh.common.view.CustomDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.baselist.LazyListFragment import com.gh.gamecenter.baselist.ListAdapter -import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.databinding.FragmentVideoCommentListBinding import com.gh.gamecenter.entity.ForumVideoEntity @@ -105,7 +104,7 @@ class VideoCommentFragment : LazyListFragment() { flexCell.gravity = Gravity.CENTER flexCell.text = contentList[index] // flexCell.maxEms = 6 - flexCell.setTextColor(R.color.text_666666.toColor()) + flexCell.setTextColor(R.color.text_subtitle.toColor()) flexCell.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0) flexCell.background = DrawableView.getStrokeDrawable(R.color.text_dddddd, 0.5f) flexCell.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt index 45ad2b3981..6ca62bc0a3 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt @@ -210,7 +210,7 @@ class GameServersContentAdapter(context: Context, is FooterViewHolder -> { holder.run { - itemView.setBackgroundColor(R.color.text_F5F5F5.toColor()) + itemView.setBackgroundColor(R.color.background.toColor()) if (position == 0) { when { mPrevIsNetworkError -> { 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 1844dfea97..d7deb31e19 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -10,10 +10,7 @@ import android.widget.CheckedTextView import android.widget.LinearLayout import android.widget.PopupWindow import android.widget.TextView -import com.ethanhua.skeleton.Skeleton -import com.ethanhua.skeleton.ViewSkeletonScreen import com.gh.base.fragment.LazyFragment -import com.gh.common.constant.Constants import com.gh.common.util.EntranceUtils import com.gh.common.util.MtaHelper import com.gh.common.util.dip2px @@ -113,7 +110,7 @@ class GameServersPublishFragment : LazyFragment() { val complete = layout.findViewById(R.id.complete) val contentContainer = layout.findViewById(R.id.content_container) - reset.background = DrawableView.getStrokeDrawable(R.color.text_cccccc) + reset.background = DrawableView.getStrokeDrawable(R.color.text_body) complete.background = DrawableView.getOvalDrawable(R.color.theme) contentContainer.removeAllViews() @@ -130,7 +127,7 @@ class GameServersPublishFragment : LazyFragment() { 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_font)) + label.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) label.isSingleLine = true labelsContainer.addView(label) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { @@ -195,7 +192,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_333333.toColor()) + if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -243,7 +240,7 @@ class GameServersPublishFragment : LazyFragment() { // position = 0: all val hour = TextView(v.context) hour.textSize = 14F - hour.setTextColor(R.color.text_333333.toColor()) + hour.setTextColor(R.color.text_title.toColor()) hour.gravity = Gravity.CENTER_VERTICAL hour.setPadding(24F.dip2px(), 0, 0, 0) hourContainer.addView(hour, ViewGroup.LayoutParams.MATCH_PARENT, 43F.dip2px()) @@ -276,9 +273,9 @@ class GameServersPublishFragment : LazyFragment() { } } - 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)) + today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) + tomorrow.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) + after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) layout.setOnClickListener { popupWindow.dismiss() @@ -309,7 +306,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_333333.toColor()) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -320,8 +317,8 @@ class GameServersPublishFragment : LazyFragment() { mTags = null mBinding?.run { serverTime.text = "开服时间" - serverTime.setTextColor(R.color.text_333333.toColor()) - serverStatus.setTextColor(R.color.text_333333.toColor()) + serverTime.setTextColor(R.color.text_title.toColor()) + serverStatus.setTextColor(R.color.text_title.toColor()) } mContentFragment.filterData(mDay, mHour, mType, mTags) } 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 207d1e280d..ff69d0756b 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -335,7 +335,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mType == "全部") v.setTextColor(R.color.text_333333.toColor()) + if (mType == "全部") v.setTextColor(R.color.text_title.toColor()) } popupWindow.showAsDropDown(v) } @@ -356,7 +356,7 @@ class GameServersTestFragment : LazyFragment() { for ((index, tv) in tvList.withIndex()) { tv.text = dayList[index] - tv.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_333333, R.color.theme_font)) + tv.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font)) tv.isChecked = tv.text == v.text tv.setOnClickListener { callback.invoke(tv.text.toString()) @@ -375,7 +375,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_333333.toColor()) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor()) } popupWindow.showAsDropDown(v) } @@ -385,8 +385,8 @@ class GameServersTestFragment : LazyFragment() { // mBinding?.serverTime?.text = "开测时间" mBinding?.serverStatus?.text = "测试状态" mBinding?.filterView?.updateSelectedSubFilter(mViewModel!!.typeList.first()) - mBinding?.serverTime?.setTextColor(R.color.text_333333.toColor()) - mBinding?.serverStatus?.setTextColor(R.color.text_333333.toColor()) + mBinding?.serverTime?.setTextColor(R.color.text_title.toColor()) + mBinding?.serverStatus?.setTextColor(R.color.text_title.toColor()) mSubBinding?.run { reuseNoneData.visibility = View.GONE noConnectionContainer.root.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt index 77f26be09d..51c91add12 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -117,7 +117,7 @@ class SimulatorGameListAdapter(context: Context, val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator.apk?.packageName) val shouldShowUpdate = Version(simulator.apk?.version).isHigherThan(versionFromInstalledApp) text = if (shouldShowUpdate) "更新模拟器" else "卸载模拟器" - setTextColor(if (shouldShowUpdate) R.color.theme.toColor() else R.color.text_999999.toColor()) + setTextColor(if (shouldShowUpdate) R.color.theme.toColor() else R.color.text_subtitleDesc.toColor()) setOnClickListener { if (shouldShowUpdate) { SimulatorDownloadManager.getInstance().showDownloadDialog(context, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME) @@ -133,7 +133,7 @@ class SimulatorGameListAdapter(context: Context, PackageInstaller.uninstallForPackageName(mContext, simulator.apk?.packageName ?: "") }, uiModificationCallback = { binding -> - binding.contentTv.setTextColor(R.color.text_333333.toColor()) + binding.contentTv.setTextColor(R.color.text_title.toColor()) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt index f4009e453f..7178ed17b2 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt @@ -51,7 +51,7 @@ class SimulatorManagementAdapter(context: Context, val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator.apk?.packageName) shouldShowUpdate = Version(simulator.apk?.version).isHigherThan(versionFromInstalledApp) text = if (shouldShowUpdate) "更新" else "已安装" - setTextColor(if (shouldShowUpdate) R.color.theme.toColor() else R.color.text_999999.toColor()) + setTextColor(if (shouldShowUpdate) R.color.theme.toColor() else R.color.text_subtitleDesc.toColor()) } else { text = "安装" setTextColor(R.color.theme.toColor()) @@ -137,7 +137,7 @@ class SimulatorManagementAdapter(context: Context, "取消", confirmClickCallback = { unInstallSimulator() }, uiModificationCallback = { binding -> - binding.contentTv.setTextColor(R.color.text_333333.toColor()) + binding.contentTv.setTextColor(R.color.text_title.toColor()) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index 217d031257..b0e9038943 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -149,7 +149,7 @@ class SubjectTabFragment : BaseFragment() { override fun onTabUnselected(tab: TabLayout.Tab?) { tab?.customView?.setBackgroundResource(R.drawable.border_round_eee_14) - tab?.customView?.findViewById(R.id.tab_title)?.setTextColor(R.color.text_333333.toColor()) + tab?.customView?.findViewById(R.id.tab_title)?.setTextColor(R.color.text_title.toColor()) } override fun onTabSelected(tab: TabLayout.Tab?) { diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt index 9290088362..47e675666d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt @@ -23,7 +23,6 @@ import com.github.mikephil.charting.formatter.ValueFormatter import com.halo.assistant.HaloApp import java.util.* import kotlin.math.ceil -import kotlin.math.floor class VideoDataAdapter(context: Context) : ListAdapter(context) { @@ -111,12 +110,12 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { xAxis.labelCount = datasX.size //不显示网格线 xAxis.setDrawGridLines(false) - xAxis.textColor = ContextCompat.getColor(mContext, R.color.text_999999) + xAxis.textColor = ContextCompat.getColor(mContext, R.color.text_subtitleDesc) xAxis.textSize = 10f //设置此属性必须要设置[lineChart.extraBottomOffset]，否则底部会被裁剪 xAxis.yOffset = 14f xAxis.axisLineWidth = 2f - xAxis.axisLineColor = ContextCompat.getColor(mContext, R.color.text_f5f5f5) + xAxis.axisLineColor = ContextCompat.getColor(mContext, R.color.background) xAxis.valueFormatter = object : ValueFormatter() { override fun getFormattedValue(value: Float): String { val date = datasX[(value % datasX.size).toInt()] @@ -133,7 +132,7 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { yAxis.setDrawAxisLine(false)//不显示左侧Y轴 yAxis.setDrawGridLines(true) - yAxis.gridColor = ContextCompat.getColor(mContext, R.color.text_f5f5f5) + yAxis.gridColor = ContextCompat.getColor(mContext, R.color.background) yAxis.gridLineWidth = 1f //设置Y轴坐标之间的最小间隔 val maxValue = datasY.maxOrNull() ?: 0 @@ -146,7 +145,7 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { //https://stackoverflow.com/questions/48060395/mpandroidchart-line-graph-line-gets-cut-inbetween yAxis.axisMinimum = -0.01f yAxis.axisMaximum = if (transformNum == 0) 2f else transformNum * 2f - yAxis.textColor = ContextCompat.getColor(mContext, R.color.text_999999) + yAxis.textColor = ContextCompat.getColor(mContext, R.color.text_subtitleDesc) yAxis.textSize = 11f yAxis.xOffset = 8f yAxis.valueFormatter = object : ValueFormatter() { diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index d5b9b48adc..e900742cee 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -50,7 +50,7 @@ class VideoLabelFragment : NormalFragment() { val decoration = HorizontalDividerItemDecoration.Builder(requireContext()) .size(1f.dip2px()) .margin(20f.dip2px()) - .color(ContextCompat.getColor(requireContext(), R.color.text_f5f5f5)).build() + .color(ContextCompat.getColor(requireContext(), R.color.background)).build() addItemDecoration(decoration) adapter = mAdapter } 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 ac87823c4c..6dd30d717c 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 @@ -85,7 +85,7 @@ class UploadVideoActivity : ToolBarActivity() { if (game != null) { mViewModel.gameEntity = SimpleGameEntity(game.id, game.name ?: "") mBinding.gameName.text = game.name - mBinding.gameName.setTextColor(resources.getColor(R.color.text_333333)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) } } else if (requestCode == REQUEST_CODE_IMAGE_STORE && resultCode == Activity.RESULT_OK) { if (data != null) { @@ -216,7 +216,7 @@ class UploadVideoActivity : ToolBarActivity() { if (mViewModel.gameEntity != null) { mBinding.gameName.text = mViewModel.gameEntity?.name ?: "" - mBinding.gameName.setTextColor(resources.getColor(R.color.text_333333)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) } } @@ -343,7 +343,7 @@ class UploadVideoActivity : ToolBarActivity() { val videoPatch = mViewModel.videoPatch if (videoPatch != null) { mBinding.gameName.text = videoPatch.gameName - mBinding.gameName.setTextColor(resources.getColor(R.color.text_999999)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_subtitleDesc)) mBinding.gameTitle.setText(videoPatch.title) mBinding.gameTitle.setSelection(mBinding.gameTitle.text.toString().length) mBinding.gameName.isEnabled = false @@ -378,7 +378,7 @@ class UploadVideoActivity : ToolBarActivity() { if (videoDraft.gameId.isNotEmpty()) { mViewModel.gameEntity = SimpleGameEntity(videoDraft.gameId, videoDraft.gameName) mBinding.gameName.text = videoDraft.gameName - mBinding.gameName.setTextColor(resources.getColor(R.color.text_333333)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) } if (videoDraft.tagActivityId.isNotEmpty() && videoDraft.tagActivityName.isNotEmpty()) { mActivityLabelEntity = ActivityLabelEntity(videoDraft.tagActivityId, videoDraft.tagActivityName) @@ -632,7 +632,7 @@ class UploadVideoActivity : ToolBarActivity() { flexCell.gravity = Gravity.CENTER flexCell.text = videoTagEntity.name flexCell.tag = videoTagEntity.id - flexCell.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_666666, R.color.white)) + flexCell.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_subtitle, R.color.white)) flexCell.background = DrawableView.getOvalSelectorStyle(R.color.text_f2f2f2, R.color.theme) flexCell.setPadding(12F.dip2px(), 0, 12F.dip2px(), 0) flexCell.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt index f95bb1da7a..7324678126 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt @@ -70,7 +70,7 @@ class VideoVerifyAdapter(context: Context, } } else if (entity.status == "pass") { val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA) - holder.binding.videoStatus.setTextColor(R.color.text_999999.toColor()) + holder.binding.videoStatus.setTextColor(R.color.text_subtitleDesc.toColor()) holder.binding.videoStatus.text = dateFormat.format(entity.time.upload * 1000) } else { VideoVerifyItemViewHolder.setVideoStatus(holder.binding.videoStatus, entity.status) @@ -159,7 +159,7 @@ class VideoVerifyAdapter(context: Context, hitText.text = text if (entity.status == "pending" && text == "删除") { hitText.setBackgroundColor(R.color.background.toColor()) - hitText.setTextColor(R.color.text_cccccc.toColor()) + hitText.setTextColor(R.color.text_body.toColor()) } item.setOnClickListener { diff --git a/app/src/main/res/color/comment_send_btn_dark_selector.xml b/app/src/main/res/color/comment_send_btn_dark_selector.xml index 7e6f57070a..72874fdd8b 100644 --- a/app/src/main/res/color/comment_send_btn_dark_selector.xml +++ b/app/src/main/res/color/comment_send_btn_dark_selector.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/comment_send_btn_selector.xml b/app/src/main/res/color/comment_send_btn_selector.xml index cff61bc67d..3c1b41c417 100644 --- a/app/src/main/res/color/comment_send_btn_selector.xml +++ b/app/src/main/res/color/comment_send_btn_selector.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file 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 5f8e8dac85..f752032301 100644 --- a/app/src/main/res/color/community_text_tabbar_style.xml +++ b/app/src/main/res/color/community_text_tabbar_style.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/forum_category_selector.xml b/app/src/main/res/color/forum_category_selector.xml index fafdf93fce..d41ac7a6e3 100644 --- a/app/src/main/res/color/forum_category_selector.xml +++ b/app/src/main/res/color/forum_category_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/game_upload_rg_button_selector.xml b/app/src/main/res/color/game_upload_rg_button_selector.xml index f81f4956e8..58d37622ec 100644 --- a/app/src/main/res/color/game_upload_rg_button_selector.xml +++ b/app/src/main/res/color/game_upload_rg_button_selector.xml @@ -1,5 +1,5 @@ - + \ 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 5f8e8dac85..f752032301 100644 --- a/app/src/main/res/color/home_tabbar_style.xml +++ b/app/src/main/res/color/home_tabbar_style.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/libao_rg_button_selector.xml b/app/src/main/res/color/libao_rg_button_selector.xml index 1f4c108645..e005e5da16 100644 --- a/app/src/main/res/color/libao_rg_button_selector.xml +++ b/app/src/main/res/color/libao_rg_button_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/qa_feedback_rg_button_selector.xml b/app/src/main/res/color/qa_feedback_rg_button_selector.xml index fafdf93fce..d41ac7a6e3 100644 --- a/app/src/main/res/color/qa_feedback_rg_button_selector.xml +++ b/app/src/main/res/color/qa_feedback_rg_button_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/subject_tiled_tab_color_selector.xml b/app/src/main/res/color/subject_tiled_tab_color_selector.xml index 64c555feff..5b1565c99a 100644 --- a/app/src/main/res/color/subject_tiled_tab_color_selector.xml +++ b/app/src/main/res/color/subject_tiled_tab_color_selector.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/text_tabbar_gh_house_style.xml b/app/src/main/res/color/text_tabbar_gh_house_style.xml index e85d3084ad..e3d17130a1 100644 --- a/app/src/main/res/color/text_tabbar_gh_house_style.xml +++ b/app/src/main/res/color/text_tabbar_gh_house_style.xml @@ -5,6 +5,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 81b3cf11f5..e8988644c8 100644 --- a/app/src/main/res/color/text_tabbar_style.xml +++ b/app/src/main/res/color/text_tabbar_style.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/text_tabbar_video_style.xml b/app/src/main/res/color/text_tabbar_video_style.xml index e85d3084ad..e3d17130a1 100644 --- a/app/src/main/res/color/text_tabbar_video_style.xml +++ b/app/src/main/res/color/text_tabbar_video_style.xml @@ -5,6 +5,6 @@ - + \ 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 09bc4e674b..204be65112 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/video_upload_post_style.xml b/app/src/main/res/color/video_upload_post_style.xml index 70783cc57c..a303d8c886 100644 --- a/app/src/main/res/color/video_upload_post_style.xml +++ b/app/src/main/res/color/video_upload_post_style.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/video_upload_source_check.xml b/app/src/main/res/color/video_upload_source_check.xml index 2c53fa892a..8bd80d553a 100644 --- a/app/src/main/res/color/video_upload_source_check.xml +++ b/app/src/main/res/color/video_upload_source_check.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/actionbar_search_bg.xml b/app/src/main/res/drawable/actionbar_search_bg.xml index 950d0a4acb..c706311824 100644 --- a/app/src/main/res/drawable/actionbar_search_bg.xml +++ b/app/src/main/res/drawable/actionbar_search_bg.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/app_updating_progress_style.xml b/app/src/main/res/drawable/app_updating_progress_style.xml index 9ff2c78870..1ff5dc8ca9 100644 --- a/app/src/main/res/drawable/app_updating_progress_style.xml +++ b/app/src/main/res/drawable/app_updating_progress_style.xml @@ -6,8 +6,8 @@ + android:endColor="@color/divider" + android:startColor="@color/divider" /> @@ -17,8 +17,8 @@ + android:endColor="@color/divider" + android:startColor="@color/divider" /> diff --git a/app/src/main/res/drawable/bg_circle_permission_detail.xml b/app/src/main/res/drawable/bg_circle_permission_detail.xml index 283a432384..dc7fa7325b 100644 --- a/app/src/main/res/drawable/bg_circle_permission_detail.xml +++ b/app/src/main/res/drawable/bg_circle_permission_detail.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/bg_game_big_event.xml b/app/src/main/res/drawable/bg_game_big_event.xml index 85218f4f44..63f19918c5 100644 --- a/app/src/main/res/drawable/bg_game_big_event.xml +++ b/app/src/main/res/drawable/bg_game_big_event.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_1.xml b/app/src/main/res/drawable/bg_shape_f5_radius_1.xml index 4c8dfd9e79..c4023b3699 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_1.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_1.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_2.xml b/app/src/main/res/drawable/bg_shape_f5_radius_2.xml index 2aa26231b8..b4295e2cf0 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_2.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_2.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_3.xml b/app/src/main/res/drawable/bg_shape_f5_radius_3.xml index c50dabef23..138cee4c8f 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_3.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_3.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_4.xml b/app/src/main/res/drawable/bg_shape_f5_radius_4.xml index ef69f33103..3105dba6e3 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_4.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_5.xml b/app/src/main/res/drawable/bg_shape_f5_radius_5.xml index d7d69eef8e..14284dd0e3 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_5.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_5.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_6.xml b/app/src/main/res/drawable/bg_shape_f5_radius_6.xml index 71a09a8af3..6e7fc9d0bd 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_6.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_6.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_8.xml b/app/src/main/res/drawable/bg_shape_f5_radius_8.xml index 45a43636b5..ec5aba2e3b 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_8.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_999.xml b/app/src/main/res/drawable/bg_shape_f5_radius_999.xml index 8ad7424ace..2db9cc7b96 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_999.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_999.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_share_dialog.xml b/app/src/main/res/drawable/bg_share_dialog.xml index 566daeb45d..b6ca309d19 100644 --- a/app/src/main/res/drawable/bg_share_dialog.xml +++ b/app/src/main/res/drawable/bg_share_dialog.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/bg_sub_catalog_item.xml b/app/src/main/res/drawable/bg_sub_catalog_item.xml index 6710f5e133..7aaab051c0 100644 --- a/app/src/main/res/drawable/bg_sub_catalog_item.xml +++ b/app/src/main/res/drawable/bg_sub_catalog_item.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/border_round_ccc.xml b/app/src/main/res/drawable/border_round_ccc.xml index 806d4c7615..a241bda899 100644 --- a/app/src/main/res/drawable/border_round_ccc.xml +++ b/app/src/main/res/drawable/border_round_ccc.xml @@ -4,7 +4,7 @@ + android:color = "@color/text_body" /> diff --git a/app/src/main/res/drawable/border_round_ccc_999.xml b/app/src/main/res/drawable/border_round_ccc_999.xml index 4eca779200..f10c281ff3 100644 --- a/app/src/main/res/drawable/border_round_ccc_999.xml +++ b/app/src/main/res/drawable/border_round_ccc_999.xml @@ -4,7 +4,7 @@ + android:color = "@color/text_body" /> diff --git a/app/src/main/res/drawable/border_round_eee_14.xml b/app/src/main/res/drawable/border_round_eee_14.xml index 5ddd62832e..e577101aa4 100644 --- a/app/src/main/res/drawable/border_round_eee_14.xml +++ b/app/src/main/res/drawable/border_round_eee_14.xml @@ -4,7 +4,7 @@ + android:color="@color/divider" /> diff --git a/app/src/main/res/drawable/border_round_eee_999.xml b/app/src/main/res/drawable/border_round_eee_999.xml index b717a14067..8f7acd0e8b 100644 --- a/app/src/main/res/drawable/border_round_eee_999.xml +++ b/app/src/main/res/drawable/border_round_eee_999.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml b/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml index 2e24f2006c..72f260b37f 100644 --- a/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml +++ b/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml @@ -5,7 +5,7 @@ + android:color="@color/divider"/> diff --git a/app/src/main/res/drawable/border_round_stroke_eee_4.xml b/app/src/main/res/drawable/border_round_stroke_eee_4.xml index 114ae1a378..89417aa899 100644 --- a/app/src/main/res/drawable/border_round_stroke_eee_4.xml +++ b/app/src/main/res/drawable/border_round_stroke_eee_4.xml @@ -5,7 +5,7 @@ + android:color="@color/divider"/> diff --git a/app/src/main/res/drawable/border_round_stroke_eee_999.xml b/app/src/main/res/drawable/border_round_stroke_eee_999.xml index 8adf04d80f..c76f0e9bd9 100644 --- a/app/src/main/res/drawable/border_round_stroke_eee_999.xml +++ b/app/src/main/res/drawable/border_round_stroke_eee_999.xml @@ -5,7 +5,7 @@ + android:color="@color/divider"/> diff --git a/app/src/main/res/drawable/button_round_f5f5f5.xml b/app/src/main/res/drawable/button_round_f5f5f5.xml index a735252d01..b72a1f18d9 100644 --- a/app/src/main/res/drawable/button_round_f5f5f5.xml +++ b/app/src/main/res/drawable/button_round_f5f5f5.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/comment_send_button_unavailable.xml b/app/src/main/res/drawable/comment_send_button_unavailable.xml index 5a0e244a38..f74c59736f 100644 --- a/app/src/main/res/drawable/comment_send_button_unavailable.xml +++ b/app/src/main/res/drawable/comment_send_button_unavailable.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/divider_item_line.xml b/app/src/main/res/drawable/divider_item_line.xml index 321d4fc36a..50d9e9e25b 100644 --- a/app/src/main/res/drawable/divider_item_line.xml +++ b/app/src/main/res/drawable/divider_item_line.xml @@ -11,7 +11,7 @@ android:left="20dp" android:right="20dp"> - + diff --git a/app/src/main/res/drawable/divider_item_line_space_16.xml b/app/src/main/res/drawable/divider_item_line_space_16.xml index 3343904cb8..ca854ea6a0 100644 --- a/app/src/main/res/drawable/divider_item_line_space_16.xml +++ b/app/src/main/res/drawable/divider_item_line_space_16.xml @@ -11,7 +11,7 @@ android:left="16dp" android:right="16dp"> - + diff --git a/app/src/main/res/drawable/et_line_login.xml b/app/src/main/res/drawable/et_line_login.xml index 67efac1b01..c96d1b20b3 100644 --- a/app/src/main/res/drawable/et_line_login.xml +++ b/app/src/main/res/drawable/et_line_login.xml @@ -2,7 +2,7 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_detail_info_dividing_line.xml b/app/src/main/res/drawable/game_detail_info_dividing_line.xml index eb7804ef77..fcb537f2fb 100644 --- a/app/src/main/res/drawable/game_detail_info_dividing_line.xml +++ b/app/src/main/res/drawable/game_detail_info_dividing_line.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml b/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml index 6e91d500ac..b72a1f18d9 100644 --- a/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml +++ b/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/message_unread_hint.xml b/app/src/main/res/drawable/message_unread_hint.xml index f0e81953ba..e85952fd0f 100644 --- a/app/src/main/res/drawable/message_unread_hint.xml +++ b/app/src/main/res/drawable/message_unread_hint.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/oval_f5_bg.xml b/app/src/main/res/drawable/oval_f5_bg.xml index 86d54711bd..d1b8599ebe 100644 --- a/app/src/main/res/drawable/oval_f5_bg.xml +++ b/app/src/main/res/drawable/oval_f5_bg.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_message_hint_bg.xml b/app/src/main/res/drawable/oval_message_hint_bg.xml index 7b63db1a8a..e987c9e0f8 100644 --- a/app/src/main/res/drawable/oval_message_hint_bg.xml +++ b/app/src/main/res/drawable/oval_message_hint_bg.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/popup_divider_line.xml b/app/src/main/res/drawable/popup_divider_line.xml index 7a935e907c..7f1e007ea5 100644 --- a/app/src/main/res/drawable/popup_divider_line.xml +++ b/app/src/main/res/drawable/popup_divider_line.xml @@ -10,7 +10,7 @@ android:left="14dp" android:right="14dp"> - + diff --git a/app/src/main/res/drawable/qa_feedback_rg_button_normal.xml b/app/src/main/res/drawable/qa_feedback_rg_button_normal.xml index 17a6db4606..62ab346576 100644 --- a/app/src/main/res/drawable/qa_feedback_rg_button_normal.xml +++ b/app/src/main/res/drawable/qa_feedback_rg_button_normal.xml @@ -6,7 +6,7 @@ + android:color="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/scrollbar_vertical.xml b/app/src/main/res/drawable/scrollbar_vertical.xml index 7beb24a0fb..369d0c0ce8 100644 --- a/app/src/main/res/drawable/scrollbar_vertical.xml +++ b/app/src/main/res/drawable/scrollbar_vertical.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/res/drawable/video_upload_post_unavailable.xml b/app/src/main/res/drawable/video_upload_post_unavailable.xml index 5a0e244a38..f74c59736f 100644 --- a/app/src/main/res/drawable/video_upload_post_unavailable.xml +++ b/app/src/main/res/drawable/video_upload_post_unavailable.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/activity_community_article_edit.xml b/app/src/main/res/layout/activity_community_article_edit.xml index 0c64d19e69..7248fc8275 100644 --- a/app/src/main/res/layout/activity_community_article_edit.xml +++ b/app/src/main/res/layout/activity_community_article_edit.xml @@ -37,7 +37,7 @@ android:includeFontPadding="false" android:padding="10dp" android:text="取消" - android:textColor="@color/text_666666" /> + android:textColor="@color/text_subtitle" /> @@ -69,7 +69,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="参与活动" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -94,7 +94,7 @@ android:layout_height="@dimen/cutting_line" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -116,7 +116,7 @@ android:layout_height="@dimen/cutting_line" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:textColor="@color/text_body" /> + android:background="@color/divider" /> + android:background="@color/divider" /> + android:textColor="@color/text_title" /> + android:background="@color/divider" /> + android:background="@color/divider" /> + android:background="@color/divider" /> \ No newline at end of file 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 f1d5c629aa..bf87cf5aab 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -41,7 +41,7 @@ android:paddingTop="16dp" android:paddingRight="20dp" android:paddingBottom="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textIsSelectable="true" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_kaifu_patch.xml b/app/src/main/res/layout/activity_kaifu_patch.xml index fee1c60fdf..0f9209eb51 100644 --- a/app/src/main/res/layout/activity_kaifu_patch.xml +++ b/app/src/main/res/layout/activity_kaifu_patch.xml @@ -148,7 +148,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:background="@color/red" + android:background="@color/theme_red" android:orientation="horizontal" android:paddingLeft="1dp" android:paddingTop="1dp" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e2d2da904a..b0f463d5d3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -36,7 +36,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="10dp" android:text="战歌竞技场已首发上限！\n腾讯自走棋2.0大作，极速对决体验" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index b8025501ac..6d395231c4 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -66,7 +66,7 @@ android:layout_toRightOf="@+id/comment_icon" android:paddingBottom="1dp" android:text="@string/news_detail_send_comment" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_poster_edit.xml b/app/src/main/res/layout/activity_poster_edit.xml index 6dbe81c9f9..0aad6d26a7 100644 --- a/app/src/main/res/layout/activity_poster_edit.xml +++ b/app/src/main/res/layout/activity_poster_edit.xml @@ -98,7 +98,7 @@ diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index 8d82bad48e..637fdb2759 100644 --- a/app/src/main/res/layout/activity_questions_edit.xml +++ b/app/src/main/res/layout/activity_questions_edit.xml @@ -46,7 +46,7 @@ android:includeFontPadding="false" android:padding="10dp" android:text="取消" - android:textColor="@color/text_666666" /> + android:textColor="@color/text_subtitle" /> @@ -90,7 +90,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="参与活动" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> + android:background="@color/divider" /> @@ -137,7 +137,7 @@ + android:background="@color/divider" /> @@ -158,7 +158,7 @@ android:paddingLeft="16dp" android:paddingTop="15dp" android:text="请详细描述你的问题" - android:textColor="@color/text_cccccc" /> + android:textColor="@color/text_body" /> diff --git a/app/src/main/res/layout/activity_servers_calendar.xml b/app/src/main/res/layout/activity_servers_calendar.xml index 06f2755b58..09636f3b08 100644 --- a/app/src/main/res/layout/activity_servers_calendar.xml +++ b/app/src/main/res/layout/activity_servers_calendar.xml @@ -31,7 +31,7 @@ android:paddingRight="20dp" android:paddingBottom="12dp" android:text="开服信息仅供参考，具体请以游戏内开服为准" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -52,7 +52,7 @@ android:gravity="center" android:paddingLeft="24dp" android:paddingRight="24dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/hint" @@ -64,7 +64,7 @@ android:layout_height="32dp" android:layout_marginLeft="24dp" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toRightOf="@id/year" @@ -91,7 +91,7 @@ android:layout_height="32dp" android:layout_marginLeft="16dp" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toRightOf="@id/cur_month" @@ -139,7 +139,7 @@ android:lineSpacingExtra="4dp" android:paddingLeft="24dp" android:paddingRight="24dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index 1fe0ea1451..e244201b0f 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -252,7 +252,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="闪退类型" /> @@ -267,7 +267,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="APP闪退" /> @@ -282,7 +282,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="游戏闪退" /> @@ -413,7 +413,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="版权方身份*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -474,7 +474,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="版权方证件*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -490,8 +490,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -513,7 +513,7 @@ android:paddingRight="20dp" android:paddingBottom="14dp" android:text="证件正反面照片*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -544,7 +544,7 @@ android:paddingRight="16dp" android:text="侵权的应用*" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -560,8 +560,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -581,7 +581,7 @@ android:paddingTop="16dp" android:paddingBottom="14dp" android:text="侵权应用截图*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -589,7 +589,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="（请提供光环内下载界面截图）" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/infringementAppScreenshotTv" app:layout_constraintStart_toEndOf="@+id/infringementAppScreenshotTv" @@ -617,7 +617,7 @@ android:paddingRight="20dp" android:paddingBottom="10dp" android:text="说明*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -668,8 +668,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -684,7 +684,7 @@ android:layout_marginRight="20dp" android:layout_marginTop="20dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:text="您还可以通过邮件 feedback@ghzhushou.com 反馈"/> + android:textColor="@color/text_subtitle" /> diff --git a/app/src/main/res/layout/activity_video_tablayout_viewpager.xml b/app/src/main/res/layout/activity_video_tablayout_viewpager.xml index f6ea34957c..95150fc040 100644 --- a/app/src/main/res/layout/activity_video_tablayout_viewpager.xml +++ b/app/src/main/res/layout/activity_video_tablayout_viewpager.xml @@ -47,7 +47,7 @@ android:layout_centerInParent="true" android:layout_marginLeft="50dp" android:layout_marginRight="50dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -135,7 +135,7 @@ android:layout_height="0dp" android:gravity="center_vertical" android:text="请选择游戏～" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/game_name_hint" app:layout_constraintLeft_toRightOf="@id/game_name_hint" @@ -161,7 +161,7 @@ android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="14dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@id/game_title" tools:text="标题*" /> @@ -178,8 +178,8 @@ android:paddingTop="16dp" android:paddingRight="20dp" android:paddingBottom="24dp" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/game_title_hint" app:layout_constraintRight_toRightOf="parent" @@ -192,7 +192,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="14dp" android:text="0/100" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="12dp" app:layout_constraintBottom_toBottomOf="@id/game_title" app:layout_constraintRight_toRightOf="@id/game_title" /> @@ -215,7 +215,7 @@ android:gravity="center" android:paddingLeft="20dp" android:paddingRight="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/game_title_line" tools:text="分类*" /> @@ -257,7 +257,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="标签" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/game_category_hint" app:layout_constraintTop_toBottomOf="@id/game_category_line" /> @@ -361,7 +361,7 @@ android:gravity="center" android:paddingLeft="20dp" android:paddingRight="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/game_tag_line" tools:text="视频来源*" /> @@ -436,7 +436,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="添加水印" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -465,7 +465,7 @@ android:hint="请注明视频来源（例如转载自http://www.xx.com//vvv），标注清晰度将提高审核通过的概率哦" android:lineSpacingExtra="8dp" android:textColor="@color/video_upload_source_check" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -511,7 +511,7 @@ android:layout_marginLeft="4dp" android:layout_marginBottom="2dp" android:text="@string/upload_protocol" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="@id/upload_confirm" app:layout_constraintLeft_toRightOf="@id/upload_confirm" @@ -530,7 +530,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="@string/video_upload_exposure_hint" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml index cc1207e685..5646032e06 100644 --- a/app/src/main/res/layout/amway_comment_item.xml +++ b/app/src/main/res/layout/amway_comment_item.xml @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/starIv" app:layout_constraintLeft_toRightOf="@id/ratingTv" diff --git a/app/src/main/res/layout/amway_search_item.xml b/app/src/main/res/layout/amway_search_item.xml index e9bf66c500..1729177ac4 100644 --- a/app/src/main/res/layout/amway_search_item.xml +++ b/app/src/main/res/layout/amway_search_item.xml @@ -34,7 +34,7 @@ android:layout_marginLeft="12dp" android:layout_toRightOf="@id/iconIv" android:text="@{game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="元气骑士" /> diff --git a/app/src/main/res/layout/answer_draft_item.xml b/app/src/main/res/layout/answer_draft_item.xml index d89fb66b6f..5de2986cb9 100644 --- a/app/src/main/res/layout/answer_draft_item.xml +++ b/app/src/main/res/layout/answer_draft_item.xml @@ -46,7 +46,7 @@ android:lineSpacingExtra="4dp" android:maxLines="3" android:text="@{data.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -78,7 +78,7 @@ android:paddingRight="10dp" android:paddingBottom="6dp" android:text="@{data.communityName}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/answer_draft_item_img" @@ -96,7 +96,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/answer_draft_item_img" /> diff --git a/app/src/main/res/layout/app_update_hint_dialog.xml b/app/src/main/res/layout/app_update_hint_dialog.xml index d5d7324d33..f953086dfb 100644 --- a/app/src/main/res/layout/app_update_hint_dialog.xml +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -70,7 +70,7 @@ android:gravity="left" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="@id/head_background" @@ -103,7 +103,7 @@ android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="@id/head_background" app:layout_constraintRight_toRightOf="@id/head_background" @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="已在WiFi环境下完成下载" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="@id/desc" @@ -152,7 +152,7 @@ android:layout_marginBottom="13dp" android:padding="6dp" android:text="暂不更新" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" diff --git a/app/src/main/res/layout/app_updating_dialog.xml b/app/src/main/res/layout/app_updating_dialog.xml index 009e26eb21..c658c86d3e 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_marginTop="32dp" android:layout_marginBottom="10dp" android:text="@string/dialog_updating" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -78,7 +78,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="32dp" android:layout_weight="2" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/progress" @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintRight_toRightOf="@id/progress" app:layout_constraintTop_toBottomOf="@id/progress" diff --git a/app/src/main/res/layout/ask_answer_item.xml b/app/src/main/res/layout/ask_answer_item.xml index 6c1b9830a2..52c5bbaed1 100644 --- a/app/src/main/res/layout/ask_answer_item.xml +++ b/app/src/main/res/layout/ask_answer_item.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" android:visibility="gone" @@ -68,7 +68,7 @@ android:ellipsize="end" android:maxLength="12" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/ask_answer_item_usericon_container" @@ -98,7 +98,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="visible" app:layout_constrainedWidth="true" @@ -118,7 +118,7 @@ android:ellipsize="end" android:maxLines="2" android:minLines="2" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/ask_answer_item_img" app:layout_constraintStart_toStartOf="parent" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/ask_answer_item_content" /> @@ -178,7 +178,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintLeft_toRightOf="@id/ask_answer_item_votecount" app:layout_constraintTop_toBottomOf="@id/ask_answer_item_content" /> @@ -191,7 +191,7 @@ android:gravity="right" android:maxEms="15" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -205,7 +205,7 @@ android:layout_marginLeft="10dp" android:singleLine="true" android:layout_marginTop="10dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/ask_recommends_subject.xml b/app/src/main/res/layout/ask_recommends_subject.xml index 905b37214c..bbe5f7032a 100644 --- a/app/src/main/res/layout/ask_recommends_subject.xml +++ b/app/src/main/res/layout/ask_recommends_subject.xml @@ -46,7 +46,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/community_recommend_sort_choiceness" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/ask_search_item.xml b/app/src/main/res/layout/ask_search_item.xml index b9fc076542..f2e9ab34c9 100644 --- a/app/src/main/res/layout/ask_search_item.xml +++ b/app/src/main/res/layout/ask_search_item.xml @@ -19,7 +19,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="5dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -44,7 +44,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/ask_search_item_image_container" diff --git a/app/src/main/res/layout/ask_search_question_item.xml b/app/src/main/res/layout/ask_search_question_item.xml index 06294de094..1c8df9297f 100644 --- a/app/src/main/res/layout/ask_search_question_item.xml +++ b/app/src/main/res/layout/ask_search_question_item.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/questions_title" /> diff --git a/app/src/main/res/layout/avatar_background_item.xml b/app/src/main/res/layout/avatar_background_item.xml index 633af49120..431e762c58 100644 --- a/app/src/main/res/layout/avatar_background_item.xml +++ b/app/src/main/res/layout/avatar_background_item.xml @@ -38,7 +38,7 @@ android:gravity="center" android:maxLines="1" android:text="边框名称" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" diff --git a/app/src/main/res/layout/avatar_item.xml b/app/src/main/res/layout/avatar_item.xml index c07bfa4b2e..f78421def4 100644 --- a/app/src/main/res/layout/avatar_item.xml +++ b/app/src/main/res/layout/avatar_item.xml @@ -32,7 +32,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" @@ -46,7 +46,7 @@ android:layout_marginTop="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" diff --git a/app/src/main/res/layout/catalog_header_item.xml b/app/src/main/res/layout/catalog_header_item.xml index d55cba8b49..3ffd7b7146 100644 --- a/app/src/main/res/layout/catalog_header_item.xml +++ b/app/src/main/res/layout/catalog_header_item.xml @@ -34,7 +34,7 @@ android:gravity="center_vertical" android:includeFontPadding="false" android:text="@{link.text}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="人气手游风向标" /> diff --git a/app/src/main/res/layout/catalog_item.xml b/app/src/main/res/layout/catalog_item.xml index 3940cfc7d0..11bad46e5b 100644 --- a/app/src/main/res/layout/catalog_item.xml +++ b/app/src/main/res/layout/catalog_item.xml @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@{entity.name}" tools:text="精选" /> diff --git a/app/src/main/res/layout/catalog_subject_game_item.xml b/app/src/main/res/layout/catalog_subject_game_item.xml index 22cafee017..241a634979 100644 --- a/app/src/main/res/layout/catalog_subject_game_item.xml +++ b/app/src/main/res/layout/catalog_subject_game_item.xml @@ -35,7 +35,7 @@ android:gravity="center" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@{game.name}" tools:text="超杀默示录" /> diff --git a/app/src/main/res/layout/category_directory_item.xml b/app/src/main/res/layout/category_directory_item.xml index 2f9e867967..d60347763c 100644 --- a/app/src/main/res/layout/category_directory_item.xml +++ b/app/src/main/res/layout/category_directory_item.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="14sp" tools:text="玩法" /> diff --git a/app/src/main/res/layout/category_game_item.xml b/app/src/main/res/layout/category_game_item.xml index 58a574e66d..1ffe21a05e 100644 --- a/app/src/main/res/layout/category_game_item.xml +++ b/app/src/main/res/layout/category_game_item.xml @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" @@ -172,7 +172,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{game.decoratedDes}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" tools:text="巫妖王再怒霜之哀殤又飢渴" app:layout_constraintTop_toTopOf="parent" @@ -188,7 +188,7 @@ android:ellipsize="end" android:singleLine="true" android:text="@string/game_downloading_formattable" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="9sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/game_progressbar" diff --git a/app/src/main/res/layout/category_v2_item.xml b/app/src/main/res/layout/category_v2_item.xml index aa98e15330..76c256dda7 100644 --- a/app/src/main/res/layout/category_v2_item.xml +++ b/app/src/main/res/layout/category_v2_item.xml @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@{entity.name}" tools:text="精选" /> diff --git a/app/src/main/res/layout/collection_comunity_article_item.xml b/app/src/main/res/layout/collection_comunity_article_item.xml index ad5130abb9..27272238cf 100644 --- a/app/src/main/res/layout/collection_comunity_article_item.xml +++ b/app/src/main/res/layout/collection_comunity_article_item.xml @@ -28,7 +28,7 @@ android:ellipsize="end" android:maxLines="2" android:text="@{data.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintTop_toTopOf="parent" /> @@ -81,7 +81,7 @@ android:maxLength="12" android:maxLines="1" android:text="@{data.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" @@ -113,7 +113,7 @@ android:gravity="center" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -134,7 +134,7 @@ android:minLines="2" android:layout_marginRight="12dp" android:text="@{data.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/image" @@ -170,7 +170,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{data.count.comment + `评论 · `+data.count.vote + `点赞 · `+NewsUtils.getFormattedTime(data.time.create)}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> @@ -184,7 +184,7 @@ android:maxEms="15" android:maxLines="1" android:text="@{data.community.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index eb7f83445e..8e4d0acd16 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -110,7 +110,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -189,7 +189,7 @@ android:layout_toLeftOf="@id/command_container" android:includeFontPadding="false" android:lineSpacingExtra="3dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="星際爭霸與星際爭霸2的職業選電競戰隊的經理美少女团体星際老男孩成員之一，還在杭州經營水產生意。" /> @@ -204,7 +204,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="一个小时前" /> @@ -216,7 +216,7 @@ android:layout_marginLeft="8dp" android:layout_centerVertical="true" android:layout_toRightOf="@id/comment_time" - android:background="@color/text_cccccc" /> + android:background="@color/text_body" /> @@ -282,7 +282,7 @@ android:layout_below="@+id/comment_quote_author_tv" android:layout_marginTop="2dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> diff --git a/app/src/main/res/layout/comment_more_option_item.xml b/app/src/main/res/layout/comment_more_option_item.xml index a925e8efed..5dc8a34df3 100644 --- a/app/src/main/res/layout/comment_more_option_item.xml +++ b/app/src/main/res/layout/comment_more_option_item.xml @@ -10,5 +10,5 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:text="修改" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/commodity_item.xml b/app/src/main/res/layout/commodity_item.xml index 48db33802d..71996cb3cf 100644 --- a/app/src/main/res/layout/commodity_item.xml +++ b/app/src/main/res/layout/commodity_item.xml @@ -50,7 +50,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:lineSpacingExtra="6dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="13sp" android:text="@{entity.name}" @@ -92,7 +92,7 @@ app:layout_constraintLeft_toRightOf="@+id/energySuffix" app:layout_constraintTop_toTopOf="@+id/energySuffix" app:layout_constraintBottom_toBottomOf="@+id/energySuffix" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="12sp" android:text="@{entity.originEnergy + `光能`}" tools:text="500光能" /> @@ -107,7 +107,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/energy" app:layout_constraintBottom_toBottomOf="parent" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:text="@{`已兑` + entity.totalExchangeNum + `件`}" tools:text="已兑240件" /> @@ -121,7 +121,7 @@ android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="剩7天" /> diff --git a/app/src/main/res/layout/common_collection_image_text_item.xml b/app/src/main/res/layout/common_collection_image_text_item.xml index 0d0c783a4d..020c06e378 100644 --- a/app/src/main/res/layout/common_collection_image_text_item.xml +++ b/app/src/main/res/layout/common_collection_image_text_item.xml @@ -56,7 +56,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{entity.addedContent1}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/common_collection_image" @@ -72,7 +72,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{entity.addedContent2}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/common_collection_image" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/common_collection_item.xml b/app/src/main/res/layout/common_collection_item.xml index 5592a8b989..9168bd2509 100644 --- a/app/src/main/res/layout/common_collection_item.xml +++ b/app/src/main/res/layout/common_collection_item.xml @@ -117,7 +117,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{entity.addedContent1}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:visibility="gone" /> @@ -130,7 +130,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{entity.addedContent2}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/community_answer_item.xml b/app/src/main/res/layout/community_answer_item.xml index e663f3fa62..71974654f5 100644 --- a/app/src/main/res/layout/community_answer_item.xml +++ b/app/src/main/res/layout/community_answer_item.xml @@ -51,7 +51,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{entity.questions.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintTop_toBottomOf="@+id/top_line" app:layout_constraintLeft_toLeftOf="parent" @@ -92,7 +92,7 @@ android:maxLength="12" android:maxLines="1" android:text="@{entity.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/timeContainer" @@ -126,7 +126,7 @@ android:gravity="center" android:maxLines="1" android:text="@{entity.user.badge.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -183,7 +183,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="@{(entity.me.isFollower ? ` · ` : ``) + NewsUtils.getFormattedTime(entity.time) + ((entity.status.equals(`pending`) || entity.status.equals(`fail`)) ? ` · ` : ``)}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text=" · 1分钟前 · " tools:visibility="visible" /> @@ -194,10 +194,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{entity.status.equals(`pending`) ? @string/content_pending_status : @string/fail_status}" - android:textColor="@{entity.status.equals(`pending`) ? @color/text_06CEA8 : @color/text_FF4147}" + android:textColor="@{entity.status.equals(`pending`) ? @color/theme_green : @color/theme_red}" android:textSize="11sp" tools:text="内容审核中" - tools:textColor="@color/text_06CEA8" /> + tools:textColor="@color/theme_green" /> @@ -213,7 +213,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{(entity.type.contains(`video`))? entity.articleTitle : entity.questions.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintTop_toBottomOf="@id/user_icon" tools:text="本名李嘉恆，加拿大籍華人，出生於廣東省廣州，2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。" /> @@ -229,7 +229,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{(entity.type.contains(`video`))? entity.des : entity.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/title" tools:text="2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。2014年解約回國後出演多部電影，開啟其演員生涯。2015年11月，發行首張中文單曲《Bad Girl》，開啟其個人歌手生涯。2016年11月，發行首張英文單曲《JULY》，正式開啟嘻哈音樂之路。" /> @@ -316,7 +316,7 @@ android:layout_marginLeft="5dp" android:includeFontPadding="false" android:text="回答了问题：" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/popularAnswerUserName" app:layout_constraintStart_toEndOf="@+id/popularAnswerUserName" @@ -330,7 +330,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{entity.popularAnswer.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -390,7 +390,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{entity.bbs.name}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" tools:text="地下城与勇士" /> 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 8d6d8f55c4..c794fd9516 100644 --- a/app/src/main/res/layout/community_article_draft_item.xml +++ b/app/src/main/res/layout/community_article_draft_item.xml @@ -29,7 +29,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{TextUtils.isEmpty(data.title)?`（缺少标题）`:data.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,7 +49,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -67,7 +67,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/community_edit_window.xml b/app/src/main/res/layout/community_edit_window.xml index bccebe6e62..93203a2147 100644 --- a/app/src/main/res/layout/community_edit_window.xml +++ b/app/src/main/res/layout/community_edit_window.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="发帖子" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="提问" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="发视频" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/community_follow_item.xml b/app/src/main/res/layout/community_follow_item.xml index 29a48db4bb..f4004f63a9 100644 --- a/app/src/main/res/layout/community_follow_item.xml +++ b/app/src/main/res/layout/community_follow_item.xml @@ -68,7 +68,7 @@ android:layout_marginLeft="8dp" android:layout_marginBottom="2dp" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:singleLine="true" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_name" @@ -132,7 +132,7 @@ android:layout_marginLeft="8dp" android:singleLine="true" android:text="@{NewsUtils.getFormattedTime(entity.time)}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" diff --git a/app/src/main/res/layout/community_my_answer_item.xml b/app/src/main/res/layout/community_my_answer_item.xml index 91158dcd99..90c91bfd74 100644 --- a/app/src/main/res/layout/community_my_answer_item.xml +++ b/app/src/main/res/layout/community_my_answer_item.xml @@ -27,7 +27,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{data.questions.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" android:visibility="visible" @@ -43,7 +43,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{data.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/title" /> @@ -84,7 +84,7 @@ android:minEms="3" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="16" /> @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="11" /> @@ -149,7 +149,7 @@ android:paddingRight="10dp" android:paddingBottom="6dp" android:text="@{!TextUtils.isEmpty(data.communityName) ? data.communityName :data.bbs.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@id/comment_and_vote_container" app:layout_constraintEnd_toStartOf="@+id/comment_and_vote_container" diff --git a/app/src/main/res/layout/community_question_draft_item.xml b/app/src/main/res/layout/community_question_draft_item.xml index d5285aba67..b3fac2db35 100644 --- a/app/src/main/res/layout/community_question_draft_item.xml +++ b/app/src/main/res/layout/community_question_draft_item.xml @@ -29,7 +29,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{TextUtils.isEmpty(data.title)?`（缺少标题）`:data.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,7 +49,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -67,7 +67,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/community_question_item.xml b/app/src/main/res/layout/community_question_item.xml index 85a0f61d5f..c306bad7ce 100644 --- a/app/src/main/res/layout/community_question_item.xml +++ b/app/src/main/res/layout/community_question_item.xml @@ -18,7 +18,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -32,7 +32,7 @@ android:layout_alignParentRight="true" android:gravity="center" android:maxEms="15" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="社区名称/时间" android:drawablePadding="4dp" @@ -70,7 +70,7 @@ android:minEms="2" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="16" /> diff --git a/app/src/main/res/layout/community_search_columm_item.xml b/app/src/main/res/layout/community_search_columm_item.xml index 453302a133..a1187e935b 100644 --- a/app/src/main/res/layout/community_search_columm_item.xml +++ b/app/src/main/res/layout/community_search_columm_item.xml @@ -31,7 +31,7 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:text="专题" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -59,7 +59,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{data.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/community_search_special_columm_item.xml b/app/src/main/res/layout/community_search_special_columm_item.xml index 4b00e605ad..0ee956f824 100644 --- a/app/src/main/res/layout/community_search_special_columm_item.xml +++ b/app/src/main/res/layout/community_search_special_columm_item.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:text="@{data.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -85,7 +85,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{data.description}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/special_column_image" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/community_select_opened_head_item.xml b/app/src/main/res/layout/community_select_opened_head_item.xml index c048508cc2..7213fd6271 100644 --- a/app/src/main/res/layout/community_select_opened_head_item.xml +++ b/app/src/main/res/layout/community_select_opened_head_item.xml @@ -28,7 +28,7 @@ android:textStyle="bold" android:paddingBottom="4dp" android:text="@{categoryName}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="我的游戏" /> diff --git a/app/src/main/res/layout/community_select_opened_item.xml b/app/src/main/res/layout/community_select_opened_item.xml index acbc839423..edac6d5045 100644 --- a/app/src/main/res/layout/community_select_opened_item.xml +++ b/app/src/main/res/layout/community_select_opened_item.xml @@ -53,7 +53,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{data.leftData.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/community_status_left" @@ -71,7 +71,7 @@ android:paddingBottom="1dp" android:text="当前选择" android:visibility="gone" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@id/game_icon_left" app:layout_constraintLeft_toLeftOf="@id/community_name_left" @@ -106,7 +106,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{data.rightData.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/community_status_right" @@ -124,7 +124,7 @@ android:includeFontPadding="false" android:paddingBottom="1dp" android:text="当前选择" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/game_icon_right" diff --git a/app/src/main/res/layout/community_video_draft_item.xml b/app/src/main/res/layout/community_video_draft_item.xml index f79a2da90c..2b31249c56 100644 --- a/app/src/main/res/layout/community_video_draft_item.xml +++ b/app/src/main/res/layout/community_video_draft_item.xml @@ -29,7 +29,7 @@ android:lineSpacingExtra="6dp" android:maxLines="2" android:text="@{TextUtils.isEmpty(data.title)?`（缺少标题）`:data.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,7 +49,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -67,7 +67,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/concern_item.xml b/app/src/main/res/layout/concern_item.xml index 991b2ffac0..e5279f70c3 100644 --- a/app/src/main/res/layout/concern_item.xml +++ b/app/src/main/res/layout/concern_item.xml @@ -30,7 +30,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index 2a493a26ac..d754524820 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -44,7 +44,7 @@ app:layout_constraintTop_toTopOf="@+id/taskIcon" app:layout_constraintBottom_toTopOf="@+id/progress" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@{entity.name}" tools:text="点赞视频" /> @@ -73,7 +73,7 @@ app:layout_constraintTop_toBottomOf="@+id/taskName" app:layout_constraintBottom_toBottomOf="@+id/taskIcon" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:text="@{entity.progress + `/` + entity.quota}" tools:text="0/10" /> diff --git a/app/src/main/res/layout/dialog_add_new_label.xml b/app/src/main/res/layout/dialog_add_new_label.xml index 2749b5be6a..6beef2dd3d 100644 --- a/app/src/main/res/layout/dialog_add_new_label.xml +++ b/app/src/main/res/layout/dialog_add_new_label.xml @@ -20,7 +20,7 @@ android:layout_marginRight="24dp" android:drawablePadding="4dp" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -40,8 +40,8 @@ android:lineSpacingExtra="7dp" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> @@ -65,7 +65,7 @@ android:gravity="center" android:paddingTop="18dp" android:paddingBottom="18dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="取消" app:layout_constraintLeft_toLeftOf="parent" @@ -76,7 +76,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> diff --git a/app/src/main/res/layout/dialog_alert_default.xml b/app/src/main/res/layout/dialog_alert_default.xml index a9062e2204..29beb74966 100644 --- a/app/src/main/res/layout/dialog_alert_default.xml +++ b/app/src/main/res/layout/dialog_alert_default.xml @@ -36,7 +36,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="24dp" android:layout_marginRight="24dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -52,7 +52,7 @@ android:layout_marginTop="16dp" android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -64,7 +64,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="14dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="@id/contentTv" @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/hintTv" @@ -90,7 +90,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -101,7 +101,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> diff --git a/app/src/main/res/layout/dialog_alert_with_rounded_corner.xml b/app/src/main/res/layout/dialog_alert_with_rounded_corner.xml index 8fd56c6a77..b6967a2c24 100644 --- a/app/src/main/res/layout/dialog_alert_with_rounded_corner.xml +++ b/app/src/main/res/layout/dialog_alert_with_rounded_corner.xml @@ -13,7 +13,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="24dp" android:text="提示" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -27,7 +27,7 @@ android:layout_marginTop="16dp" android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/dialog_content" /> @@ -52,7 +52,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="取消" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/dialog_positive" @@ -61,7 +61,7 @@ diff --git a/app/src/main/res/layout/dialog_apply_moderator.xml b/app/src/main/res/layout/dialog_apply_moderator.xml index 9cd630d545..6baacef3aa 100644 --- a/app/src/main/res/layout/dialog_apply_moderator.xml +++ b/app/src/main/res/layout/dialog_apply_moderator.xml @@ -25,7 +25,7 @@ android:includeFontPadding="false" android:text="提交申请成功" android:textAlignment="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -39,7 +39,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:textAlignment="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_ask_follow_more.xml b/app/src/main/res/layout/dialog_ask_follow_more.xml index bf99ad176a..5b924ac913 100644 --- a/app/src/main/res/layout/dialog_ask_follow_more.xml +++ b/app/src/main/res/layout/dialog_ask_follow_more.xml @@ -31,7 +31,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/text_f5f5f5" /> + android:background="@color/background" /> @@ -80,7 +80,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="21dp" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> diff --git a/app/src/main/res/layout/dialog_cancel_reservation.xml b/app/src/main/res/layout/dialog_cancel_reservation.xml index dba4436b83..9149e807be 100644 --- a/app/src/main/res/layout/dialog_cancel_reservation.xml +++ b/app/src/main/res/layout/dialog_cancel_reservation.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="取消预约" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -41,7 +41,7 @@ android:background="@drawable/button_round_f5f5f5" android:gravity="center" android:text="暂不取消" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> 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 0e3e1424eb..9391feeedb 100644 --- a/app/src/main/res/layout/dialog_communities_select_hint.xml +++ b/app/src/main/res/layout/dialog_communities_select_hint.xml @@ -66,7 +66,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="推荐" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> @@ -82,7 +82,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="专栏" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> @@ -98,7 +98,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="全部" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/dialog_conflict_guide.xml b/app/src/main/res/layout/dialog_conflict_guide.xml index 29ec817b17..011a57e01a 100644 --- a/app/src/main/res/layout/dialog_conflict_guide.xml +++ b/app/src/main/res/layout/dialog_conflict_guide.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:lineSpacingExtra="6dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content1" /> @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content2" /> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content3" /> diff --git a/app/src/main/res/layout/dialog_device_remind.xml b/app/src/main/res/layout/dialog_device_remind.xml index ca6461e429..eebb3431e4 100644 --- a/app/src/main/res/layout/dialog_device_remind.xml +++ b/app/src/main/res/layout/dialog_device_remind.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="注意" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" android:drawablePadding="4dp" @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:lineSpacingExtra="4dp" tools:text="运行游戏前，请详细阅读应用宝-手机下载前必看教程，请悉知！"/> @@ -54,7 +54,7 @@ android:drawableLeft="@drawable/selector_device_remind" android:button="@null" android:drawablePadding="4dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="gone" android:layout_marginTop="8dp" @@ -68,7 +68,7 @@ android:gravity="center" android:textSize="14sp" android:layout_marginTop="16dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:enabled="false" android:background="@drawable/button_round_f5f5f5"/> diff --git a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml index 88e2b5b23f..5ef41517e8 100644 --- a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml @@ -55,7 +55,7 @@ android:layout_marginTop="24dp" android:lineSpacingExtra="4dp" android:text="我们将按法律法规要求，全力保护您的个人信息安全" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" /> + android:background="@color/background" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/dialog_download_link.xml b/app/src/main/res/layout/dialog_download_link.xml index 799bbbf155..cefbac0503 100644 --- a/app/src/main/res/layout/dialog_download_link.xml +++ b/app/src/main/res/layout/dialog_download_link.xml @@ -16,7 +16,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_download_traffic.xml b/app/src/main/res/layout/dialog_download_traffic.xml index 2d0ff868b3..7916b2839a 100644 --- a/app/src/main/res/layout/dialog_download_traffic.xml +++ b/app/src/main/res/layout/dialog_download_traffic.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="下载提示" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" android:textStyle="bold" /> @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="当前正在使用移动网络，是否允许使用流量下载？" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -55,7 +55,7 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:text="WiFi自动下载" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> @@ -65,7 +65,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="（可在“我的光环-设置”打开或关闭流量提醒）" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_energy.xml b/app/src/main/res/layout/dialog_energy.xml index 5009fced1a..1da95887f6 100644 --- a/app/src/main/res/layout/dialog_energy.xml +++ b/app/src/main/res/layout/dialog_energy.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="樱桃小丸子" /> @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="共获得了" /> @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="14sp" tools:text="1520" /> @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="光能" /> @@ -64,14 +64,14 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/dialog_game_big_event.xml b/app/src/main/res/layout/dialog_game_big_event.xml index d9b90588a9..2cd3233c7e 100644 --- a/app/src/main/res/layout/dialog_game_big_event.xml +++ b/app/src/main/res/layout/dialog_game_big_event.xml @@ -18,13 +18,13 @@ android:layout_width="88dp" android:layout_height="wrap_content" android:textSize="12sp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:text="更新时间"/> @@ -42,7 +42,7 @@ + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/dialog_game_collect.xml b/app/src/main/res/layout/dialog_game_collect.xml index 9759010ee1..21d0b433d2 100644 --- a/app/src/main/res/layout/dialog_game_collect.xml +++ b/app/src/main/res/layout/dialog_game_collect.xml @@ -15,7 +15,7 @@ android:gravity="center_vertical" android:includeFontPadding="false" android:text="光环助手已收录以下游戏" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16dp" /> + android:textColor="@color/text_subtitle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_game_collection_share.xml b/app/src/main/res/layout/dialog_game_collection_share.xml index c086f1753b..869df558f3 100644 --- a/app/src/main/res/layout/dialog_game_collection_share.xml +++ b/app/src/main/res/layout/dialog_game_collection_share.xml @@ -36,7 +36,7 @@ android:layout_gravity="center" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:text="分享" app:layout_constraintEnd_toEndOf="parent" @@ -48,7 +48,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="16dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> @@ -201,7 +201,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="取消" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_game_detail_more.xml b/app/src/main/res/layout/dialog_game_detail_more.xml index 2041687489..a86cd0d122 100644 --- a/app/src/main/res/layout/dialog_game_detail_more.xml +++ b/app/src/main/res/layout/dialog_game_detail_more.xml @@ -59,7 +59,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@+id/gameIconView" app:layout_constraintEnd_toEndOf="parent" @@ -73,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="12dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_container" /> @@ -138,7 +138,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="16dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/share_container" /> @@ -192,7 +192,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="取消" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_game_off_service.xml b/app/src/main/res/layout/dialog_game_off_service.xml index 97f254e36f..5bb03c2330 100644 --- a/app/src/main/res/layout/dialog_game_off_service.xml +++ b/app/src/main/res/layout/dialog_game_off_service.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:lineSpacingExtra="8dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" tools:text="很抱歉，光环助手暂时不提供该游戏的下载" /> @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="小助手自动为您找到以下外站下载地址（若外站下架，则链接可能会失效）\n小助手自动为您找到以下外站下载地址（若外站下架，则链接可能会失效）" /> @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -41,7 +41,7 @@ android:layout_marginTop="20dp" android:layout_marginLeft="10dp" android:textSize="14sp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:gravity="center" android:background="@drawable/button_round_f5f5f5" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_input_url.xml b/app/src/main/res/layout/dialog_input_url.xml index defb7d40ac..e82d2025d6 100644 --- a/app/src/main/res/layout/dialog_input_url.xml +++ b/app/src/main/res/layout/dialog_input_url.xml @@ -17,7 +17,7 @@ android:inputType="textUri" android:paddingLeft="16dp" android:paddingRight="10dp" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textSize="14sp" /> @@ -43,7 +43,7 @@ android:gravity="center" android:text="取消" android:textStyle="bold" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -37,7 +37,7 @@ android:layout_marginTop="48dp" android:lineSpacingExtra="8dp" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@string/invite_no_bind_tip" /> diff --git a/app/src/main/res/layout/dialog_invite_code.xml b/app/src/main/res/layout/dialog_invite_code.xml index d0740ba768..79673a7da1 100644 --- a/app/src/main/res/layout/dialog_invite_code.xml +++ b/app/src/main/res/layout/dialog_invite_code.xml @@ -15,7 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" android:text="@string/invite_bind_title" /> @@ -34,7 +34,7 @@ android:layout_marginTop="48dp" android:lineSpacingExtra="8dp" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@string/invite_no_bind_tip" /> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" android:text="@string/invite_code_title" /> @@ -93,8 +93,8 @@ android:layout_marginRight="16dp" android:background="@null" android:hint="@string/invite_code_hint" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -105,7 +105,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="94dp" android:lineSpacingExtra="2dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:text="@string/invite_code_tip" /> diff --git a/app/src/main/res/layout/dialog_kaifu_remind.xml b/app/src/main/res/layout/dialog_kaifu_remind.xml index ecc986bcd6..fa350ff06a 100644 --- a/app/src/main/res/layout/dialog_kaifu_remind.xml +++ b/app/src/main/res/layout/dialog_kaifu_remind.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="温馨提示" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" /> @@ -37,7 +37,7 @@ android:layout_height="match_parent" android:lineSpacingExtra="4dp" android:padding="12dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="混服：九游、官方、百度、当乐、OPPO等版本" /> @@ -46,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -60,7 +60,7 @@ android:gravity="center" android:paddingTop="18dp" android:paddingBottom="18dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -70,7 +70,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> diff --git a/app/src/main/res/layout/dialog_notice.xml b/app/src/main/res/layout/dialog_notice.xml index 0e42744d3f..fdaf8af54b 100644 --- a/app/src/main/res/layout/dialog_notice.xml +++ b/app/src/main/res/layout/dialog_notice.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:textStyle="bold" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/dialog_notification_hint.xml b/app/src/main/res/layout/dialog_notification_hint.xml index d9feed5585..58af6b750e 100644 --- a/app/src/main/res/layout/dialog_notification_hint.xml +++ b/app/src/main/res/layout/dialog_notification_hint.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginTop="21dp" android:text="开启消息通知" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -41,7 +41,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="新游上线、互动回复，重要推送不错过" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" diff --git a/app/src/main/res/layout/dialog_oversea_confirmation.xml b/app/src/main/res/layout/dialog_oversea_confirmation.xml index b523652336..70458fa55b 100644 --- a/app/src/main/res/layout/dialog_oversea_confirmation.xml +++ b/app/src/main/res/layout/dialog_oversea_confirmation.xml @@ -39,7 +39,7 @@ android:layout_marginTop="14dp" android:includeFontPadding="false" android:text="@{@string/dialog_oversea_hint(game.name)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" tools:text="光环助手" /> @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:padding="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" tools:text="http://static.wallbroken.com/p/7eb04605hc12e1346773583n.apk" /> @@ -65,7 +65,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:text="@string/oversea_hint" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" /> @@ -71,7 +71,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="取消" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -81,7 +81,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> diff --git a/app/src/main/res/layout/dialog_pass_regulation.xml b/app/src/main/res/layout/dialog_pass_regulation.xml index 1df61ba8a3..661c03d924 100644 --- a/app/src/main/res/layout/dialog_pass_regulation.xml +++ b/app/src/main/res/layout/dialog_pass_regulation.xml @@ -24,7 +24,7 @@ android:layout_marginTop="31dp" android:lineSpacingExtra="16dp" android:gravity="center_horizontal" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:text="@string/pass_regulation" /> diff --git a/app/src/main/res/layout/dialog_pluggable_never_remind.xml b/app/src/main/res/layout/dialog_pluggable_never_remind.xml index bd2385910e..40844e8e08 100644 --- a/app/src/main/res/layout/dialog_pluggable_never_remind.xml +++ b/app/src/main/res/layout/dialog_pluggable_never_remind.xml @@ -13,7 +13,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="24dp" android:text="温馨提醒" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -27,7 +27,7 @@ android:layout_marginTop="16dp" android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> @@ -52,7 +52,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="取消" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -61,7 +61,7 @@ diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index b6f0490095..45ff3fa2e5 100644 --- a/app/src/main/res/layout/dialog_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_privacy_policy.xml @@ -38,7 +38,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="24sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@id/head_background" @@ -54,7 +54,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -94,7 +94,7 @@ android:layout_marginBottom="20dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" tools:text="这是啥" /> @@ -110,7 +110,7 @@ android:layout_marginBottom="20dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/allow_button" @@ -145,7 +145,7 @@ android:includeFontPadding="false" android:padding="4dp" android:text="暂不授权" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/dialog_privacy_protocol.xml b/app/src/main/res/layout/dialog_privacy_protocol.xml index b6477993b1..a06dd048e0 100644 --- a/app/src/main/res/layout/dialog_privacy_protocol.xml +++ b/app/src/main/res/layout/dialog_privacy_protocol.xml @@ -19,7 +19,7 @@ android:background="@color/white" android:gravity="center" android:text="光环助手隐私政策" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -47,7 +47,7 @@ android:scrollbarThumbVertical="@drawable/webview_scrollbar_thumb_vertical" android:scrollbars="vertical" android:text="@string/dialog_privacy_policy_content" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -59,7 +59,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@id/line" app:layout_constraintLeft_toLeftOf="parent" @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintTop_toBottomOf="@+id/descTv" /> diff --git a/app/src/main/res/layout/dialog_quick_login.xml b/app/src/main/res/layout/dialog_quick_login.xml index 2ecb23cd36..bf10b03ecd 100644 --- a/app/src/main/res/layout/dialog_quick_login.xml +++ b/app/src/main/res/layout/dialog_quick_login.xml @@ -25,7 +25,7 @@ android:paddingLeft="10dp" android:layout_marginTop="127dp" android:layout_centerHorizontal="true" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="中国移动提供认证服务" /> @@ -37,7 +37,7 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:gravity="center_horizontal" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="其他方式登录 >" /> diff --git a/app/src/main/res/layout/dialog_quick_login_permission.xml b/app/src/main/res/layout/dialog_quick_login_permission.xml index 61cd374cd4..11b875c1b0 100644 --- a/app/src/main/res/layout/dialog_quick_login_permission.xml +++ b/app/src/main/res/layout/dialog_quick_login_permission.xml @@ -25,7 +25,7 @@ android:layout_marginTop="24dp" android:layout_marginLeft="24dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" android:text="@string/quick_login_permission_dialog_title" @@ -39,7 +39,7 @@ android:layout_marginTop="24dp" android:layout_marginLeft="24dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:text="@string/quick_login_permission_dialog_sub_title" app:layout_constraintTop_toBottomOf="@+id/title" @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" android:text="@string/quick_login_permission_dialog_phone_permission" @@ -88,7 +88,7 @@ android:layout_marginRight="11dp" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" android:text="@string/quick_login_permission_dialog_phone_permission_detail" app:layout_constraintTop_toBottomOf="@+id/phonePermission" @@ -120,7 +120,7 @@ android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:gravity="center_horizontal" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:text="@string/quick_login_permission_dialog_cancel" app:layout_constraintTop_toBottomOf="@+id/confirmBtn" diff --git a/app/src/main/res/layout/dialog_receive_badge.xml b/app/src/main/res/layout/dialog_receive_badge.xml index f5c1c0e93b..56c85823ad 100644 --- a/app/src/main/res/layout/dialog_receive_badge.xml +++ b/app/src/main/res/layout/dialog_receive_badge.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="当月累计评论30条" /> diff --git a/app/src/main/res/layout/dialog_receive_libao_success.xml b/app/src/main/res/layout/dialog_receive_libao_success.xml index a2bf715186..1415faf23e 100644 --- a/app/src/main/res/layout/dialog_receive_libao_success.xml +++ b/app/src/main/res/layout/dialog_receive_libao_success.xml @@ -15,7 +15,7 @@ android:layout_marginTop="24dp" android:layout_marginRight="24dp" android:drawablePadding="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="礼包码：" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -89,7 +89,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="关闭" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -99,7 +99,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> diff --git a/app/src/main/res/layout/dialog_regulation_test.xml b/app/src/main/res/layout/dialog_regulation_test.xml index b0d124a81a..19b64bf6dd 100644 --- a/app/src/main/res/layout/dialog_regulation_test.xml +++ b/app/src/main/res/layout/dialog_regulation_test.xml @@ -19,7 +19,7 @@ android:drawableLeft="@drawable/ic_regulation_test_hint" android:drawablePadding="4dp" android:text="礼仪测试" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -34,7 +34,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="@string/regulation_hint" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -48,7 +48,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="@string/regulation_link" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/content" app:layout_constraintRight_toRightOf="parent" @@ -59,7 +59,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/link" /> @@ -72,7 +72,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="跳过" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -81,7 +81,7 @@ diff --git a/app/src/main/res/layout/dialog_report_reason.xml b/app/src/main/res/layout/dialog_report_reason.xml index 0ea4587fb8..7a90f3287a 100644 --- a/app/src/main/res/layout/dialog_report_reason.xml +++ b/app/src/main/res/layout/dialog_report_reason.xml @@ -136,8 +136,8 @@ android:lineSpacingExtra="4dp" android:hint="@string/report_reason_other_hint" android:textCursorDrawable="@drawable/cursor_color" - android:textColorHint="@color/text_cccccc" - android:textColor="@color/text_999999" + android:textColorHint="@color/text_body" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp"/> @@ -155,7 +155,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="12dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/dialog_reserve_game.xml b/app/src/main/res/layout/dialog_reserve_game.xml index 531651ea6e..83266cbf04 100644 --- a/app/src/main/res/layout/dialog_reserve_game.xml +++ b/app/src/main/res/layout/dialog_reserve_game.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="游戏预约提醒" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="15sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginTop="14dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="游戏上线，你将免费收到短信提醒" /> @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="填写的手机号仅用于游戏开测提醒" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" /> @@ -136,7 +136,7 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:text="无手机号预约 >" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -163,7 +163,7 @@ android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" tools:text="18888888888" /> @@ -199,7 +199,7 @@ android:layout_marginTop="16dp" android:gravity="center" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="游戏上线，你将免费收到短信提醒" /> @@ -230,7 +230,7 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:text="关闭" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_reserve_item.xml b/app/src/main/res/layout/dialog_reserve_item.xml index 68759ab249..e82e1525cc 100644 --- a/app/src/main/res/layout/dialog_reserve_item.xml +++ b/app/src/main/res/layout/dialog_reserve_item.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:text="@{game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_select_game_item.xml b/app/src/main/res/layout/dialog_select_game_item.xml index 85bb8f5c1f..3ea1630372 100644 --- a/app/src/main/res/layout/dialog_select_game_item.xml +++ b/app/src/main/res/layout/dialog_select_game_item.xml @@ -17,7 +17,7 @@ android:layout_marginTop="8dp" android:maxLines="1" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_sertification.xml b/app/src/main/res/layout/dialog_sertification.xml index c0fe856acb..9a6d096ad1 100644 --- a/app/src/main/res/layout/dialog_sertification.xml +++ b/app/src/main/res/layout/dialog_sertification.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="温馨提示" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" android:drawablePadding="4dp" @@ -29,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" @@ -54,7 +54,7 @@ android:drawableLeft="@drawable/selector_device_remind" android:button="@null" android:drawablePadding="4dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="gone" android:layout_marginTop="12dp" @@ -66,7 +66,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="14dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:textColor="@color/text_title"/> + android:background="@color/divider" /> @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:text="@string/dialog_shortcut_content2" /> @@ -50,7 +50,7 @@ android:paddingTop="16dp" android:paddingBottom="20dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" android:text="以后再说" /> diff --git a/app/src/main/res/layout/dialog_sign_rule.xml b/app/src/main/res/layout/dialog_sign_rule.xml index f32c1e60e7..4a9c1b8a7c 100644 --- a/app/src/main/res/layout/dialog_sign_rule.xml +++ b/app/src/main/res/layout/dialog_sign_rule.xml @@ -16,7 +16,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="24dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" android:text="@string/sign_rule" /> @@ -28,7 +28,7 @@ android:layout_marginLeft="24dp" android:layout_marginRight="20dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="@string/sign_rule_content1" /> @@ -39,7 +39,7 @@ android:layout_marginLeft="24dp" android:layout_marginRight="20dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="@string/sign_rule_content2" /> @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -44,7 +44,7 @@ android:paddingTop="20dp" android:paddingRight="12dp" android:paddingBottom="20dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" tools:text="混服：九游、官方、百度、当乐、OPPO等版本" /> @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:textColor="@color/text_title"/> + android:textColor="@color/text_title"/> + android:background="@color/divider" /> @@ -23,14 +23,14 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:text="身份认证信息保存之后不可修改，确认提交？" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" /> + android:background="@color/divider" /> + android:background="@color/divider" /> @@ -46,7 +46,7 @@ android:text="取消" android:gravity="center" android:textSize="14sp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:background="@drawable/button_round_f5f5f5"/> @@ -75,7 +75,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="返回" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintEnd_toStartOf="@+id/middle_line" app:layout_constraintStart_toStartOf="parent" @@ -85,7 +85,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/commitTv" app:layout_constraintStart_toEndOf="@+id/backTv" @@ -99,7 +99,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="提交" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/middle_line" 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 9ad6d611b3..86463fa98f 100644 --- a/app/src/main/res/layout/dialog_video_upload_draft.xml +++ b/app/src/main/res/layout/dialog_video_upload_draft.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="提示" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="17sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@+id/hint_icon" @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -62,7 +62,7 @@ android:paddingRight="31dp" android:paddingBottom="13dp" android:text="确定保存" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/negative" app:layout_constraintTop_toBottomOf="@id/content" /> diff --git a/app/src/main/res/layout/dialog_view_badge.xml b/app/src/main/res/layout/dialog_view_badge.xml index 23cdb1e38a..56d29a81a5 100644 --- a/app/src/main/res/layout/dialog_view_badge.xml +++ b/app/src/main/res/layout/dialog_view_badge.xml @@ -38,7 +38,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lines="1" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="当月累计评论30条当月累计评论30条" /> diff --git a/app/src/main/res/layout/download_dialog_installed_item.xml b/app/src/main/res/layout/download_dialog_installed_item.xml index 0c95982bd2..cb302013a3 100644 --- a/app/src/main/res/layout/download_dialog_installed_item.xml +++ b/app/src/main/res/layout/download_dialog_installed_item.xml @@ -64,7 +64,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{apk.getPlatformName}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@id/remark" app:layout_constraintLeft_toRightOf="@id/icon" @@ -82,7 +82,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{apk.remark}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toTopOf="@id/status" app:layout_constraintLeft_toRightOf="@id/icon" @@ -146,7 +146,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="查看合集" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="12sp" android:visibility="visible" /> diff --git a/app/src/main/res/layout/download_dialog_item.xml b/app/src/main/res/layout/download_dialog_item.xml index 4ba3afd2b9..cb33f6c4bd 100644 --- a/app/src/main/res/layout/download_dialog_item.xml +++ b/app/src/main/res/layout/download_dialog_item.xml @@ -68,7 +68,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{apk.getPlatformName}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@id/remark" app:layout_constraintLeft_toRightOf="@id/icon" @@ -86,7 +86,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{apk.remark}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toTopOf="@id/status" app:layout_constraintLeft_toRightOf="@id/icon" diff --git a/app/src/main/res/layout/download_dialog_section_item.xml b/app/src/main/res/layout/download_dialog_section_item.xml index 2f8bf2ef16..53e3bc4f81 100644 --- a/app/src/main/res/layout/download_dialog_section_item.xml +++ b/app/src/main/res/layout/download_dialog_section_item.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{type == DownloadDialogSectionType.OTHER?`其它版本`:`我的版本`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="15sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="点击卡片下载或查看合集" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/download_simulator_dialog.xml b/app/src/main/res/layout/download_simulator_dialog.xml index eea5675e4d..23678f7002 100644 --- a/app/src/main/res/layout/download_simulator_dialog.xml +++ b/app/src/main/res/layout/download_simulator_dialog.xml @@ -78,7 +78,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="24dp" android:layout_weight="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/progress" @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintRight_toRightOf="@id/progress" app:layout_constraintTop_toBottomOf="@id/progress" diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index 226f336008..ea91a3c453 100644 --- a/app/src/main/res/layout/editor_insert_container.xml +++ b/app/src/main/res/layout/editor_insert_container.xml @@ -80,7 +80,7 @@ + android:background="@color/divider" /> @@ -246,7 +246,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用帖子" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" /> @@ -271,7 +271,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用游戏" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" /> @@ -296,7 +296,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用游戏单" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/editor_insert_default_item.xml b/app/src/main/res/layout/editor_insert_default_item.xml index 7d47922816..c2763ffe23 100644 --- a/app/src/main/res/layout/editor_insert_default_item.xml +++ b/app/src/main/res/layout/editor_insert_default_item.xml @@ -35,7 +35,7 @@ android:layout_marginLeft="12dp" android:includeFontPadding="false" android:text="@{entity.gameName}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/type" @@ -51,7 +51,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/game_icon" app:layout_constraintLeft_toRightOf="@id/game_icon" @@ -63,7 +63,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/fm_downloadmanager_item.xml b/app/src/main/res/layout/fm_downloadmanager_item.xml index b08cfb6eea..75d6bf0765 100644 --- a/app/src/main/res/layout/fm_downloadmanager_item.xml +++ b/app/src/main/res/layout/fm_downloadmanager_item.xml @@ -36,7 +36,7 @@ android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> @@ -66,7 +66,7 @@ android:layout_weight="4" android:ellipsize="end" android:singleLine="true" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> + android:background="@color/background" /> 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 07486b32c9..6d813d8b98 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginRight="11dp" android:text="@{NumberUtils.transSimpleCount(entity.count.answer) + `回答`}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" tools:text="1回答" /> @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_toRightOf="@id/answer_count" android:text="@{NumberUtils.transSimpleCount(entity.count.vote) + `赞同`}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" tools:text="1赞同" /> @@ -65,7 +65,7 @@ android:includeFontPadding="false" android:maxWidth="220dp" android:text='@{TextUtils.isEmpty(entity.introduce)?"这是一个很神秘的崽~":entity.introduce}' - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@+id/user_icon" app:layout_constraintLeft_toRightOf="@+id/user_icon" @@ -80,7 +80,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{entity.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/user_introduce" app:layout_constraintLeft_toRightOf="@+id/user_icon" diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml index 4908eceb5d..9a9ef223fb 100644 --- a/app/src/main/res/layout/forum_activity_item.xml +++ b/app/src/main/res/layout/forum_activity_item.xml @@ -22,7 +22,7 @@ android:id="@+id/line" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/EEEEEE" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -47,7 +47,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@{entity.title}" tools:text="官方预告，5.20限时领福利礼好礼等你拿快来参加吧还有更多好礼等你拿" diff --git a/app/src/main/res/layout/forum_item.xml b/app/src/main/res/layout/forum_item.xml index 414b734340..423d25a278 100644 --- a/app/src/main/res/layout/forum_item.xml +++ b/app/src/main/res/layout/forum_item.xml @@ -35,7 +35,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{ExtensionsKt.fromHtml(entity.name)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/forum_my_follow.xml b/app/src/main/res/layout/forum_my_follow.xml index 5daec0454d..40cb394792 100644 --- a/app/src/main/res/layout/forum_my_follow.xml +++ b/app/src/main/res/layout/forum_my_follow.xml @@ -21,7 +21,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/EEEEEE" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/forum_record_item.xml b/app/src/main/res/layout/forum_record_item.xml index 8ffe32959f..b8103899ca 100644 --- a/app/src/main/res/layout/forum_record_item.xml +++ b/app/src/main/res/layout/forum_record_item.xml @@ -31,7 +31,7 @@ android:singleLine="true" android:ellipsize="end" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="11sp" android:text="@{entity.name}" app:layout_constraintLeft_toLeftOf="@+id/forumIv" diff --git a/app/src/main/res/layout/forum_search_content_list.xml b/app/src/main/res/layout/forum_search_content_list.xml index c4a9393730..d215f0099d 100644 --- a/app/src/main/res/layout/forum_search_content_list.xml +++ b/app/src/main/res/layout/forum_search_content_list.xml @@ -43,7 +43,7 @@ android:ellipsize="end" android:maxLines="2" android:lineSpacingExtra="6dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/image" app:layout_constraintStart_toStartOf="parent" @@ -58,7 +58,7 @@ android:layout_marginRight="16dp" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/image" app:layout_constraintStart_toStartOf="parent" @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{entity.count.comment +`评论 · `+entity.count.vote+`点赞`}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/forum_top_link_item.xml b/app/src/main/res/layout/forum_top_link_item.xml index b692a03301..8bdad6c861 100644 --- a/app/src/main/res/layout/forum_top_link_item.xml +++ b/app/src/main/res/layout/forum_top_link_item.xml @@ -14,7 +14,7 @@ android:drawableLeft="@drawable/ic_forum_top_link" android:drawablePadding="8dp" android:gravity="center_vertical" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" diff --git a/app/src/main/res/layout/forum_welfare_item.xml b/app/src/main/res/layout/forum_welfare_item.xml index f27e95ecc9..220b0ec11f 100644 --- a/app/src/main/res/layout/forum_welfare_item.xml +++ b/app/src/main/res/layout/forum_welfare_item.xml @@ -26,7 +26,7 @@ android:singleLine="true" android:ellipsize="end" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintTop_toTopOf="@+id/welfareIv" app:layout_constraintBottom_toBottomOf="@+id/welfareIv" diff --git a/app/src/main/res/layout/fragment_amway_success.xml b/app/src/main/res/layout/fragment_amway_success.xml index 14fd28ba09..15c3a0e248 100644 --- a/app/src/main/res/layout/fragment_amway_success.xml +++ b/app/src/main/res/layout/fragment_amway_success.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="您的评论已提交成功" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="审核通过后即可上安利墙哦~" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 0b225f90d7..f70a1add8d 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -125,7 +125,7 @@ android:layout_marginRight="7dp" android:drawableRight="@drawable/answer_detail_more_answer_icon" android:drawablePadding="8dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" tools:text="查看全部66个回答" /> @@ -160,7 +160,7 @@ android:layout_height="wrap_content" android:layout_marginRight="16dp" android:maxLength="12" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/sdv_user_badge" app:layout_constraintLeft_toRightOf="@id/user_icon_iv" @@ -186,7 +186,7 @@ android:layout_marginRight="16dp" android:gravity="center_vertical" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/sdv_user_badge" app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" diff --git a/app/src/main/res/layout/fragment_answer_detail_skeleton.xml b/app/src/main/res/layout/fragment_answer_detail_skeleton.xml index 6dd0273a39..5a83cd7634 100644 --- a/app/src/main/res/layout/fragment_answer_detail_skeleton.xml +++ b/app/src/main/res/layout/fragment_answer_detail_skeleton.xml @@ -248,7 +248,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="赞同 0" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="invisible" /> diff --git a/app/src/main/res/layout/fragment_answer_edit.xml b/app/src/main/res/layout/fragment_answer_edit.xml index 86b09ae07f..c7d5ebfe1d 100644 --- a/app/src/main/res/layout/fragment_answer_edit.xml +++ b/app/src/main/res/layout/fragment_answer_edit.xml @@ -24,7 +24,7 @@ android:paddingTop="20dp" android:paddingRight="10dp" android:paddingBottom="12dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" tools:text="快递公司全面复工:三通一达等均已全网恢复正常运营" /> @@ -58,7 +58,7 @@ android:layout_marginBottom="8dp" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="国家邮政局召开部分快递企业专题电话会议。国家邮政局局党组书记、局长马军胜主持召开专题电话会议，向中通、圆通、申通、韵达、百世" /> @@ -174,7 +174,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/fragment_article_detail.xml b/app/src/main/res/layout/fragment_article_detail.xml index 1321ea403c..99cc209bf3 100644 --- a/app/src/main/res/layout/fragment_article_detail.xml +++ b/app/src/main/res/layout/fragment_article_detail.xml @@ -53,7 +53,7 @@ android:layout_marginLeft="8dp" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_ask_all.xml b/app/src/main/res/layout/fragment_ask_all.xml index 3bd010fa22..512915ebd2 100644 --- a/app/src/main/res/layout/fragment_ask_all.xml +++ b/app/src/main/res/layout/fragment_ask_all.xml @@ -23,7 +23,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:text="问题" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/fragment_avatar_border.xml b/app/src/main/res/layout/fragment_avatar_border.xml index 8895335de0..bf34c70e28 100644 --- a/app/src/main/res/layout/fragment_avatar_border.xml +++ b/app/src/main/res/layout/fragment_avatar_border.xml @@ -17,7 +17,7 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:fitsSystemWindows="true" android:gravity="center" app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fitsSystemWindows="true" - app:contentScrim="@color/text_f5f5f5" + app:contentScrim="@color/background" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0" app:scrimVisibleHeightTrigger="120dp" @@ -167,6 +167,6 @@ android:background="@drawable/border_round_eee_999" android:gravity="center" android:text="使用" - android:textColor="@color/text_cccccc" /> + android:textColor="@color/text_body" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_avatar_list.xml b/app/src/main/res/layout/fragment_avatar_list.xml index ab711ff810..b414afc3ef 100644 --- a/app/src/main/res/layout/fragment_avatar_list.xml +++ b/app/src/main/res/layout/fragment_avatar_list.xml @@ -44,7 +44,7 @@ android:layout_marginTop="20dp" android:gravity="center" android:text="@string/no_data" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_background_preview.xml b/app/src/main/res/layout/fragment_background_preview.xml index 2990ecb157..02d91e7f8b 100644 --- a/app/src/main/res/layout/fragment_background_preview.xml +++ b/app/src/main/res/layout/fragment_background_preview.xml @@ -81,7 +81,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:background="@color/text_666666" /> + tools:background="@color/text_subtitle" /> + tools:background="@color/text_subtitle" /> @@ -42,7 +42,7 @@ android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" android:textSize="14sp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:text="@string/bind_phone_desc" /> @@ -74,8 +74,8 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:paddingRight="16dp" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="16sp" /> @@ -83,7 +83,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> @@ -136,7 +136,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> @@ -176,7 +176,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> + android:textColor="@color/text_subtitle" /> + android:textColor="@color/text_title" /> + android:textColor="@color/text_subtitleDesc" /> @@ -113,7 +113,7 @@ android:includeFontPadding="false" android:textStyle="bold" android:textSize="14sp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:text="@string/bind_phone_conflict_item_conflict_text" /> + android:textColor="@color/text_title" /> + android:textColor="@color/text_subtitleDesc" /> @@ -189,6 +189,6 @@ android:layout_marginRight="20dp" android:gravity="center" android:textSize="14sp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:text="@string/bind_phone_conflict_cancel" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_catalog.xml b/app/src/main/res/layout/fragment_catalog.xml index 624c8b87b8..2ec7ef27b9 100644 --- a/app/src/main/res/layout/fragment_catalog.xml +++ b/app/src/main/res/layout/fragment_catalog.xml @@ -8,7 +8,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:background="@color/background" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/fragment_choose_games.xml b/app/src/main/res/layout/fragment_choose_games.xml index a51dacfd0e..0736deb755 100644 --- a/app/src/main/res/layout/fragment_choose_games.xml +++ b/app/src/main/res/layout/fragment_choose_games.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="已收录0款游戏" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> + android:textColor="@color/text_body" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml index 3da9298687..3b491ddd7a 100644 --- a/app/src/main/res/layout/fragment_community.xml +++ b/app/src/main/res/layout/fragment_community.xml @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:background="@color/background" /> + android:background="@color/background" /> + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_energy_house.xml b/app/src/main/res/layout/fragment_energy_house.xml index 65c0104cfe..553d21793f 100644 --- a/app/src/main/res/layout/fragment_energy_house.xml +++ b/app/src/main/res/layout/fragment_energy_house.xml @@ -130,7 +130,7 @@ app:mvAnimDuration="1000" app:mvInterval="3000" app:mvSingleLine="true" - app:mvTextColor="@color/text_333333" + app:mvTextColor="@color/text_title" app:mvTextSize="11sp"/> diff --git a/app/src/main/res/layout/fragment_forum.xml b/app/src/main/res/layout/fragment_forum.xml index c103cf2651..80acb529eb 100644 --- a/app/src/main/res/layout/fragment_forum.xml +++ b/app/src/main/res/layout/fragment_forum.xml @@ -48,7 +48,7 @@ android:layout_marginLeft="16dp" android:includeFontPadding="false" android:text="关注论坛" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" @@ -91,7 +91,7 @@ android:layout_marginLeft="16dp" android:includeFontPadding="false" android:text="热门论坛" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" @@ -136,7 +136,7 @@ android:layout_marginLeft="16dp" android:includeFontPadding="false" android:text="综合论坛" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" @@ -182,7 +182,7 @@ android:layout_marginLeft="16dp" android:includeFontPadding="false" android:text="其他福利" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/fragment_forum_activity.xml b/app/src/main/res/layout/fragment_forum_activity.xml index 385a062217..c2adf08796 100644 --- a/app/src/main/res/layout/fragment_forum_activity.xml +++ b/app/src/main/res/layout/fragment_forum_activity.xml @@ -33,7 +33,7 @@ + android:background="@color/divider" /> + android:background="@color/divider" /> @@ -137,7 +137,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="24dp" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/fragment_game_download_setting.xml b/app/src/main/res/layout/fragment_game_download_setting.xml index b16a119d7a..a3a850e0d5 100644 --- a/app/src/main/res/layout/fragment_game_download_setting.xml +++ b/app/src/main/res/layout/fragment_game_download_setting.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/setting_install_auto" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/setting_pic_path" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -164,7 +164,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/setting_clean_package" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -55,7 +55,7 @@ android:paddingRight="16dp" android:paddingBottom="10dp" android:text="测试状态" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_game_servers_publish.xml b/app/src/main/res/layout/fragment_game_servers_publish.xml index 58bfc5eb95..b6f59f1007 100644 --- a/app/src/main/res/layout/fragment_game_servers_publish.xml +++ b/app/src/main/res/layout/fragment_game_servers_publish.xml @@ -22,7 +22,7 @@ android:paddingRight="50dp" android:paddingBottom="10dp" android:text="开服时间" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +50,7 @@ android:paddingRight="16dp" android:paddingBottom="10dp" android:text="测试状态" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index a757667213..ced7f5f950 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -45,7 +45,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="安装包*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -72,7 +72,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:hint="点我选择" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textColorHint="@color/theme_font" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -96,7 +96,7 @@ android:layout_marginTop="20dp" android:layout_marginBottom="14dp" android:text="游戏图标*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/gameIconRv" app:layout_constraintStart_toStartOf="parent" @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="（限制一张，尺寸比例1:1）" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/gameIconTitleTv" app:layout_constraintStart_toEndOf="@+id/gameIconTitleTv" @@ -142,7 +142,7 @@ android:paddingRight="16dp" android:text="游戏名字*" android:gravity="center" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -158,8 +158,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -182,7 +182,7 @@ android:paddingRight="16dp" android:layout_marginBottom="12dp" android:text="游戏标签*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/gameLabelFl" app:layout_constraintStart_toStartOf="parent" @@ -230,7 +230,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:hint="添加标签" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textColorHint="@color/theme_font" android:textCursorDrawable="@drawable/cursor_color" android:textSize="10sp" /> @@ -252,7 +252,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="是否联网" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -313,7 +313,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="游戏语言" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -388,7 +388,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="游戏类型" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -461,7 +461,7 @@ android:paddingRight="20dp" android:paddingBottom="10dp" android:text="游戏简介*" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -589,8 +589,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -609,7 +609,7 @@ android:background="@color/transparent" android:drawableLeft="@drawable/video_upload_protocol_checkbox_style" android:drawablePadding="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" 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 9b81580677..95cfb13c30 100644 --- a/app/src/main/res/layout/fragment_help_contaier.xml +++ b/app/src/main/res/layout/fragment_help_contaier.xml @@ -42,7 +42,7 @@ android:paddingLeft="34dp" android:paddingRight="40dp" android:singleLine="true" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@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 b071358c43..37523575ac 100644 --- a/app/src/main/res/layout/fragment_help_content.xml +++ b/app/src/main/res/layout/fragment_help_content.xml @@ -45,7 +45,7 @@ android:layout_marginTop="32dp" android:gravity="center" android:text="没有找到相关内容，换个搜索词试试~~" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_invite.xml b/app/src/main/res/layout/fragment_invite.xml index e270ee2a10..1d384e9d6b 100644 --- a/app/src/main/res/layout/fragment_invite.xml +++ b/app/src/main/res/layout/fragment_invite.xml @@ -36,7 +36,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textColorHint="@color/text_C1BFC9" android:textCursorDrawable="@drawable/cursor_color" android:textSize="12sp" diff --git a/app/src/main/res/layout/fragment_libao3.xml b/app/src/main/res/layout/fragment_libao3.xml index a2ab4ddb74..c2ae957f44 100644 --- a/app/src/main/res/layout/fragment_libao3.xml +++ b/app/src/main/res/layout/fragment_libao3.xml @@ -16,7 +16,7 @@ + android:background="@color/background" /> + android:background="@color/divider" /> + android:background="@color/divider" /> + android:textColor="@color/text_subtitleDesc" /> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 1f1ac36ae9..27fe57f9da 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginLeft="16dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@string/login_phone_prefix" /> @@ -47,7 +47,7 @@ android:paddingBottom="10dp" android:paddingRight="16dp" android:textColor="@color/black" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -74,7 +74,7 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:textColor="@color/black" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -87,7 +87,7 @@ android:layout_centerVertical="true" android:gravity="center" android:text="@string/login_get_captcha" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp"/> @@ -112,7 +112,7 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:textColor="@color/black" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -147,7 +147,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="阅读并同意《用户协议》和《隐私政策》" /> diff --git a/app/src/main/res/layout/fragment_moderator_list.xml b/app/src/main/res/layout/fragment_moderator_list.xml index d2542d46a9..83fcd73520 100644 --- a/app/src/main/res/layout/fragment_moderator_list.xml +++ b/app/src/main/res/layout/fragment_moderator_list.xml @@ -88,7 +88,7 @@ android:layout_marginTop="20dp" android:gravity="center" android:text="@string/no_data" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/fragment_my_game_collection_list.xml b/app/src/main/res/layout/fragment_my_game_collection_list.xml index 3fadd3a3fa..5081265a4b 100644 --- a/app/src/main/res/layout/fragment_my_game_collection_list.xml +++ b/app/src/main/res/layout/fragment_my_game_collection_list.xml @@ -52,7 +52,7 @@ android:gravity="center" android:lineSpacingExtra="4dp" android:text="你还没有游戏单\n快点创建一个吧 ～" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_new_personal.xml b/app/src/main/res/layout/fragment_new_personal.xml index 211c18ba2b..7c637fefce 100644 --- a/app/src/main/res/layout/fragment_new_personal.xml +++ b/app/src/main/res/layout/fragment_new_personal.xml @@ -248,7 +248,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="4dp" android:text="@string/receive_energy" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="11sp" /> @@ -339,7 +339,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/energy_house" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="11sp" /> @@ -362,7 +362,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/energy_record" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/fragment_package_check.xml b/app/src/main/res/layout/fragment_package_check.xml index 695ba1190c..bfc7f1e466 100644 --- a/app/src/main/res/layout/fragment_package_check.xml +++ b/app/src/main/res/layout/fragment_package_check.xml @@ -18,7 +18,7 @@ android:drawableLeft="@drawable/ic_dialog_tips" android:drawablePadding="4dp" android:text="温馨提示" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -34,7 +34,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="安装当前游戏需要配置谷歌三件套，正在为您检测是否已安装" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -85,7 +85,7 @@ android:layout_marginTop="12dp" android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/contentContainer" @@ -137,7 +137,7 @@ android:paddingTop="6dp" android:paddingBottom="6dp" android:text="取消" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/download_btn" /> diff --git a/app/src/main/res/layout/fragment_package_skip.xml b/app/src/main/res/layout/fragment_package_skip.xml index 1a1f9f46fe..8155b65ed6 100644 --- a/app/src/main/res/layout/fragment_package_skip.xml +++ b/app/src/main/res/layout/fragment_package_skip.xml @@ -41,7 +41,7 @@ android:layout_marginLeft="4dp" android:includeFontPadding="false" android:text="光环助手" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="为您找到" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_qa_category.xml b/app/src/main/res/layout/fragment_qa_category.xml index f695589d69..982c82417e 100644 --- a/app/src/main/res/layout/fragment_qa_category.xml +++ b/app/src/main/res/layout/fragment_qa_category.xml @@ -4,7 +4,7 @@ + android:background="@color/background"> @@ -129,8 +129,8 @@ android:hint="请输入本人真实身份证号码" android:padding="8dp" android:singleLine="true" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/idCardTv" /> @@ -169,7 +169,7 @@ android:background="@drawable/button_round_f5f5f5" android:gravity="center" android:text="补充完善实名信息（仅限一次）" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_search_default.xml b/app/src/main/res/layout/fragment_search_default.xml index 1f73e69e92..7760d685db 100644 --- a/app/src/main/res/layout/fragment_search_default.xml +++ b/app/src/main/res/layout/fragment_search_default.xml @@ -44,7 +44,7 @@ android:drawableLeft="@drawable/search_history_delete" android:drawablePadding="4dp" android:text="@string/search_history_clean" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/history_title" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_search_game.xml b/app/src/main/res/layout/fragment_search_game.xml index 462a6ea270..4eeccead61 100644 --- a/app/src/main/res/layout/fragment_search_game.xml +++ b/app/src/main/res/layout/fragment_search_game.xml @@ -36,7 +36,7 @@ android:paddingLeft="38dp" android:paddingRight="12dp" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textColorHint="@color/text_C1BFC9" android:textCursorDrawable="@drawable/cursor_color" android:textSize="12sp" @@ -106,7 +106,7 @@ android:gravity="center_horizontal" android:paddingTop="204dp" android:text="搜索好玩的游戏，加入我的游戏单" - android:textColor="@color/text_cccccc" /> + android:textColor="@color/text_body" /> @@ -42,7 +42,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginLeft="20dp" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index a5e2567417..d0320e80c2 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/setting_security" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -218,7 +218,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/setting_usage_stats" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -286,7 +286,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/setting_personal_recommend" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="15sp" /> @@ -322,7 +322,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="@string/setting_user_protocol" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="15sp" /> @@ -340,7 +340,7 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:text="@string/setting_privacy_policy" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_simulator_game.xml b/app/src/main/res/layout/fragment_simulator_game.xml index a784d59472..1f7a4f3b24 100644 --- a/app/src/main/res/layout/fragment_simulator_game.xml +++ b/app/src/main/res/layout/fragment_simulator_game.xml @@ -63,7 +63,7 @@ android:layout_marginTop="20dp" android:gravity="center" android:text="@string/no_data" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="15sp" /> + android:background="@color/background" /> diff --git a/app/src/main/res/layout/fragment_user_game.xml b/app/src/main/res/layout/fragment_user_game.xml index a196bd0068..62c122b77b 100644 --- a/app/src/main/res/layout/fragment_user_game.xml +++ b/app/src/main/res/layout/fragment_user_game.xml @@ -41,7 +41,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:text="玩过" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" /> @@ -67,7 +67,7 @@ android:paddingTop="6dp" android:paddingLeft="16dp" android:paddingRight="28dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:text="全部" /> diff --git a/app/src/main/res/layout/fragment_user_history.xml b/app/src/main/res/layout/fragment_user_history.xml index f0e433cfa9..a3c4a705f4 100644 --- a/app/src/main/res/layout/fragment_user_history.xml +++ b/app/src/main/res/layout/fragment_user_history.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="全部内容(12)" /> @@ -56,7 +56,7 @@ android:layout_marginRight="4dp" android:includeFontPadding="false" android:text="筛选" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> + android:textColor="@color/text_title" /> @@ -361,7 +361,7 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:text="身份证号" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -402,7 +402,7 @@ android:layout_marginTop="16dp" android:paddingLeft="18dp" android:paddingRight="18dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:lineSpacingExtra="4dp" tools:text="@string/userinfo_edit_id_card_explain" /> diff --git a/app/src/main/res/layout/fragment_video_comment_list.xml b/app/src/main/res/layout/fragment_video_comment_list.xml index c3e0794760..b21d4ae471 100644 --- a/app/src/main/res/layout/fragment_video_comment_list.xml +++ b/app/src/main/res/layout/fragment_video_comment_list.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="全部评论" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" /> + android:textColor="@color/text_subtitleDesc" /> + app:placeholderImage="@color/background" /> @@ -192,8 +192,8 @@ android:hint="描述下视频内容~" android:maxLength="200" android:minHeight="60dp" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -217,7 +217,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="参与活动" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -242,7 +242,7 @@ android:layout_width="0dp" android:layout_height="0.5dp" android:layout_marginLeft="26dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/chooseActivityContainer" /> @@ -262,7 +262,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="内容来源" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -306,8 +306,8 @@ android:gravity="center_vertical" android:hint="注明内容来源网址(如http://www.xx.com//vvv)" android:padding="12dp" - android:textColor="@color/text_666666" - android:textColorHint="@color/text_cccccc" + android:textColor="@color/text_subtitle" + android:textColorHint="@color/text_body" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_video_setting.xml b/app/src/main/res/layout/fragment_video_setting.xml index 6ab5480065..b559f52542 100644 --- a/app/src/main/res/layout/fragment_video_setting.xml +++ b/app/src/main/res/layout/fragment_video_setting.xml @@ -15,7 +15,7 @@ android:layout_height="36dp" android:paddingLeft="20dp" android:gravity="center_vertical" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:text="内容视频" /> @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/all_network_auto_play" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="@string/all_network_auto_play" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/gallery_video_item.xml b/app/src/main/res/layout/gallery_video_item.xml index 4c50ed41a7..ab73959032 100644 --- a/app/src/main/res/layout/gallery_video_item.xml +++ b/app/src/main/res/layout/gallery_video_item.xml @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:lineSpacingExtra="4dp" android:maxLines="2" diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml index cbd3d7c049..9fd03e3869 100644 --- a/app/src/main/res/layout/game_attach_item.xml +++ b/app/src/main/res/layout/game_attach_item.xml @@ -43,7 +43,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/game_tags" diff --git a/app/src/main/res/layout/game_collection_detail_divider_item.xml b/app/src/main/res/layout/game_collection_detail_divider_item.xml index e77d50014a..6649173712 100644 --- a/app/src/main/res/layout/game_collection_detail_divider_item.xml +++ b/app/src/main/res/layout/game_collection_detail_divider_item.xml @@ -2,4 +2,4 @@ \ No newline at end of file + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_detail_none_game_item.xml b/app/src/main/res/layout/game_collection_detail_none_game_item.xml index 88e7cee78c..8cbcbadee0 100644 --- a/app/src/main/res/layout/game_collection_detail_none_game_item.xml +++ b/app/src/main/res/layout/game_collection_detail_none_game_item.xml @@ -20,6 +20,6 @@ android:layout_marginTop="20dp" android:gravity="center" android:text="哎呀，游戏都不见了 ～" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_detail_video_item.xml b/app/src/main/res/layout/game_collection_detail_video_item.xml index a1fa98f2df..a6b75b3778 100644 --- a/app/src/main/res/layout/game_collection_detail_video_item.xml +++ b/app/src/main/res/layout/game_collection_detail_video_item.xml @@ -51,7 +51,7 @@ android:includeFontPadding="false" android:maxLines="2" android:lineSpacingExtra="2dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="20sp" android:text="@{entity.title}" @@ -97,7 +97,7 @@ android:layout_weight="1" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="游戏单简介：眼花缭乱的众多游戏～" /> @@ -114,7 +114,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="23dp" - android:background="@color/EEEEEE" + android:background="@color/divider" app:layout_constraintTop_toBottomOf="@+id/videoDesContainer"/> @@ -175,7 +175,7 @@ android:id="@+id/tagDividerBottom" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/EEEEEE" + android:background="@color/divider" app:layout_constraintTop_toBottomOf="@+id/playedContainer"/> diff --git a/app/src/main/res/layout/game_collection_game_item.xml b/app/src/main/res/layout/game_collection_game_item.xml index 7b3131c0aa..97088c4052 100644 --- a/app/src/main/res/layout/game_collection_game_item.xml +++ b/app/src/main/res/layout/game_collection_game_item.xml @@ -53,7 +53,7 @@ android:lineSpacingExtra="8dp" android:ellipsize="end" android:maxLines="3" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@{game.recommendText}" tools:text="跑跑卡丁车的手游版作为一部致敬经典的作品，在人物和地图上都有基本还原端游，但是手感有些区别" diff --git a/app/src/main/res/layout/game_detail_info.xml b/app/src/main/res/layout/game_detail_info.xml index 1d350a18cd..506b9a59fa 100644 --- a/app/src/main/res/layout/game_detail_info.xml +++ b/app/src/main/res/layout/game_detail_info.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="详细信息" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -80,7 +80,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="2dp" android:text="个人信息及用途等说明可在隐私政策中查看" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/game_gallery_item.xml b/app/src/main/res/layout/game_gallery_item.xml index 81a659ce2b..856be9b5ba 100644 --- a/app/src/main/res/layout/game_gallery_item.xml +++ b/app/src/main/res/layout/game_gallery_item.xml @@ -34,7 +34,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="8dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/game_gallery_list.xml b/app/src/main/res/layout/game_gallery_list.xml index b2e56ead3f..19ed50bb39 100644 --- a/app/src/main/res/layout/game_gallery_list.xml +++ b/app/src/main/res/layout/game_gallery_list.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" android:layout_marginLeft="20dp" @@ -42,7 +42,7 @@ android:drawablePadding="2dp" android:text="更多" android:layout_marginRight="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/titleTv" diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index 4e5687a4c3..405b41e834 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:includeFontPadding="false" android:text="@{subject.filterName}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" android:maxLines="1" diff --git a/app/src/main/res/layout/game_horizontal_item.xml b/app/src/main/res/layout/game_horizontal_item.xml index 6822f00d35..13da25ed46 100644 --- a/app/src/main/res/layout/game_horizontal_item.xml +++ b/app/src/main/res/layout/game_horizontal_item.xml @@ -96,7 +96,7 @@ android:layout_marginBottom="8dp" android:includeFontPadding="false" android:text="@{game.assignRemark.secondLine}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -123,7 +123,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="10dp" - android:background="@color/text_F5F5F5" + android:background="@color/background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/game_horizontal_list.xml b/app/src/main/res/layout/game_horizontal_list.xml index 61350c7d7f..56b88521f2 100644 --- a/app/src/main/res/layout/game_horizontal_list.xml +++ b/app/src/main/res/layout/game_horizontal_list.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="37dp" - android:background="@color/text_F5F5F5" + android:background="@color/background" android:visibility="gone" app:layout_constraintTop_toTopOf="@id/horizontal_rv" /> diff --git a/app/src/main/res/layout/game_horizontal_simple_item.xml b/app/src/main/res/layout/game_horizontal_simple_item.xml index 58bc3f7296..ad93adb830 100644 --- a/app/src/main/res/layout/game_horizontal_simple_item.xml +++ b/app/src/main/res/layout/game_horizontal_simple_item.xml @@ -32,7 +32,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="超杀默示录" /> diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index d977d6515e..6e6ce11fc4 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" @@ -172,7 +172,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{game.decoratedDes}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" tools:text="巫妖王再怒霜之哀殤又飢渴" app:layout_constraintTop_toTopOf="@+id/gameDesSpace" @@ -187,7 +187,7 @@ android:ellipsize="end" android:singleLine="true" android:text="@string/game_downloading_formattable" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="9sp" app:layout_constraintTop_toTopOf="@+id/gameDesSpace" app:layout_constraintBottom_toTopOf="@+id/game_progressbar" @@ -282,7 +282,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:text="推荐指数：" app:layout_constraintLeft_toLeftOf="@+id/gameDesSpace" diff --git a/app/src/main/res/layout/game_latest_service_list.xml b/app/src/main/res/layout/game_latest_service_list.xml index 1476d8a976..1291ae69c0 100644 --- a/app/src/main/res/layout/game_latest_service_list.xml +++ b/app/src/main/res/layout/game_latest_service_list.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="最新开服" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:includeFontPadding="false" android:textStyle="bold" @@ -53,7 +53,7 @@ android:drawableRight="@drawable/ic_right_arrow_darker" android:drawablePadding="2dp" android:text="更多" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" @@ -87,7 +87,7 @@ android:drawableLeft="@drawable/ic_open_service_tips" android:drawablePadding="4dp" android:text="请以游戏内实际开服为准" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/game_permission_dialog.xml b/app/src/main/res/layout/game_permission_dialog.xml index 5fc703f015..f2f0b2890b 100644 --- a/app/src/main/res/layout/game_permission_dialog.xml +++ b/app/src/main/res/layout/game_permission_dialog.xml @@ -38,7 +38,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -56,7 +56,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -73,7 +73,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -106,7 +106,7 @@ android:layout_marginLeft="12dp" android:layout_toRightOf="@id/privacyIv" android:text="隐私政策" - android:textColor="@color/text_333333" /> + android:textColor="@color/text_title" /> @@ -134,7 +134,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="9dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/text" /> @@ -155,7 +155,7 @@ android:id="@+id/line2" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/permissionsRv" /> diff --git a/app/src/main/res/layout/game_permission_item.xml b/app/src/main/res/layout/game_permission_item.xml index 706912a462..94f62d8b62 100644 --- a/app/src/main/res/layout/game_permission_item.xml +++ b/app/src/main/res/layout/game_permission_item.xml @@ -24,7 +24,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/hintIv" diff --git a/app/src/main/res/layout/game_pluggable_item.xml b/app/src/main/res/layout/game_pluggable_item.xml index c67f891259..458236b6ab 100644 --- a/app/src/main/res/layout/game_pluggable_item.xml +++ b/app/src/main/res/layout/game_pluggable_item.xml @@ -21,7 +21,7 @@ android:layout_marginBottom="8dp" android:padding="4dp" android:text="不再提醒" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index 1a6b57dfcc..6d38bb3775 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -43,7 +43,7 @@ android:includeFontPadding="false" android:lineSpacingMultiplier="0.9" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/game_update_content.xml b/app/src/main/res/layout/game_update_content.xml index 29dfd00c4d..7b68f04480 100644 --- a/app/src/main/res/layout/game_update_content.xml +++ b/app/src/main/res/layout/game_update_content.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="更新内容" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:includeFontPadding="false" android:textStyle="bold" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginTop="7dp" android:textSize="13sp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:maxLines="4" android:lineSpacingExtra="4dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index 110377fd2d..5502141900 100644 --- a/app/src/main/res/layout/gamedetail_body.xml +++ b/app/src/main/res/layout/gamedetail_body.xml @@ -125,7 +125,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="2dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" tools:text="地海争霸2" /> @@ -196,7 +196,7 @@ android:includeFontPadding="false" android:maxLines="1" android:padding="4dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" tools:text="游戏大事件游戏大事件" diff --git a/app/src/main/res/layout/gamedetail_item_comments.xml b/app/src/main/res/layout/gamedetail_item_comments.xml index fec5900b0b..52bf232868 100644 --- a/app/src/main/res/layout/gamedetail_item_comments.xml +++ b/app/src/main/res/layout/gamedetail_item_comments.xml @@ -32,7 +32,7 @@ android:gravity="center_vertical" android:text="玩家评论" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:paddingBottom="13dp" android:textSize="18sp" android:textStyle="bold" /> @@ -53,7 +53,7 @@ android:layout_marginRight="2dp" android:layout_toLeftOf="@id/iv_all" android:text="更多" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_custom_column.xml b/app/src/main/res/layout/gamedetail_item_custom_column.xml index 309411f6a3..560dd6b2e1 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column.xml @@ -53,7 +53,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" /> @@ -112,7 +112,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{customColumn.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -133,7 +133,7 @@ android:layout_marginRight="8dp" android:maxLines="1" android:text="@{customColumn.nameLink.value}" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/linkHintIv" @@ -160,7 +160,7 @@ android:maxWidth="74dp" android:maxLines="1" android:text="@{customColumn.link.value}" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/linkHintArrowIv" @@ -225,7 +225,7 @@ android:lineSpacingExtra="4dp" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" android:visibility="gone" app:endText="... " diff --git a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml index d8850ec614..aa3eef97f1 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml @@ -16,7 +16,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" tools:text="sample" /> diff --git a/app/src/main/res/layout/gamedetail_item_image.xml b/app/src/main/res/layout/gamedetail_item_image.xml index 0549ff5c12..dbefbdf222 100644 --- a/app/src/main/res/layout/gamedetail_item_image.xml +++ b/app/src/main/res/layout/gamedetail_item_image.xml @@ -32,7 +32,7 @@ android:layout_centerVertical="true" android:gravity="center_vertical" android:text="@{link.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" android:includeFontPadding="false" diff --git a/app/src/main/res/layout/help_category_item.xml b/app/src/main/res/layout/help_category_item.xml index 0c32df23e7..b265a3c582 100644 --- a/app/src/main/res/layout/help_category_item.xml +++ b/app/src/main/res/layout/help_category_item.xml @@ -23,7 +23,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/help_item.xml b/app/src/main/res/layout/help_item.xml index fb2f38e37c..ee04287a9c 100644 --- a/app/src/main/res/layout/help_item.xml +++ b/app/src/main/res/layout/help_item.xml @@ -10,7 +10,7 @@ android:id="@+id/topLine" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:visibility="gone" /> @@ -31,6 +31,6 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/text_f5f5f5" /> + android:background="@color/background" /> diff --git a/app/src/main/res/layout/help_qa_category_item.xml b/app/src/main/res/layout/help_qa_category_item.xml index 455a1a5ce5..79c25d47a8 100644 --- a/app/src/main/res/layout/help_qa_category_item.xml +++ b/app/src/main/res/layout/help_qa_category_item.xml @@ -18,7 +18,7 @@ android:id="@+id/topLine" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:visibility="gone" /> @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="更多 >" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> @@ -73,7 +73,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="24dp" android:layout_marginBottom="24dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/categoryContainer" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/home_amway_item.xml b/app/src/main/res/layout/home_amway_item.xml index 54146cd960..b81321ff5f 100644 --- a/app/src/main/res/layout/home_amway_item.xml +++ b/app/src/main/res/layout/home_amway_item.xml @@ -50,7 +50,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{data.game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/game_icon" @@ -121,7 +121,7 @@ android:lineSpacingMultiplier="1.3" android:maxLines="3" android:minLines="3" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -164,7 +164,7 @@ android:maxWidth="96dp" android:singleLine="true" android:text="@{data.comment.user.name}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" app:layout_constraintLeft_toRightOf="@id/user_icon_container" @@ -187,7 +187,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:text="评分：" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" @@ -219,7 +219,7 @@ android:background="@drawable/home_amway_selector" android:gravity="center" android:text="全部" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/amway_background" diff --git a/app/src/main/res/layout/home_divider_item.xml b/app/src/main/res/layout/home_divider_item.xml index f488e09b14..72be4e6137 100644 --- a/app/src/main/res/layout/home_divider_item.xml +++ b/app/src/main/res/layout/home_divider_item.xml @@ -13,7 +13,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="@dimen/home_item_padding" android:layout_marginRight="@dimen/home_item_padding" - android:background="@color/text_F5F5F5" + android:background="@color/background" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/home_game_item.xml b/app/src/main/res/layout/home_game_item.xml index 4c732c42d9..d0cc84e82a 100644 --- a/app/src/main/res/layout/home_game_item.xml +++ b/app/src/main/res/layout/home_game_item.xml @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{data.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/game_icon_container" @@ -126,7 +126,7 @@ android:includeFontPadding="false" android:orientation="horizontal" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:paddingTop="12dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/home_recommend_item.xml b/app/src/main/res/layout/home_recommend_item.xml index adac83d343..bb17d0328e 100644 --- a/app/src/main/res/layout/home_recommend_item.xml +++ b/app/src/main/res/layout/home_recommend_item.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@{list.size > 0?list.get(0).name:`推荐入口`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="分类" /> @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@{list.size > 1?list.get(1).name:`推荐入口`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="分类" /> @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@{list.size > 2?list.get(2).name:`推荐入口`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="分类" /> @@ -139,7 +139,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@{list.size > 3?list.get(3).name:`推荐入口`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="分类" /> @@ -170,7 +170,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@{list.size > 4?list.get(4).name:`推荐入口`}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="分类" /> diff --git a/app/src/main/res/layout/hot_forum_item.xml b/app/src/main/res/layout/hot_forum_item.xml index a406056bb3..778d0780ba 100644 --- a/app/src/main/res/layout/hot_forum_item.xml +++ b/app/src/main/res/layout/hot_forum_item.xml @@ -32,7 +32,7 @@ android:maxLines="1" android:ellipsize="end" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@{entity.name}" app:layout_constraintTop_toTopOf="@+id/forumIv" diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml index f9f4c4b3ad..a3d892241c 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -53,7 +53,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{comment.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@+id/authorHintTv" @@ -109,7 +109,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="@{comment.user.badge.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -138,7 +138,7 @@ android:layout_marginTop="3dp" android:includeFontPadding="false" android:text="@{CommentUtils.getCommentTime(comment.time)}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toEndOf="@+id/topLabelIv" app:layout_constraintTop_toBottomOf="@id/userNameTv" @@ -210,7 +210,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginRight="16dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:orientation="vertical" android:paddingLeft="12dp" android:paddingTop="8dp" @@ -229,7 +229,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dp" android:maxLines="2" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> @@ -241,7 +241,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dp" android:maxLines="2" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> @@ -254,7 +254,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="查看更多回复" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> @@ -264,7 +264,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintStart_toStartOf="@id/userInfoContainer" @@ -295,7 +295,7 @@ android:drawableLeft="@drawable/comment_vote_unselect" android:drawablePadding="4dp" android:gravity="center_vertical" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/floorHintTv" app:layout_constraintEnd_toEndOf="parent" @@ -310,7 +310,7 @@ android:drawableLeft="@drawable/ic_article_detail_comment_list" android:drawablePadding="4dp" android:gravity="center_vertical" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/floorHintTv" app:layout_constraintEnd_toStartOf="@id/likeCountTv" @@ -334,7 +334,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/EEEEEE" + android:background="@color/divider" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_article_detail_comment_empty.xml b/app/src/main/res/layout/item_article_detail_comment_empty.xml index 1bc3a874a7..b7cb42bd21 100644 --- a/app/src/main/res/layout/item_article_detail_comment_empty.xml +++ b/app/src/main/res/layout/item_article_detail_comment_empty.xml @@ -18,6 +18,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/article_detail_empty_comment" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_article_detail_content.xml b/app/src/main/res/layout/item_article_detail_content.xml index 8527f6940c..2abec6ba8a 100644 --- a/app/src/main/res/layout/item_article_detail_content.xml +++ b/app/src/main/res/layout/item_article_detail_content.xml @@ -44,7 +44,7 @@ android:layout_marginLeft="3dp" android:includeFontPadding="false" android:maxLength="12" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/badgeContainer" @@ -82,7 +82,7 @@ android:layout_marginLeft="4dp" android:gravity="center_vertical" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/badgeIv" @@ -103,7 +103,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="9dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@id/userIconIv" app:layout_constraintLeft_toRightOf="@id/userIconIv" @@ -115,7 +115,7 @@ android:layout_height="28dp" android:layout_marginRight="16dp" android:gravity="center" - android:textColor="@color/text_1383EB" + android:textColor="@color/theme_font" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/userIconIv" @@ -139,7 +139,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_centerVertical="true" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -166,7 +166,7 @@ android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="12dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="这是一个很长很长很长很长很长很长很长很长很长很长的标题" /> @@ -239,7 +239,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="元气骑士" /> diff --git a/app/src/main/res/layout/item_choose_games.xml b/app/src/main/res/layout/item_choose_games.xml index 8e50b6418b..cae5594e0d 100644 --- a/app/src/main/res/layout/item_choose_games.xml +++ b/app/src/main/res/layout/item_choose_games.xml @@ -35,7 +35,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/gameIcon" app:layout_constraintTop_toTopOf="@+id/gameIcon" @@ -48,7 +48,7 @@ android:layout_marginTop="6dp" android:includeFontPadding="false" android:text="选择推荐指数：" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintStart_toEndOf="@+id/gameIcon" app:layout_constraintTop_toBottomOf="@+id/gameNameTv" /> @@ -110,8 +110,8 @@ android:background="@null" android:gravity="top|left" android:hint="填写你的推荐理由（45个字以内）" - android:textColor="@color/text_333333" - android:textColorHint="@color/text_999999" + android:textColor="@color/text_title" + android:textColorHint="@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_detail_more_menu.xml b/app/src/main/res/layout/item_detail_more_menu.xml index 79bde193d8..0960bd709d 100644 --- a/app/src/main/res/layout/item_detail_more_menu.xml +++ b/app/src/main/res/layout/item_detail_more_menu.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="加精" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:layout_marginRight="24dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_device_remind_banner.xml b/app/src/main/res/layout/item_device_remind_banner.xml index 4a24a88328..39309e07d1 100644 --- a/app/src/main/res/layout/item_device_remind_banner.xml +++ b/app/src/main/res/layout/item_device_remind_banner.xml @@ -5,5 +5,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImageScaleType="fitXY" - app:roundingBorderColor="@color/text_f5f5f5" + app:roundingBorderColor="@color/background" app:roundingBorderWidth="1dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_followed_game.xml b/app/src/main/res/layout/item_followed_game.xml index d6aef37eba..c22da97ab6 100644 --- a/app/src/main/res/layout/item_followed_game.xml +++ b/app/src/main/res/layout/item_followed_game.xml @@ -30,7 +30,7 @@ android:layout_height="2px" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/text_f5f5f5" /> + android:background="@color/background" /> @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="专区" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="评论" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_forum_follow.xml b/app/src/main/res/layout/item_forum_follow.xml index fc051be0d1..b2d3f5ce03 100644 --- a/app/src/main/res/layout/item_forum_follow.xml +++ b/app/src/main/res/layout/item_forum_follow.xml @@ -39,7 +39,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_forum_video.xml b/app/src/main/res/layout/item_forum_video.xml index 21f427b325..f476746c62 100644 --- a/app/src/main/res/layout/item_forum_video.xml +++ b/app/src/main/res/layout/item_forum_video.xml @@ -70,7 +70,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{video.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/video_poster" app:layout_constraintTop_toTopOf="@+id/video_poster" /> @@ -82,7 +82,7 @@ android:layout_marginTop="4dp" android:includeFontPadding="false" android:text="@{video.user.name}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/video_poster" @@ -96,7 +96,7 @@ android:layout_marginBottom="2dp" android:includeFontPadding="false" android:text="@{`点赞 `+ video.count.vote +` · ` + `评论 ` + video.count.comment}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@+id/video_poster" app:layout_constraintStart_toEndOf="@+id/video_poster" /> diff --git a/app/src/main/res/layout/item_game_detail_big_event.xml b/app/src/main/res/layout/item_game_detail_big_event.xml index db2e585332..da2693d531 100644 --- a/app/src/main/res/layout/item_game_detail_big_event.xml +++ b/app/src/main/res/layout/item_game_detail_big_event.xml @@ -13,7 +13,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:textSize="12sp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:text="2020-01-01" tools:text="2020-01-01" /> @@ -26,7 +26,7 @@ app:layout_constraintTop_toTopOf="@+id/timeTv" android:textSize="14sp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:text="预下载已开启，将于1月8日上午10点正式上线.预下载已开启，将于1月8日上午10点正式上线" tools:text="预下载已开启，将于1月8日上午10点正式上线"/> diff --git a/app/src/main/res/layout/item_game_detail_comment_more.xml b/app/src/main/res/layout/item_game_detail_comment_more.xml index e4449889ed..12b2d10180 100644 --- a/app/src/main/res/layout/item_game_detail_comment_more.xml +++ b/app/src/main/res/layout/item_game_detail_comment_more.xml @@ -16,6 +16,6 @@ android:text="查看全部评论" android:drawablePadding="5dp" android:textSize="12sp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:drawableRight="@drawable/ic_game_detail_arrow_right"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_game_tag.xml b/app/src/main/res/layout/item_game_detail_game_tag.xml index eeec0b3591..fbe2a7a526 100644 --- a/app/src/main/res/layout/item_game_detail_game_tag.xml +++ b/app/src/main/res/layout/item_game_detail_game_tag.xml @@ -15,7 +15,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:text="全局加速" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/item_game_detail_rating_comment.xml b/app/src/main/res/layout/item_game_detail_rating_comment.xml index e54919e476..365180ef3f 100644 --- a/app/src/main/res/layout/item_game_detail_rating_comment.xml +++ b/app/src/main/res/layout/item_game_detail_rating_comment.xml @@ -42,7 +42,7 @@ android:layout_width="32dp" android:layout_height="32dp" app:roundAsCircle="true" - app:roundingBorderColor="@color/text_eeeeee" + app:roundingBorderColor="@color/divider" app:roundingBorderWidth="1dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_libao.xml b/app/src/main/res/layout/item_game_libao.xml index 238973f5a2..485e40fb97 100644 --- a/app/src/main/res/layout/item_game_libao.xml +++ b/app/src/main/res/layout/item_game_libao.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:drawableLeft="@drawable/ic_game_detail_libao" android:drawablePadding="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="礼包码：-" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -94,7 +94,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginRight="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintEnd_toStartOf="@+id/receiveTv" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_game_raiders.xml b/app/src/main/res/layout/item_game_raiders.xml index 81ea773774..e0db28dbfc 100644 --- a/app/src/main/res/layout/item_game_raiders.xml +++ b/app/src/main/res/layout/item_game_raiders.xml @@ -18,7 +18,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -33,7 +33,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="14dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:layout_marginBottom="8dp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -55,7 +55,7 @@ android:id="@+id/timeTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_game_raiders_fixed_top.xml b/app/src/main/res/layout/item_game_raiders_fixed_top.xml index 939099a99d..af04379670 100644 --- a/app/src/main/res/layout/item_game_raiders_fixed_top.xml +++ b/app/src/main/res/layout/item_game_raiders_fixed_top.xml @@ -28,7 +28,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dp" android:maxLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -42,7 +42,7 @@ android:layout_marginLeft="12dp" android:layout_marginBottom="10dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/item_game_upload_label.xml b/app/src/main/res/layout/item_game_upload_label.xml index 3c9e6987c8..29c62ba8eb 100644 --- a/app/src/main/res/layout/item_game_upload_label.xml +++ b/app/src/main/res/layout/item_game_upload_label.xml @@ -17,7 +17,7 @@ android:paddingTop="4dp" android:paddingRight="5dp" android:paddingBottom="4dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="10sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_history_apk.xml b/app/src/main/res/layout/item_history_apk.xml index e29cabbfc8..8f94d8b1d4 100644 --- a/app/src/main/res/layout/item_history_apk.xml +++ b/app/src/main/res/layout/item_history_apk.xml @@ -37,7 +37,7 @@ android:id="@+id/versionTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/downloadBtn" app:layout_constraintLeft_toLeftOf="parent" @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/downloadBtn" app:layout_constraintLeft_toRightOf="@id/versionTv" @@ -65,7 +65,7 @@ android:lineSpacingExtra="4dp" android:maxLines="3" android:text="@{apk.updateDesc}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:endText="... " app:expandText="展开" diff --git a/app/src/main/res/layout/item_home_played_game.xml b/app/src/main/res/layout/item_home_played_game.xml index be3dd8c9b9..4d29517d4c 100644 --- a/app/src/main/res/layout/item_home_played_game.xml +++ b/app/src/main/res/layout/item_home_played_game.xml @@ -29,7 +29,7 @@ android:singleLine="true" android:ellipsize="end" android:text="@{game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="科尔暑假的召唤" /> diff --git a/app/src/main/res/layout/item_moderator_task.xml b/app/src/main/res/layout/item_moderator_task.xml index fdb84a4485..94d8df6dc9 100644 --- a/app/src/main/res/layout/item_moderator_task.xml +++ b/app/src/main/res/layout/item_moderator_task.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="通过礼仪考试" /> @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="活跃度=发帖数量+回帖数量+回复数量≥20" /> diff --git a/app/src/main/res/layout/item_my_game_rating.xml b/app/src/main/res/layout/item_my_game_rating.xml index b62a7e66e8..2f96abeb03 100644 --- a/app/src/main/res/layout/item_my_game_rating.xml +++ b/app/src/main/res/layout/item_my_game_rating.xml @@ -63,7 +63,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{rating.game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" fresco:text="冒险岛3" /> @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="我的评分：" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -147,7 +147,7 @@ android:includeFontPadding="false" android:lineSpacingMultiplier="1.5" android:maxLines="3" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:endText="... " app:expandText="全部" diff --git a/app/src/main/res/layout/item_new_personal_fun_group.xml b/app/src/main/res/layout/item_new_personal_fun_group.xml index e86f0cea28..fb566200f9 100644 --- a/app/src/main/res/layout/item_new_personal_fun_group.xml +++ b/app/src/main/res/layout/item_new_personal_fun_group.xml @@ -12,7 +12,7 @@ android:id="@+id/tv_group_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="常用功能" /> diff --git a/app/src/main/res/layout/item_personal_fun_group.xml b/app/src/main/res/layout/item_personal_fun_group.xml index eeeb97c51d..7a9b336a41 100644 --- a/app/src/main/res/layout/item_personal_fun_group.xml +++ b/app/src/main/res/layout/item_personal_fun_group.xml @@ -14,7 +14,7 @@ android:id="@+id/tv_group_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="常用功能" /> diff --git a/app/src/main/res/layout/item_personal_func.xml b/app/src/main/res/layout/item_personal_func.xml index b468f68f43..dbede339de 100644 --- a/app/src/main/res/layout/item_personal_func.xml +++ b/app/src/main/res/layout/item_personal_func.xml @@ -21,7 +21,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="8dp" android:maxLength="12" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" fresco:text="我的游戏" /> diff --git a/app/src/main/res/layout/item_rating_edit_comment.xml b/app/src/main/res/layout/item_rating_edit_comment.xml index 5ad1197d08..478a7ff070 100644 --- a/app/src/main/res/layout/item_rating_edit_comment.xml +++ b/app/src/main/res/layout/item_rating_edit_comment.xml @@ -28,7 +28,7 @@ android:gravity="top" android:includeFontPadding="false" android:lineSpacingMultiplier="1.2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textColorHint="@color/hint" android:textCursorDrawable="@drawable/cursor_color" android:textSize="13sp" /> diff --git a/app/src/main/res/layout/item_report_reason.xml b/app/src/main/res/layout/item_report_reason.xml index 5999270b93..c5a693cd8d 100644 --- a/app/src/main/res/layout/item_report_reason.xml +++ b/app/src/main/res/layout/item_report_reason.xml @@ -9,7 +9,7 @@ android:layout_height="54dp" android:gravity="center_vertical" android:text="@string/report_reason_other" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_updatable_game.xml b/app/src/main/res/layout/item_updatable_game.xml index ea7a8c2434..cd1c61e499 100644 --- a/app/src/main/res/layout/item_updatable_game.xml +++ b/app/src/main/res/layout/item_updatable_game.xml @@ -56,7 +56,7 @@ android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="跑跑卡丁车" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="当前：V2.0.0" /> @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="最新：V2.2.6 | 67.9M" /> diff --git a/app/src/main/res/layout/item_updatable_game_header.xml b/app/src/main/res/layout/item_updatable_game_header.xml index 3252d3edb0..9e7bb562b5 100644 --- a/app/src/main/res/layout/item_updatable_game_header.xml +++ b/app/src/main/res/layout/item_updatable_game_header.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:drawablePadding="3dp" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_user_comment_history.xml b/app/src/main/res/layout/item_user_comment_history.xml index be7d1b169a..b5042ed9ad 100644 --- a/app/src/main/res/layout/item_user_comment_history.xml +++ b/app/src/main/res/layout/item_user_comment_history.xml @@ -26,7 +26,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/EEEEEE" /> + android:background="@color/divider" /> @@ -79,7 +79,7 @@ android:text="0" android:drawablePadding="2dp" setVideoData="@{entity.yesterdayFan}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.play)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="0"/> @@ -122,7 +122,7 @@ android:layout_gravity="center_horizontal" android:text="0" setVideoData="@{entity.yesterdayPlay}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp"/> @@ -151,7 +151,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.vote)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -165,7 +165,7 @@ android:layout_gravity="center_horizontal" android:text="0" setVideoData="@{entity.yesterdayVote}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> @@ -196,7 +196,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.comment)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -210,7 +210,7 @@ android:layout_gravity="center_horizontal" android:text="0" setVideoData="@{entity.yesterdayComment}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> @@ -239,7 +239,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.share)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -253,7 +253,7 @@ android:layout_gravity="center_horizontal" android:text="0" setVideoData="@{entity.yesterdayShare}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> @@ -282,7 +282,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.favorite)}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -296,7 +296,7 @@ android:layout_gravity="center_horizontal" android:text="0" setVideoData="@{entity.yesterdayFavorite}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/item_video_desc_top.xml b/app/src/main/res/layout/item_video_desc_top.xml index a840a950de..e7c73bb8f5 100644 --- a/app/src/main/res/layout/item_video_desc_top.xml +++ b/app/src/main/res/layout/item_video_desc_top.xml @@ -42,7 +42,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="@{entity.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintStart_toEndOf="@+id/userAvatar" app:layout_constraintTop_toTopOf="@+id/userAvatar" @@ -69,7 +69,7 @@ android:layout_marginBottom="8dp" android:includeFontPadding="false" android:text="@{entity.user.count.fans +`粉丝 · `+ CommentUtils.getCommentTime(entity.time.upload)}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@+id/userAvatar" app:layout_constraintStart_toEndOf="@+id/userAvatar" /> @@ -82,7 +82,7 @@ android:background="@{entity.me.isFollower ? @drawable/bg_shape_f5_radius_999 : @drawable/button_round_edf5fc}" android:gravity="center" android:text="@{entity.me.isFollower ? `已关注` : `关注`}" - android:textColor="@{entity.me.isFollower ? @color/text_999999 : @color/theme_font}" + android:textColor="@{entity.me.isFollower ? @color/text_subtitleDesc : @color/theme_font}" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/userAvatar" app:layout_constraintEnd_toEndOf="parent" @@ -108,7 +108,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:text="@{entity.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constraintEnd_toStartOf="@+id/expandMoreIv" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -123,7 +123,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="7dp" android:text="@{entity.des}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -202,7 +202,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="@{entity.count.vote+``}" - android:textColor="@{entity.me.isVoted ? @color/theme_font : @color/text_999999}" + android:textColor="@{entity.me.isVoted ? @color/theme_font : @color/text_subtitleDesc}" android:textSize="12sp" /> @@ -232,7 +232,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="@{entity.count.favorite+``}" - android:textColor="@{entity.me.isVideoFavorite ? @color/theme_font :@color/text_999999}" + android:textColor="@{entity.me.isVideoFavorite ? @color/theme_font :@color/text_subtitleDesc}" android:textSize="12sp" /> @@ -263,7 +263,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="@{entity.share+``}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/kaifu_item_time.xml b/app/src/main/res/layout/kaifu_item_time.xml index 34d21b9d23..1a4f75c88c 100644 --- a/app/src/main/res/layout/kaifu_item_time.xml +++ b/app/src/main/res/layout/kaifu_item_time.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_dialog_panel_titlebar.xml b/app/src/main/res/layout/layout_dialog_panel_titlebar.xml index f2da310e4b..12603e0b47 100644 --- a/app/src/main/res/layout/layout_dialog_panel_titlebar.xml +++ b/app/src/main/res/layout/layout_dialog_panel_titlebar.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" tools:text="35条评论" /> diff --git a/app/src/main/res/layout/layout_game_detail_recommend_view.xml b/app/src/main/res/layout/layout_game_detail_recommend_view.xml index e1556b2df1..633cd8bd9d 100644 --- a/app/src/main/res/layout/layout_game_detail_recommend_view.xml +++ b/app/src/main/res/layout/layout_game_detail_recommend_view.xml @@ -25,7 +25,7 @@ android:maxWidth="104dp" android:maxLength="16" android:text="光环助手光环助手光环助手" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/layout_menu_article_detail.xml b/app/src/main/res/layout/layout_menu_article_detail.xml index a9a5e79964..3c6aba2481 100644 --- a/app/src/main/res/layout/layout_menu_article_detail.xml +++ b/app/src/main/res/layout/layout_menu_article_detail.xml @@ -9,7 +9,7 @@ android:layout_height = "24dp" android:layout_centerInParent = "true" android:gravity = "center" - android:textColor = "@color/text_1383EB" + android:textColor = "@color/theme_font" android:textSize = "12sp" android:text = "关注" /> diff --git a/app/src/main/res/layout/layout_popup_option_item.xml b/app/src/main/res/layout/layout_popup_option_item.xml index 77f05ccc7c..8ceb11d611 100644 --- a/app/src/main/res/layout/layout_popup_option_item.xml +++ b/app/src/main/res/layout/layout_popup_option_item.xml @@ -9,5 +9,5 @@ android:gravity = "center" android:orientation = "vertical" android:text = "修改" - android:textColor = "@color/text_666666" + android:textColor = "@color/text_subtitle" android:textSize = "12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_search_bar.xml b/app/src/main/res/layout/layout_search_bar.xml index 15bc5c1186..bd68e1ea48 100644 --- a/app/src/main/res/layout/layout_search_bar.xml +++ b/app/src/main/res/layout/layout_search_bar.xml @@ -29,7 +29,7 @@ android:paddingLeft="40dp" android:paddingRight="40dp" android:singleLine="true" - android:textColorHint="@color/text_cccccc" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" diff --git a/app/src/main/res/layout/layout_search_game_content_tag.xml b/app/src/main/res/layout/layout_search_game_content_tag.xml index cb2382e81b..f62cc69e74 100644 --- a/app/src/main/res/layout/layout_search_game_content_tag.xml +++ b/app/src/main/res/layout/layout_search_game_content_tag.xml @@ -20,7 +20,7 @@ android:layout_marginLeft="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" tools:text="礼包礼包礼包礼包" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_video_detail_surface.xml b/app/src/main/res/layout/layout_video_detail_surface.xml index 783cb017f6..0771482b95 100644 --- a/app/src/main/res/layout/layout_video_detail_surface.xml +++ b/app/src/main/res/layout/layout_video_detail_surface.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频加载失败" - android:textColor="@color/text_eeeeee" + android:textColor="@color/divider" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/libao_item.xml b/app/src/main/res/layout/libao_item.xml index 1143c250b7..59578379d0 100644 --- a/app/src/main/res/layout/libao_item.xml +++ b/app/src/main/res/layout/libao_item.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/libaodetail_rule" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/libaodetail_des" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" /> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/libaodetail_item_top.xml b/app/src/main/res/layout/libaodetail_item_top.xml index ca1fa73634..d399e1a4a8 100644 --- a/app/src/main/res/layout/libaodetail_item_top.xml +++ b/app/src/main/res/layout/libaodetail_item_top.xml @@ -84,7 +84,7 @@ android:layout_below="@+id/libaodetail_ll" android:layout_marginTop="12dp" android:layout_marginBottom="10dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index 5a4abcd489..c0e1ce3cd5 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -68,7 +68,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="赞同" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -131,7 +131,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="邀请" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -194,7 +194,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="系统" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/message_kefu_item.xml b/app/src/main/res/layout/message_kefu_item.xml index d39610c970..fdcb2e4a84 100644 --- a/app/src/main/res/layout/message_kefu_item.xml +++ b/app/src/main/res/layout/message_kefu_item.xml @@ -110,7 +110,7 @@ android:layout_marginLeft="20dp" android:layout_marginTop="8dp" android:layout_marginRight="20dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" android:padding="11dp" android:textColor="@color/title" android:textSize="12sp" @@ -151,7 +151,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@string/copy_id" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/moderator_list_item.xml b/app/src/main/res/layout/moderator_list_item.xml index be934f0325..b0cc748f4e 100644 --- a/app/src/main/res/layout/moderator_list_item.xml +++ b/app/src/main/res/layout/moderator_list_item.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="@{entity.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="@string/app_name" /> @@ -82,7 +82,7 @@ android:background="@{entity.me.isFollower ? @drawable/bg_shape_f5_radius_999 : @drawable/bg_forum_follow}" android:gravity="center" android:text="@{entity.me.isFollower ? `已关注` : `关注`}" - android:textColor="@{entity.me.isFollower ? @color/text_999999 : @color/theme_font}" + android:textColor="@{entity.me.isFollower ? @color/text_subtitleDesc : @color/theme_font}" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/new_comment_item.xml b/app/src/main/res/layout/new_comment_item.xml index 346fc41ade..1dcefc3945 100644 --- a/app/src/main/res/layout/new_comment_item.xml +++ b/app/src/main/res/layout/new_comment_item.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -101,7 +101,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="一个小时前" /> @@ -187,7 +187,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:text="回复" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> @@ -226,7 +226,7 @@ android:layout_height="0.5dp" android:layout_marginRight="6dp" android:layout_alignParentBottom="true" - android:background="@color/text_eeeeee"/> + android:background="@color/divider"/> @@ -248,7 +248,7 @@ android:id="@+id/comment_quote_author_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="孙宁" /> @@ -268,7 +268,7 @@ android:layout_below="@+id/comment_quote_author_tv" android:layout_marginTop="2dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> diff --git a/app/src/main/res/layout/news_digest_item.xml b/app/src/main/res/layout/news_digest_item.xml index 614b383fc7..f94d2da275 100644 --- a/app/src/main/res/layout/news_digest_item.xml +++ b/app/src/main/res/layout/news_digest_item.xml @@ -109,7 +109,7 @@ android:id="@+id/news_digest_read_num" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> @@ -131,7 +131,7 @@ android:id="@+id/news_digest_commentnum" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/novice_task_item.xml b/app/src/main/res/layout/novice_task_item.xml index 902958a144..c2143dd993 100644 --- a/app/src/main/res/layout/novice_task_item.xml +++ b/app/src/main/res/layout/novice_task_item.xml @@ -34,7 +34,7 @@ android:maxEms="5" android:ellipsize="end" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:text="@{entity.name}" tools:text="绑定手机哈哈哈哈哈哈哈" diff --git a/app/src/main/res/layout/official_forum_item.xml b/app/src/main/res/layout/official_forum_item.xml index ca8e254772..30ce00b320 100644 --- a/app/src/main/res/layout/official_forum_item.xml +++ b/app/src/main/res/layout/official_forum_item.xml @@ -32,7 +32,7 @@ android:singleLine="true" android:ellipsize="end" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" app:layout_constraintTop_toTopOf="@+id/forumIv" app:layout_constraintBottom_toBottomOf="@+id/forumIv" diff --git a/app/src/main/res/layout/package_check_item.xml b/app/src/main/res/layout/package_check_item.xml index 1c9667cf73..6eb5243120 100644 --- a/app/src/main/res/layout/package_check_item.xml +++ b/app/src/main/res/layout/package_check_item.xml @@ -22,7 +22,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{entity.text}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/statusTv" @@ -34,7 +34,7 @@ android:id="@+id/statusTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/personal_home_rating.xml b/app/src/main/res/layout/personal_home_rating.xml index afe30df702..d70c3fdef9 100644 --- a/app/src/main/res/layout/personal_home_rating.xml +++ b/app/src/main/res/layout/personal_home_rating.xml @@ -41,7 +41,7 @@ android:layout_marginLeft="1dp" android:layout_marginBottom="2dp" android:singleLine="true" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon" app:layout_constraintLeft_toRightOf="@id/user_icon" @@ -58,7 +58,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="3" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:endText="... " app:expandText="全部" diff --git a/app/src/main/res/layout/personality_background_fragment.xml b/app/src/main/res/layout/personality_background_fragment.xml index 8395f14745..ee145f10d0 100644 --- a/app/src/main/res/layout/personality_background_fragment.xml +++ b/app/src/main/res/layout/personality_background_fragment.xml @@ -9,7 +9,7 @@ android:id="@+id/line" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/text_f5f5f5" + android:background="@color/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:text="自定义背景" android:layout_marginTop="12dp" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/piece_article_detail_comment_filter.xml b/app/src/main/res/layout/piece_article_detail_comment_filter.xml index b6640625cc..b8f6abf064 100644 --- a/app/src/main/res/layout/piece_article_detail_comment_filter.xml +++ b/app/src/main/res/layout/piece_article_detail_comment_filter.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:text="全部评论" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:text="0" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/commentHintTv" @@ -44,7 +44,7 @@ android:gravity="center" android:padding="6dp" android:text="倒序" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -78,7 +78,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/piece_article_input_container.xml b/app/src/main/res/layout/piece_article_input_container.xml index fa0b7f06bd..04632c2947 100644 --- a/app/src/main/res/layout/piece_article_input_container.xml +++ b/app/src/main/res/layout/piece_article_input_container.xml @@ -23,7 +23,7 @@ android:maxLines="1" android:paddingLeft="16dp" android:paddingRight="16dp" - android:textColor="@color/text_cccccc" + android:textColor="@color/text_body" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -50,7 +50,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="分享" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomShareIv" @@ -83,7 +83,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="赞同" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomLikeIv" @@ -109,7 +109,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="收藏" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomStarIv" @@ -137,7 +137,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="评论" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomCommentIv" diff --git a/app/src/main/res/layout/piece_comment_typing_container.xml b/app/src/main/res/layout/piece_comment_typing_container.xml index d91dce595a..423ceb266f 100644 --- a/app/src/main/res/layout/piece_comment_typing_container.xml +++ b/app/src/main/res/layout/piece_comment_typing_container.xml @@ -47,7 +47,7 @@ android:layout_height="0.5dp" android:layout_marginTop="12dp" android:layout_marginBottom="11dp" - android:background="@color/text_eeeeee" + android:background="@color/divider" android:visibility="gone" /> diff --git a/app/src/main/res/layout/piece_comment_typing_container_dark.xml b/app/src/main/res/layout/piece_comment_typing_container_dark.xml index f8d4c7a0b6..3ff862b47f 100644 --- a/app/src/main/res/layout/piece_comment_typing_container_dark.xml +++ b/app/src/main/res/layout/piece_comment_typing_container_dark.xml @@ -45,7 +45,7 @@ android:hint="说点什么吧" android:lineSpacingExtra="4dp" android:textColor="@color/white" - android:textColorHint="@color/text_666666" + android:textColorHint="@color/text_subtitle" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/piece_community_vote_and_comment.xml b/app/src/main/res/layout/piece_community_vote_and_comment.xml index 98357099ae..d978cd2bf9 100644 --- a/app/src/main/res/layout/piece_community_vote_and_comment.xml +++ b/app/src/main/res/layout/piece_community_vote_and_comment.xml @@ -26,7 +26,7 @@ android:gravity="center" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="16" /> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="11" /> diff --git a/app/src/main/res/layout/piece_question_content.xml b/app/src/main/res/layout/piece_question_content.xml index 20f3137cc8..89634e5230 100644 --- a/app/src/main/res/layout/piece_question_content.xml +++ b/app/src/main/res/layout/piece_question_content.xml @@ -16,7 +16,7 @@ android:layout_marginRight="20dp" android:lineSpacingExtra="4dp" android:maxLines="3" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" /> + android:background="@color/divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/popup_energy_task.xml b/app/src/main/res/layout/popup_energy_task.xml index 5d6d3447d2..24b8131966 100644 --- a/app/src/main/res/layout/popup_energy_task.xml +++ b/app/src/main/res/layout/popup_energy_task.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" tools:text="恭喜你！完成任务：绑定手机号" /> diff --git a/app/src/main/res/layout/popup_server_category.xml b/app/src/main/res/layout/popup_server_category.xml index ac4d7aa44a..f0209c7aa2 100644 --- a/app/src/main/res/layout/popup_server_category.xml +++ b/app/src/main/res/layout/popup_server_category.xml @@ -32,7 +32,7 @@ android:layout_weight="1" android:gravity="center" android:text="重置" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/popup_server_time.xml b/app/src/main/res/layout/popup_server_time.xml index 6efdc7f451..7251479e8f 100644 --- a/app/src/main/res/layout/popup_server_time.xml +++ b/app/src/main/res/layout/popup_server_time.xml @@ -45,7 +45,7 @@ android:layout_height="43dp" android:gravity="center" android:text="后续开服" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -54,7 +54,7 @@ android:id="@+id/line" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:layout_marginTop="8dp" android:text="@string/share_wechat" /> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:layout_marginTop="8dp" android:text="@string/share_wechat_moments" /> @@ -96,7 +96,7 @@ android:includeFontPadding="false" android:layout_marginTop="8dp" android:text="@string/share_qq" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" /> @@ -117,7 +117,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:layout_marginTop="8dp" android:text="@string/share_qq_zone" /> @@ -148,7 +148,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" android:layout_marginTop="8dp" android:text="@string/share_weibo" /> @@ -166,7 +166,7 @@ android:layout_alignParentBottom="true" android:background="#FEFFFF" android:gravity="center" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="16sp" android:text="取消"/> diff --git a/app/src/main/res/layout/popup_simulator_option.xml b/app/src/main/res/layout/popup_simulator_option.xml index 090647a205..d352ee1471 100644 --- a/app/src/main/res/layout/popup_simulator_option.xml +++ b/app/src/main/res/layout/popup_simulator_option.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" android:text="删除游戏" /> @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="10sp" android:text="完成" /> diff --git a/app/src/main/res/layout/popup_simulator_uninstall.xml b/app/src/main/res/layout/popup_simulator_uninstall.xml index 9fa903f7bf..3bc109bfef 100644 --- a/app/src/main/res/layout/popup_simulator_uninstall.xml +++ b/app/src/main/res/layout/popup_simulator_uninstall.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" android:text="卸载模拟器" /> diff --git a/app/src/main/res/layout/popup_test_time.xml b/app/src/main/res/layout/popup_test_time.xml index 975ff5729c..250b875feb 100644 --- a/app/src/main/res/layout/popup_test_time.xml +++ b/app/src/main/res/layout/popup_test_time.xml @@ -29,7 +29,7 @@ android:layout_height="43dp" android:gravity="center" android:text="过去7天" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> @@ -72,7 +72,7 @@ android:id="@+id/line" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/text_eeeeee" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/popup_user_home_more.xml b/app/src/main/res/layout/popup_user_home_more.xml index aec874f437..1fd4d7d4ed 100644 --- a/app/src/main/res/layout/popup_user_home_more.xml +++ b/app/src/main/res/layout/popup_user_home_more.xml @@ -12,7 +12,7 @@ android:layout_height="44dp" android:layout_marginTop="11dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" android:text="分享" /> @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="14sp" android:text="举报" /> diff --git a/app/src/main/res/layout/privacy_item.xml b/app/src/main/res/layout/privacy_item.xml index da6927ce19..87f34ec05f 100644 --- a/app/src/main/res/layout/privacy_item.xml +++ b/app/src/main/res/layout/privacy_item.xml @@ -32,7 +32,7 @@ android:layout_marginRight="12dp" android:includeFontPadding="false" android:text="@{data.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/icon" @@ -48,7 +48,7 @@ android:layout_marginRight="12dp" android:includeFontPadding="false" android:text="@{data.intro}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:lineSpacingExtra="6dp" app:layout_constraintLeft_toRightOf="@id/icon" diff --git a/app/src/main/res/layout/questions_edit_tag.xml b/app/src/main/res/layout/questions_edit_tag.xml index e8aaf5c502..55116b4fef 100644 --- a/app/src/main/res/layout/questions_edit_tag.xml +++ b/app/src/main/res/layout/questions_edit_tag.xml @@ -20,7 +20,7 @@ android:layout_marginLeft="16dp" android:gravity="center_vertical" android:text="添加标签" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/questionsdedit_tag_item.xml b/app/src/main/res/layout/questionsdedit_tag_item.xml index b3f03f9129..75005f59e4 100644 --- a/app/src/main/res/layout/questionsdedit_tag_item.xml +++ b/app/src/main/res/layout/questionsdedit_tag_item.xml @@ -6,5 +6,5 @@ android:gravity = "center" android:paddingLeft = "14dp" android:paddingRight = "14dp" - android:textColor = "@color/text_666666" + android:textColor = "@color/text_subtitle" android:textSize = "12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml index 367b926c60..3a94ee1928 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" tools:text="1人关注" /> @@ -208,7 +208,7 @@ android:background="@color/white" android:gravity="center_vertical" android:paddingLeft="20dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:textStyle="bold" tools:text="3回答" /> @@ -216,7 +216,7 @@ + android:background="@color/divider" /> \ 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 e51c3a2c48..6266c61ee6 100644 --- a/app/src/main/res/layout/questionsinvite_item.xml +++ b/app/src/main/res/layout/questionsinvite_item.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" android:includeFontPadding="false" android:textStyle="bold" @@ -77,7 +77,7 @@ android:layout_marginRight="8dp" android:singleLine="true" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="资深回答者" /> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginRight="8dp" android:layout_toRightOf="@id/questionsinvite_item_answercount" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:includeFontPadding="false" android:textSize="11sp" tools:text="34赞" /> @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/questionsinvite_item_des" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:includeFontPadding="false" android:textSize="11sp" tools:text="34回答" /> diff --git a/app/src/main/res/layout/rank_collection_item.xml b/app/src/main/res/layout/rank_collection_item.xml index 528698cf70..69bcf8e6fe 100644 --- a/app/src/main/res/layout/rank_collection_item.xml +++ b/app/src/main/res/layout/rank_collection_item.xml @@ -21,7 +21,7 @@ android:paddingBottom="8dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textStyle="bold" android:textSize="16sp" tools:text="热门榜" /> @@ -34,7 +34,7 @@ android:paddingBottom="8dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:text=" >" /> diff --git a/app/src/main/res/layout/rank_game_item.xml b/app/src/main/res/layout/rank_game_item.xml index bbe71cabb6..10706439a7 100644 --- a/app/src/main/res/layout/rank_game_item.xml +++ b/app/src/main/res/layout/rank_game_item.xml @@ -61,7 +61,7 @@ android:layout_marginRight="8dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index 85b72d8eea..f7eaf809fd 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -34,7 +34,7 @@ android:layout_marginTop="8dp" app:avatar_width="32dp" app:badge_width="11dp" - app:border_color="@color/text_f5f5f5" + app:border_color="@color/background" app:border_width="1dp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -59,7 +59,7 @@ android:maxLines="1" android:singleLine="true" android:text="@{data.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -92,7 +92,7 @@ android:layout_toRightOf="@id/sdv_user_badge" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -149,7 +149,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/rating_start" app:layout_constraintLeft_toRightOf="@id/rating_start" @@ -176,7 +176,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="7dp" android:maxLines="4" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:endText="... " app:expandText="全部" @@ -196,7 +196,7 @@ android:maxLines="1" android:paddingRight="8dp" android:text="@{data.device}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="@{data.active && !TextUtils.isEmpty(data.device)? View.VISIBLE : View.GONE}" app:layout_constrainedWidth="true" @@ -214,7 +214,7 @@ android:layout_height="wrap_content" android:layout_marginRight="8dp" android:gravity="center" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="@{data.active && !TextUtils.isEmpty(data.gameVersion)? View.VISIBLE : View.GONE}" app:layout_constraintBottom_toBottomOf="@+id/vote" @@ -274,7 +274,7 @@ android:layout_marginLeft="8dp" android:layout_marginTop="16dp" android:layout_marginRight="20dp" - android:textColor="@color/red" + android:textColor="@color/theme_red" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -287,7 +287,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="8dp" android:layout_marginRight="16dp" - android:background="@color/text_F5F5F5" + android:background="@color/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/vote" /> @@ -310,7 +310,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/rating_item.xml b/app/src/main/res/layout/rating_item.xml index 9c7e8c9145..df8384e61a 100644 --- a/app/src/main/res/layout/rating_item.xml +++ b/app/src/main/res/layout/rating_item.xml @@ -28,7 +28,7 @@ android:includeFontPadding="false" android:drawablePadding="4dp" android:drawableLeft="@drawable/ic_game_detail_no_rating_tips" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" visibleGone="@{data.commentCount <= 3}"/> @@ -373,7 +373,7 @@ android:paddingTop="16dp" android:includeFontPadding="false" android:text = "我的评论" - android:textColor = "@color/text_333333" + android:textColor = "@color/text_title" android:textSize = "16sp" android:textStyle = "bold" /> @@ -394,7 +394,7 @@ android:layout_height = "wrap_content" android:gravity = "center_vertical" android:text = "全部评论" - android:textColor = "@color/text_333333" + android:textColor = "@color/text_title" android:textSize = "18sp" android:paddingTop="13dp" android:textStyle = "bold" /> @@ -411,7 +411,7 @@ android:gravity = "center" android:text = "筛选" android:paddingTop="16dp" - android:textColor = "@color/text_666666" + android:textColor = "@color/text_subtitle" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml index 61e569e939..1f3f077e2e 100644 --- a/app/src/main/res/layout/rating_reply_item.xml +++ b/app/src/main/res/layout/rating_reply_item.xml @@ -82,7 +82,7 @@ android:id="@+id/tv_badge_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" android:visibility="gone" android:layout_marginLeft="2dp" diff --git a/app/src/main/res/layout/search_game_horizontal_item.xml b/app/src/main/res/layout/search_game_horizontal_item.xml index 58b6b4c90d..3212c5aa8c 100644 --- a/app/src/main/res/layout/search_game_horizontal_item.xml +++ b/app/src/main/res/layout/search_game_horizontal_item.xml @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="10dp" - android:background="@color/text_F5F5F5" + android:background="@color/background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/search_game_index_item.xml b/app/src/main/res/layout/search_game_index_item.xml index 8635311d6f..23bf30cfcc 100644 --- a/app/src/main/res/layout/search_game_index_item.xml +++ b/app/src/main/res/layout/search_game_index_item.xml @@ -23,7 +23,7 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/search_subject_item.xml b/app/src/main/res/layout/search_subject_item.xml index eb06fc2d43..99761afc25 100644 --- a/app/src/main/res/layout/search_subject_item.xml +++ b/app/src/main/res/layout/search_subject_item.xml @@ -14,7 +14,7 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> @@ -62,6 +62,6 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_F5F5F5" /> + android:background="@color/background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/simulator_item.xml b/app/src/main/res/layout/simulator_item.xml index 25f016bd95..383de5056a 100644 --- a/app/src/main/res/layout/simulator_item.xml +++ b/app/src/main/res/layout/simulator_item.xml @@ -32,7 +32,7 @@ android:layout_toRightOf="@+id/select_iv" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" tools:text="街机模拟器" /> @@ -52,5 +52,5 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/text_eeeeee"/> + android:background="@color/divider"/> \ No newline at end of file diff --git a/app/src/main/res/layout/stairs_comment_item.xml b/app/src/main/res/layout/stairs_comment_item.xml index 2527537fb9..beeaef9d82 100644 --- a/app/src/main/res/layout/stairs_comment_item.xml +++ b/app/src/main/res/layout/stairs_comment_item.xml @@ -43,7 +43,7 @@ android:id="@+id/comment_user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="13sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="12sp" tools:text="20" /> @@ -152,7 +152,7 @@ android:layout_below="@+id/comment_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" tools:text="1小时前" /> @@ -184,7 +184,7 @@ + android:background="@color/text_subtitle" /> diff --git a/app/src/main/res/layout/sub_category_item.xml b/app/src/main/res/layout/sub_category_item.xml index 21d16f9c19..15c532c507 100644 --- a/app/src/main/res/layout/sub_category_item.xml +++ b/app/src/main/res/layout/sub_category_item.xml @@ -20,7 +20,7 @@ android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:text="@{entity.name}" tools:text="最多五个字啊啊啊" /> diff --git a/app/src/main/res/layout/toolbar_search.xml b/app/src/main/res/layout/toolbar_search.xml index e49ae0b538..05b34d8992 100644 --- a/app/src/main/res/layout/toolbar_search.xml +++ b/app/src/main/res/layout/toolbar_search.xml @@ -68,7 +68,7 @@ android:layout_height="match_parent" android:gravity="center" android:text="@string/search_search" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toolbox_item.xml b/app/src/main/res/layout/toolbox_item.xml index e9b7195f90..1003cd352e 100644 --- a/app/src/main/res/layout/toolbox_item.xml +++ b/app/src/main/res/layout/toolbox_item.xml @@ -28,7 +28,7 @@ android:id = "@+id/toolbox_item_title" android:layout_width = "match_parent" android:layout_height = "wrap_content" - android:textColor = "@color/text_333333" + android:textColor = "@color/text_title" android:textSize="14sp" android:textStyle="bold"/> @@ -39,7 +39,7 @@ android:layout_below = "@+id/toolbox_item_title" android:layout_marginTop = "6dp" android:singleLine = "true" - android:textColor = "@color/text_999999" + android:textColor = "@color/text_subtitleDesc" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/user_history_item.xml b/app/src/main/res/layout/user_history_item.xml index 79d8e2cdb2..b2b46ea330 100644 --- a/app/src/main/res/layout/user_history_item.xml +++ b/app/src/main/res/layout/user_history_item.xml @@ -65,7 +65,7 @@ android:maxLength="12" android:maxLines="1" android:text="@{entity.user.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/timeContainer" @@ -99,7 +99,7 @@ android:gravity="center" android:maxLines="1" android:text="@{entity.user.badge.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constrainedWidth="true" android:visibility="gone" @@ -152,7 +152,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="@{NewsUtils.getFormattedTime(entity.time) + ` · `}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="11sp" tools:text="1分钟前·" tools:visibility="visible" /> @@ -173,10 +173,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{entity.status.equals(`pending`) ? @string/content_pending_status : @string/fail_status}" - android:textColor="@{entity.status.equals(`pending`) ? @color/text_06CEA8 : @color/text_FF4147}" + android:textColor="@{entity.status.equals(`pending`) ? @color/theme_green : @color/theme_red}" android:textSize="11sp" tools:text="内容审核中" - tools:textColor="@color/text_06CEA8" /> + tools:textColor="@color/theme_green" /> @@ -207,7 +207,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{entity.type.contains(`video`)? entity.des : entity.brief}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@+id/questionTitle" tools:text="2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。2014年解約回國後出演多部電影，開啟其演員生涯。2015年11月，發行首張中文單曲《Bad Girl》，開啟其個人歌手生涯。2016年11月，發行首張英文單曲《JULY》，正式開啟嘻哈音樂之路。" /> @@ -297,7 +297,7 @@ android:includeFontPadding="false" android:maxLines="1" android:text="@{entity.community.name}" - android:textColor="@color/text_666666" + android:textColor="@color/text_subtitle" android:textSize="11sp" tools:text="地下城与勇士" /> diff --git a/app/src/main/res/layout/user_home_amway_item.xml b/app/src/main/res/layout/user_home_amway_item.xml index 2b9c93a3b4..997c1b2f3d 100644 --- a/app/src/main/res/layout/user_home_amway_item.xml +++ b/app/src/main/res/layout/user_home_amway_item.xml @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="@{data.game.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/game_icon" @@ -99,7 +99,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:background="@drawable/bg_amway_tag" - android:textColor="@color/text_06CEA8" + android:textColor="@color/theme_green" android:textSize="9dp" android:text="@string/amway_tag" /> @@ -111,7 +111,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:background="@drawable/bg_comment_tag" - android:textColor="@color/text_FFA142" + android:textColor="@color/theme_yellow" android:textSize="9dp" android:text="@string/comment_tag" /> @@ -137,7 +137,7 @@ android:lineSpacingMultiplier="1.3" android:maxLines="3" android:minLines="3" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -201,7 +201,7 @@ android:background="@drawable/home_amway_selector" android:gravity="center" android:text="全部" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/comment_background" diff --git a/app/src/main/res/layout/user_search_list_item.xml b/app/src/main/res/layout/user_search_list_item.xml index 8419c705a8..68814a3843 100644 --- a/app/src/main/res/layout/user_search_list_item.xml +++ b/app/src/main/res/layout/user_search_list_item.xml @@ -50,7 +50,7 @@ android:maxLength="12" android:maxLines="1" android:text="@{entity.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/userSignatureTv" app:layout_constraintEnd_toStartOf="@+id/user_badge_icon" @@ -83,7 +83,7 @@ android:gravity="center" android:maxLines="1" android:text="@{entity.badge.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="10sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_badge_icon" @@ -101,7 +101,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{TextUtils.isEmpty(entity.introduce)?`这是一个很神秘的崽~` :entity.introduce }" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@+id/userFansCountTv" app:layout_constraintEnd_toStartOf="@+id/attentionTv" @@ -113,7 +113,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="12dp" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/userAvatar" app:layout_constraintStart_toEndOf="@+id/userAvatar" @@ -128,7 +128,7 @@ android:background="@{entity.me.isFollower? @drawable/bg_shape_f5_radius_999:@drawable/bg_forum_follow}" android:gravity="center" android:text="@{entity.me.isFollower ? `已关注` :`关注`}" - android:textColor="@{entity.me.isFollower ? @color/text_999999 :@color/theme_font}" + android:textColor="@{entity.me.isFollower ? @color/text_subtitleDesc :@color/theme_font}" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/userAvatar" app:layout_constraintEnd_toEndOf="parent" @@ -138,7 +138,7 @@ diff --git a/app/src/main/res/layout/video_albums_item.xml b/app/src/main/res/layout/video_albums_item.xml index 9789dd7fb9..4c7a20ccbe 100644 --- a/app/src/main/res/layout/video_albums_item.xml +++ b/app/src/main/res/layout/video_albums_item.xml @@ -22,7 +22,7 @@ android:layout_toRightOf="@id/album_cover" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="14sp" /> + android:background="@color/divider" /> diff --git a/app/src/main/res/layout/video_label_item.xml b/app/src/main/res/layout/video_label_item.xml index 272626ca3d..c529c35453 100644 --- a/app/src/main/res/layout/video_label_item.xml +++ b/app/src/main/res/layout/video_label_item.xml @@ -29,7 +29,7 @@ android:lineSpacingExtra="8dp" android:maxLines="1" android:text="@{entity.name}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/selectedIv" app:layout_constraintStart_toStartOf="parent" @@ -44,7 +44,7 @@ android:layout_marginRight="16dp" android:lineSpacingExtra="8dp" android:text="@{entity.desc}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/selectedIv" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/video_new_item.xml b/app/src/main/res/layout/video_new_item.xml index fedf14ae5c..9c9781544a 100644 --- a/app/src/main/res/layout/video_new_item.xml +++ b/app/src/main/res/layout/video_new_item.xml @@ -109,7 +109,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:text="@{video.title}" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@+id/user_info" app:layout_constraintEnd_toEndOf="parent" @@ -151,7 +151,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{video.user.name}" - android:textColor="@color/text_999999" + android:textColor="@color/text_subtitleDesc" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/user_icon" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/video_verify_item.xml b/app/src/main/res/layout/video_verify_item.xml index de36260938..bff41fcf4a 100644 --- a/app/src/main/res/layout/video_verify_item.xml +++ b/app/src/main/res/layout/video_verify_item.xml @@ -32,7 +32,7 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:minLines="2" - android:textColor="@color/text_333333" + android:textColor="@color/text_title" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@id/video_status" app:layout_constraintLeft_toRightOf="@id/video_cover" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ebd673bd84..4e53487b4d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,6 @@ - #2496FF #332496FF @@ -151,7 +150,6 @@ #946262 - #ff4147 #aaaaaa #AAAAAA #dcdcdc @@ -162,7 +160,6 @@ #e6e6e6 #ECF6FF #EDEDED - #EEEEEE #F2F2F2 #FFC247 #FF9933 @@ -200,12 +197,9 @@ #3A3A3A #5d5d5d #5D5D5D - #f5f5f5 - #F5F5F5 #949494 #fbfbfb #d5d5d5 - #999999 #b3b3b3 #B3B3B3 #6c6c6c @@ -214,13 +208,9 @@ #FA8500 #f67722 #989898 - #333333 #444444 - #eeeeee #777777 - #cccccc #f2f2f2 - #666666 #292929 #00DD08 #E0FFF9 @@ -230,7 +220,6 @@ #FF7C1F #181927 #e6f3ff - #1383EB #1F89EC #EEF5FB #C1BFC9 @@ -279,12 +268,9 @@ #8798A8 #3796FF #213964 - #06CEA8 - #FFA142 #06CCF4 #F8A142 #f9f9f9 - #FF4147 #a9a9a9 #757575 #0E0E0E diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 75e08d7d6a..ce820d9483 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -317,7 +317,7 @@ @@ -358,7 +358,7 @@ wrap_content 8dp false - @color/text_666666 + @color/text_subtitle 11sp @@ -398,7 +398,7 @@ @drawable/ic_filter_arrow_down 5dp center_vertical - @color/text_666666 + @color/text_subtitle bold 12sp @@ -430,7 +430,7 @@ 12dp 12dp @drawable/button_round_f5f5f5 - @color/text_333333 + @color/text_title 12sp \ No newline at end of file