yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页我的tab UI修改

Browse Source
This commit is contained in:
huangjian
2023-03-08 15:25:04 +08:00
parent a15ae87fd5
commit fa47dad924
161 changed files with 675 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nnbc123/app/avroom/activity/CreatePKActivity.java
View File

@@ -436,7 +436,7 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
public void initTitleBar() {
initWhiteTitleBar(getString(R.string.create_PK));
mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.PK_record),
getResources().getColor(R.color.text_normal_c6c6e9)) {
getResources().getColor(R.color.text_normal_282828)) {
@Override
public void performAction(View view) {
RecordForPKActivity.start(CreatePKActivity.this);

2
app/src/main/java/com/nnbc123/app/base/BaseActivity.java
View File

@@ -226,7 +226,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
if (mTitleBar != null) {
mTitleBar.setTitle(title);
mTitleBar.setImmersive(false);
mTitleBar.setTitleColor(getResources().getColor(R.color.text_title_white));
mTitleBar.setTitleColor(getResources().getColor(R.color.text_title_282828));
mTitleBar.setLeftImageResource(R.drawable.arrow_left);
mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent));
mTitleBar.setLeftClickListener(v -> onLeftClickListener());

4
app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
View File

@@ -80,7 +80,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
tvUsed.setText("使用");
tvUsed.setBackgroundResource(R.drawable.bg_common_disable);
tvUsed.setEnabled(false);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_878b9c));
} else if (isUsing) {
tvUsed.setVisibility(View.VISIBLE);
tvUsed.setText("取消使用");
@@ -91,7 +91,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
tvUsed.setVisibility(View.VISIBLE);
tvUsed.setText("使用");
tvUsed.setBackgroundResource(R.drawable.bg_common_confirm);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_white));
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_282828));
tvUsed.setEnabled(true);
}

2
app/src/main/java/com/nnbc123/app/decoration/adapter/MyNamePlateAdapter.java
View File

@@ -46,7 +46,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
tvUsed.setEnabled(false);
tvUsed.setBackgroundResource(R.drawable.bg_common_disable);
tvUsed.setText("使用");
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_878b9c));
} else {
String days;
if (item.getExpireDays() > 99) {

4
app/src/main/java/com/nnbc123/app/decoration/view/widgets/CarMagicIndicator.java
View File

@@ -38,8 +38,8 @@ public class CarMagicIndicator extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.text_title_white));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_878b9c));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.text_title_282828));
scaleTransitionPagerTitleView.setMinScale(1);
scaleTransitionPagerTitleView.setTextSize(16);
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());

4
app/src/main/java/com/nnbc123/app/decoration/view/widgets/MyDecorationMagicIndicator.java
View File

@@ -37,8 +37,8 @@ public class MyDecorationMagicIndicator extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.text_title_white));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_878b9c));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.text_title_282828));
scaleTransitionPagerTitleView.setMinScale(0.9f);
scaleTransitionPagerTitleView.setTextSize(15);
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());

2
app/src/main/java/com/nnbc123/app/home/activity/CommunityNoticeAct.java
View File

@@ -53,7 +53,7 @@ public class CommunityNoticeAct extends BaseMvpActivity<ICommunityNoticeAct, Com
setContentView(R.layout.act_community_notice);
mUnbinder = ButterKnife.bind(this);
initWhiteTitleBar("全部消息");
mTitleBar.addAction(new TitleBar.TextAction("清空", getResources().getColor(R.color.text_normal_c6c6e9)) {
mTitleBar.addAction(new TitleBar.TextAction("清空", getResources().getColor(R.color.text_normal_282828)) {
@Override
public void performAction(View view) {
getDialogManager().showOkCancelWithTitleDialog("清空后所有互动通知将被删除\n确定清空吗?", "确定",

4
app/src/main/java/com/nnbc123/app/home/adapter/TopMagicIndicatorAdapter.java
View File

@@ -36,8 +36,8 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context,R.color.text_secondary_4f516a));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context,R.color.text_title_white));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context,R.color.text_secondary_878b9c));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context,R.color.text_title_282828));
scaleTransitionPagerTitleView.setMinScale(0.75f);
scaleTransitionPagerTitleView.setTextSize(21);
scaleTransitionPagerTitleView.setText(mTitleList.get(i));

206
app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
View File

@@ -13,30 +13,10 @@ import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager.widget.PagerAdapter
import com.nnbc123.core.auth.AuthModel
import com.nnbc123.core.home.event.VisitorUnreadCountEvent
import com.nnbc123.core.level.UserLevelVo
import com.nnbc123.core.manager.IMNetEaseManager
import com.nnbc123.core.manager.RelationShipEvent
import com.nnbc123.core.module_hall.hall.bean.RoleType
import com.nnbc123.core.noble.NobleUtil
import com.nnbc123.core.pay.PayModel
import com.nnbc123.core.pay.event.GetWalletInfoEvent
import com.nnbc123.core.pay.event.UpdateWalletInfoEvent
import com.nnbc123.core.room.bean.MeCenterInfo
import com.nnbc123.core.room.bean.RoomInfo
import com.nnbc123.core.room.game.GameInfo
import com.nnbc123.core.statistic.StatisticManager
import com.nnbc123.core.statistic.protocol.StatisticsProtocol
import com.nnbc123.core.user.UserModel
import com.nnbc123.core.user.bean.UserInfo
import com.nnbc123.core.user.event.LoginUserInfoUpdateEvent
import com.nnbc123.core.utils.CurrentTimeUtils
import com.nnbc123.core.utils.StarUtils
import com.netease.nim.uikit.common.util.sys.TimeUtil
import com.nnbc123.app.R
import com.nnbc123.app.UIHelper
import com.nnbc123.app.avroom.activity.AVRoomActivity
import com.nnbc123.app.avroom.fragment.RoomRankDialogUtils
import com.nnbc123.app.avroom.newuserchargegift.NewUserChargeGiftDialog
import com.nnbc123.app.base.BaseActivity
import com.nnbc123.app.base.BaseFragment
@@ -46,11 +26,8 @@ import com.nnbc123.app.home.MeViewModel
import com.nnbc123.app.home.activity.RoomHistoryListActivity
import com.nnbc123.app.home.activity.VisitorListActivity
import com.nnbc123.app.home.adapter.MeCenterAdapter
import com.nnbc123.app.home.adapter.MeGameAdapter
import com.nnbc123.app.home.dialog.AnchorGradeDialog
import com.nnbc123.app.home.helper.BannerHelper
import com.nnbc123.app.home.helper.OpenRoomHelper
import com.nnbc123.app.module_hall.HallDataManager
import com.nnbc123.app.skill.activity.SkillHomeActivity
import com.nnbc123.app.skill.activity.SkillHomeActivity.Companion.start
import com.nnbc123.app.ui.patriarch.PatriarchModeActivity
@@ -58,13 +35,26 @@ import com.nnbc123.app.ui.pay.ChargeActivity
import com.nnbc123.app.ui.relation.AttentionListActivity
import com.nnbc123.app.ui.relation.FansListActivity
import com.nnbc123.app.ui.utils.ImageLoadUtils
import com.nnbc123.app.ui.webview.CommonWebViewActivity
import com.nnbc123.app.ui.widget.OnPageSelectedListener
import com.nnbc123.app.utils.UserUtils
import com.nnbc123.app.vip.VipMainActivity
import com.nnbc123.app.vip.VipMainViewModel
import com.nnbc123.library.utils.FormatUtils
import com.netease.nim.uikit.common.util.sys.TimeUtil
import com.nnbc123.app.ui.utils.load
import com.nnbc123.core.UriProvider
import com.nnbc123.core.auth.AuthModel
import com.nnbc123.core.home.event.VisitorUnreadCountEvent
import com.nnbc123.core.level.UserLevelVo
import com.nnbc123.core.manager.IMNetEaseManager
import com.nnbc123.core.manager.RelationShipEvent
import com.nnbc123.core.noble.NobleUtil
import com.nnbc123.core.room.bean.MeCenterInfo
import com.nnbc123.core.room.bean.RoomInfo
import com.nnbc123.core.statistic.StatisticManager
import com.nnbc123.core.statistic.protocol.StatisticsProtocol
import com.nnbc123.core.user.UserModel
import com.nnbc123.core.user.bean.UserInfo
import com.nnbc123.core.user.event.LoginUserInfoUpdateEvent
import com.nnbc123.core.utils.CurrentTimeUtils
import com.nnbc123.core.utils.StarUtils
import com.trello.rxlifecycle3.android.FragmentEvent
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -90,18 +80,8 @@ class MeFragment : BaseFragment(), View.OnClickListener {
private lateinit var mBinding: FragmentMeBinding
private val meViewModel: MeViewModel by viewModels()
private val homeViewModel: HomeViewModel by activityViewModels()
private val vipViewModel: VipMainViewModel by viewModels()
private var newUserDisposable: Disposable? = null
private var centerIndex = 0
private var gameIndex = 0
private val anchorDrawableResIds = mapOf(
"S" to R.drawable.anchor_grade_bg_me_s,
"A" to R.drawable.anchor_grade_bg_me_a,
"B" to R.drawable.anchor_grade_bg_me_b,
"C" to R.drawable.anchor_grade_bg_me_c,
"D" to R.drawable.anchor_grade_bg_me_d
)
override fun getRootLayoutId(): Int {
return R.layout.fragment_me
@@ -143,17 +123,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
}
}
mBinding.viewPagerGame.addOnPageChangeListener(object : OnPageSelectedListener() {
override fun onPageSelected(position: Int) {
gameIndex = position
mBinding.magicIndicatorGame.setSelectedPage(position)
}
})
meViewModel.gameInfoListLiveData.observe(viewLifecycleOwner) {
setGameInfoData(it)
}
mBinding.viewPagerEntrance.addOnPageChangeListener(object : OnPageSelectedListener() {
override fun onPageSelected(position: Int) {
centerIndex = position
@@ -188,62 +157,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
}
}
vipViewModel.myVipInfoLiveData.observe(viewLifecycleOwner) {
it?.let {
mBinding.ivVipIcon.isVisible = true
mBinding.flVipSeek.isVisible = true
mBinding.ivVipIcon.load(it.vipIcon)
mBinding.tvVipDesc.text =
"还差${RoomRankDialogUtils.getRoomRankValueText(it.levelUpScore - it.currScore)}权力值升级"
mBinding.tvVipName.text = it.vipName
mBinding.tvNextVipName.text = it.nextVipName
mBinding.seekBarVip.max = it.levelUpScore
mBinding.seekBarVip.progress = it.currScore.coerceAtMost(it.levelUpScore)
mBinding.meItemVip.setBackgroundResource(R.drawable.bg_vip_me_entrance_opened)
} ?: run {
mBinding.ivVipIcon.isVisible = false
mBinding.flVipSeek.isVisible = false
mBinding.tvVipName.text = "贵族中心"
mBinding.tvVipDesc.text = "开通贵族立享各项特权>>"
mBinding.meItemVip.setBackgroundResource(R.drawable.bg_vip_me_entrance)
}
}
HallDataManager.get().registerHallExist(this) {
if (it == true && HallDataManager.get().roleType != RoleType.OWNER) {
meViewModel.getAnchorGradeInfo()
} else {
mBinding.tvAnchorGrade.isVisible = false
mBinding.meItemSkill.isVisible = !(mUserInfo?.isParentMode ?: false)
}
}
meViewModel.anchorGradeInfoLiveData.observe(this) {
it?.let {
StatisticManager.Instance()
.onEvent(
StatisticsProtocol.EVENT_GRADE_PROFIT_POP_SHOW,
"主播评级入口曝光"
)
mBinding.tvAnchorGrade.isVisible = true
mBinding.meItemSkill.isVisible = false
anchorDrawableResIds[it.grade.toUpperCase(Locale.getDefault())]?.let { resId ->
mBinding.tvAnchorGrade.setBackgroundResource(resId)
}
//白名单用户不需要点击事件
if (it.inWhitelist == true) {
mBinding.tvAnchorGrade.setOnClickListener(null)
} else {
mBinding.tvAnchorGrade.setOnClickListener {
AnchorGradeDialog.newInstance().show(mContext)
}
}
} ?: run {
mBinding.tvAnchorGrade.isVisible = false
mBinding.meItemSkill.isVisible = !(mUserInfo?.isParentMode ?: false)
}
}
}
@@ -299,60 +212,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
mBinding.viewPagerEntrance.setCurrentItem(centerIndex, false)
}
private fun setGameInfoData(pagerList: List<List<GameInfo>>?) {
if (pagerList.isNullOrEmpty()) {
mBinding.llGame.isVisible = false
return
}
mBinding.llGame.isVisible = true
mBinding.magicIndicatorGame.initIndicator(pagerList.size)
mBinding.magicIndicatorGame.setSelectedPage(gameIndex)
mBinding.magicIndicatorGame.visibility =
if (pagerList.size > 1) View.VISIBLE else View.INVISIBLE
val cacheItemView = SparseArray<RecyclerView>()
mBinding.viewPagerGame.adapter = object : PagerAdapter() {
override fun getCount(): Int {
return pagerList.size
}
override fun isViewFromObject(view: View, any: Any): Boolean {
return view === any
}
override fun instantiateItem(container: ViewGroup, pagePos: Int): Any {
val recyclerView: RecyclerView
val giftAdapter: MeGameAdapter?
if (cacheItemView[pagePos] == null) {
recyclerView = RecyclerView(requireContext())
recyclerView.layoutParams = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
)
recyclerView.layoutManager = GridLayoutManager(context, 4)
giftAdapter = MeGameAdapter()
giftAdapter.setOnItemClickListener { _, _, position: Int ->
homeViewModel.fastPickGameRoom(giftAdapter.getItem(position)?.mgId?.toLong())
}
recyclerView.adapter = giftAdapter
cacheItemView.put(pagePos, recyclerView)
} else {
recyclerView = cacheItemView[pagePos]
giftAdapter = recyclerView.adapter as MeGameAdapter
}
giftAdapter.setNewData(pagerList[pagePos])
container.addView(recyclerView)
return recyclerView
}
override fun destroyItem(container: ViewGroup, position: Int, any: Any) {
val recyclerView = cacheItemView[position]
container.removeView(recyclerView)
}
}
mBinding.viewPagerGame.setCurrentItem(gameIndex, false)
}
private fun onGetRelationShipEvent(event: RelationShipEvent) {
if (event.event == RelationShipEvent.EVENT_FRIEND_UPDATE) {
requestUpdateUserInfo()
@@ -363,7 +222,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
super.onResume()
setUserData()
requestUpdateUserInfo()
vipViewModel.getVipPageInfo()
}
@SuppressLint("SetTextI18n")
@@ -379,7 +237,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
mBinding.tvConstellation.text = star
setUserLevel(it.userLevelVo)
initNewUserCharge(it)
setWalletInfo()
mBinding.flPmMode.isVisible = it.isParentMode
if (it.isParentMode) {
mBinding.meItemSkill.isVisible = false
@@ -389,7 +246,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
NobleUtil.loadHeadWear(effect, mBinding.ivHeadWear)
mBinding.ivHeadWear.tag = effect
}
}
}
@@ -452,28 +308,13 @@ class MeFragment : BaseFragment(), View.OnClickListener {
}
}
private fun setWalletInfo() {
mBinding.tvDiamondNum.text =
FormatUtils.formatBigInteger(PayModel.get().currentWalletInfo?.diamondNum ?: 0.0)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onLoginUserInfoUpdateEvent(event: LoginUserInfoUpdateEvent?) {
setUserData()
vipViewModel.getVipPageInfo()
meViewModel.refreshData()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onWalletInfoUpdate(event: UpdateWalletInfoEvent?) {
setWalletInfo()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onGetWalletInfoEvent(event: GetWalletInfoEvent?) {
setWalletInfo()
}
@SuppressLint("SetTextI18n")
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
fun onVisitorUnreadCountEvent(event: VisitorUnreadCountEvent) {
@@ -530,6 +371,11 @@ class MeFragment : BaseFragment(), View.OnClickListener {
StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_USERCENTER_RECHARGE_CARD_CLICK, "个人中心充值卡片点击")
}
R.id.me_item_room -> OpenRoomHelper.openRoom(requireActivity() as BaseActivity)
R.id.me_item_level -> CommonWebViewActivity.start(
mContext,
UriProvider.getUserLevelUrl()
)
R.id.tv_user_history -> RoomHistoryListActivity.start(mContext)
R.id.fl_new_user_charge -> {
NewUserChargeGiftDialog.start(mContext)
@@ -539,7 +385,11 @@ class MeFragment : BaseFragment(), View.OnClickListener {
"usercenter_nugift_pop_click"
)
}
R.id.ll_pm_mode -> PatriarchModeActivity.start(mContext)
R.id.ll_pm_mode, R.id.tv_me_youth_mode -> PatriarchModeActivity.start(mContext)
R.id.tv_me_real_name -> CommonWebViewActivity.start(
mContext,
UriProvider.getTutuRealNamePage()
)
else -> {}
}
}

2
app/src/main/java/com/nnbc123/app/ui/login/ModifyInfoActivity.java
View File

@@ -110,7 +110,7 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
initTitleBar("");
}
mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.label_modify_info_confirm),
ContextCompat.getColor(this, R.color.text_normal_c6c6e9)) {
ContextCompat.getColor(this, R.color.text_normal_282828)) {
@Override
public void performAction(View view) {

4
app/src/main/java/com/nnbc123/app/ui/patriarch/PatriarchPwdActivity.java
View File

@@ -121,10 +121,10 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
mBinding.tvCommit.setClickable(canClick);
if (canClick) {
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_normal);
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_white));
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_282828));
} else {
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_disable);
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_878b9c));
}
}

2
app/src/main/java/com/nnbc123/app/ui/user/UserModifyPhotosActivity.java
View File

@@ -71,7 +71,7 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM
private void initView() {
initWhiteTitleBar("我的相册");
TitleBar titleBar = findViewById(R.id.title_bar);
titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.text_normal_c6c6e9)) {
titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.text_normal_282828)) {
@Override
public void performAction(View view) {
notifyEditMode();

2
app/src/main/res/color/color_selector_white_false_7a7ca0.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/text_title_white" android:state_enabled="true" />
<item android:color="@color/text_title_282828" android:state_enabled="true" />
<item android:color="@color/color_666666" />

BIN
app/src/main/res/drawable-xhdpi/bg_me_level_entrance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_me_page.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 81 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_me_room_entrance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_me_vip_entrance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_me_wallet_entrance.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_me_arrow_more.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

BIN
app/src/main/res/drawable-xhdpi/ic_me_arrow_userinfo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 417 B

BIN
app/src/main/res/drawable-xhdpi/ic_me_real_name.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_me_service.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_me_youth_mode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

10
app/src/main/res/drawable/bg_me_page.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:startColor="#fff8f8fa"
android:endColor="#ffdcf6ff"
android:type="linear"
android:useLevel="true" />
</shape>

4
app/src/main/res/layout/activity_about.xml
View File

@@ -30,7 +30,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
@@ -40,7 +40,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="85dp"
android:text="@string/slogan"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
</RelativeLayout>

6
app/src/main/res/layout/activity_bind_phone.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="140dp"
android:text="你的手机号是多少"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -47,7 +47,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="+86"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<com.google.android.material.textfield.TextInputEditText
@@ -59,7 +59,7 @@
android:gravity="center_vertical"
android:inputType="number"
android:maxLength="11"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage"
tools:text="123456" />

12
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -26,7 +26,7 @@
android:layout_height="40dp"
android:gravity="center_vertical"
android:text="支付宝账号"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14dp" />
<EditText
@@ -36,7 +36,7 @@
android:background="@null"
android:hint="请输入支付宝账号"
android:paddingLeft="15dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal" />
@@ -62,7 +62,7 @@
android:layout_height="40dp"
android:gravity="center_vertical"
android:text="真实姓名"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14dp" />
<EditText
@@ -73,7 +73,7 @@
android:background="@null"
android:hint="请输入实名认证的真实姓名"
android:paddingLeft="15dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal" />
@@ -98,7 +98,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:text="手机验证码"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14dp"
android:visibility="gone" />
@@ -128,7 +128,7 @@
android:hint="请输入手机验证码"
android:inputType="number"
android:maxLength="5"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal"

10
app/src/main/res/layout/activity_charge.xml
View File

@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:text="支付方式"
android:textSize="@dimen/dp_13"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
/>
@@ -138,7 +138,7 @@
android:layout_weight="1"
android:text=""
android:textSize="@dimen/dp_15"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:clickable="false" />
<ImageView
@@ -187,7 +187,7 @@
android:layout_weight="1"
android:text=""
android:textSize="@dimen/dp_15"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:clickable="false" />
<ImageView
@@ -222,7 +222,7 @@
android:text="展开更多支付方式"
android:drawableEnd="@drawable/ic_charge_arrow"
android:textSize="@dimen/dp_13"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:paddingBottom="@dimen/dp_15"
android:clickable="false" />
@@ -260,7 +260,7 @@
android:text="@string/charge_agreement"
android:textSize="@dimen/sp_12"
android:gravity="center"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
/>
<TextView

4
app/src/main/res/layout/activity_common_web_view.xml
View File

@@ -40,7 +40,7 @@
android:id="@+id/tv_title"
android:layout_width="200dp"
android:layout_height="match_parent"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:gravity="center"
tools:text="这是标题"
android:layout_gravity="center"
@@ -62,7 +62,7 @@
tools:text="常见问题"
android:textSize="14sp"
android:visibility="gone"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</FrameLayout>

16
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -305,7 +305,7 @@
android:layout_height="wrap_content"
android:layout_weight="2.5"
android:text="@string/room_PK_mode"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp" />
<TextView
@@ -313,7 +313,7 @@
android:layout_height="wrap_content"
android:layout_weight="7.5"
android:text="@string/team_PK"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</LinearLayout>
@@ -339,7 +339,7 @@
android:layout_height="wrap_content"
android:layout_weight="2.5"
android:text="@string/vote_type"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp" />
<RadioGroup
@@ -355,7 +355,7 @@
android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp"
android:text="@string/vote_type_gift_value"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<RadioButton
@@ -366,7 +366,7 @@
android:button="@drawable/selector_radio_btn"
android:paddingLeft="5dp"
android:text="@string/vote_type_gift_member"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</RadioGroup>
@@ -396,7 +396,7 @@
android:layout_height="wrap_content"
android:layout_weight="2.5"
android:text="@string/room_PK_time"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp" />
<TextView
@@ -405,7 +405,7 @@
android:layout_height="wrap_content"
android:layout_weight="7.5"
android:gravity="right"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp"
tools:text="30秒" />
@@ -473,7 +473,7 @@
android:background="@drawable/bg_common_disable"
android:gravity="center"
android:text="@string/close_pk_mode"
android:textColor="@color/text_secondary_4f516a" />
android:textColor="@color/text_secondary_878b9c" />
</LinearLayout>
</RelativeLayout>

4
app/src/main/res/layout/activity_dialog_web_view.xml
View File

@@ -51,7 +51,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="18sp" />
<ImageView
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="15dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp"
android:visibility="gone"
tools:text="常见问题" />

8
app/src/main/res/layout/activity_feedback.xml
View File

@@ -26,7 +26,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:text="问题描述"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp" />
<EditText
@@ -39,7 +39,7 @@
android:gravity="left"
android:hint="请输入反馈内容(必填)"
android:padding="10dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="14sp" />
@@ -53,7 +53,7 @@
android:background="@drawable/bg_secondary_radius_15"
android:hint="请输入您的QQ或微信号"
android:padding="10dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="14sp" />
@@ -66,6 +66,6 @@
android:layout_marginTop="45dp"
android:background="@drawable/bg_common_confirm"
android:text="提交反馈"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp" />
</LinearLayout>

8
app/src/main/res/layout/activity_login_code.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="170dp"
android:text="填写验证码"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="验证码已发送"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +48,7 @@
android:layout_marginTop="30dp"
android:focusable="true"
android:inputType="number"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_11"
tools:text="重新获取验证码"

14
app/src/main/res/layout/activity_login_password.xml
View File

@@ -24,7 +24,7 @@
android:layout_marginTop="75dp"
android:layout_marginEnd="@dimen/dp_15"
android:text="验证码登录"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="140dp"
android:text="你的手机号是多少"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="+86"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<com.google.android.material.textfield.TextInputEditText
@@ -73,7 +73,7 @@
android:gravity="center_vertical"
android:inputType="number"
android:maxLength="11"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage"
tools:text="123456" />
@@ -97,7 +97,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="密码"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<com.google.android.material.textfield.TextInputEditText
@@ -109,7 +109,7 @@
android:gravity="center_vertical"
android:inputType="textPassword"
android:maxLength="16"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage" />
</LinearLayout>
@@ -121,7 +121,7 @@
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="75dp"
android:text="忘记密码"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_password" />

10
app/src/main/res/layout/activity_login_phone.xml
View File

@@ -24,7 +24,7 @@
android:layout_marginTop="75dp"
android:layout_marginEnd="@dimen/dp_15"
android:text="密码登录"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="140dp"
android:text="你的手机号是多少"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="未注册手机号自动登录"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -72,7 +72,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="+86"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<com.google.android.material.textfield.TextInputEditText
@@ -84,7 +84,7 @@
android:gravity="center_vertical"
android:inputType="number"
android:maxLength="11"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage"
tools:text="123456" />

6
app/src/main/res/layout/activity_modify_info.xml
View File

@@ -35,7 +35,7 @@
android:layout_height="137dp"
android:gravity="start|top"
android:background="@null"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<ImageView
@@ -72,7 +72,7 @@
android:gravity="start|center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<ImageView
@@ -91,7 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:layout_marginEnd="15dp"/>
</LinearLayout>

10
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -38,7 +38,7 @@
android:layout_gravity="center"
app:hint="请输入当前登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:text_color="@color/text_normal_282828"
app:title_hint="原密码" />
<View
@@ -55,7 +55,7 @@
android:layout_gravity="center"
app:hint="请输入新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:text_color="@color/text_normal_282828"
app:title_hint="新密码" />
<View
@@ -72,7 +72,7 @@
android:layout_gravity="center"
app:hint="再次确认新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:text_color="@color/text_normal_282828"
app:title_hint="确认密码" />
<View
@@ -97,7 +97,7 @@
android:inputType="number"
android:maxLength="16"
android:paddingBottom="5dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_14"
app:layout_constraintBottom_toBottomOf="parent"
@@ -177,7 +177,7 @@
android:gravity="center"
android:onClick="@{click}"
android:text="忘记密码?"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp" />
</LinearLayout>

8
app/src/main/res/layout/activity_nim_add_black_list.xml
View File

@@ -34,7 +34,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@id/iv_avatar"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp"
tools:text="单刀也学士" />
@@ -46,7 +46,7 @@
android:layout_marginRight="15dp"
android:gravity="center"
android:text="个人主页 >"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="14dp" />
</RelativeLayout>
@@ -59,7 +59,7 @@
android:background="@color/bg_secondary_2a2a39"
android:gravity="center"
android:text="举报"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="16dp"
android:textStyle="bold" />
@@ -75,7 +75,7 @@
android:background="@color/bg_secondary_2a2a39"
android:gravity="center"
android:text="加入黑名单"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="16dp"
android:textStyle="bold" />

6
app/src/main/res/layout/activity_p2p_message.xml
View File

@@ -48,7 +48,7 @@
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/Toolbar.TitleText"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:visibility="gone"
tools:text="孙行者123"
tools:visibility="visible" />
@@ -72,7 +72,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
android:text="已经加入黑名单"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12dp" />
</LinearLayout>
@@ -84,7 +84,7 @@
android:gravity="center"
android:src="@drawable/icon_add_black_list"
android:text="举报"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_13"
android:visibility="gone"
tools:visibility="visible" />

12
app/src/main/res/layout/activity_patriarch_mode.xml
View File

@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开启青少年模式\n将会获得以下服务"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:gravity="center"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_25"
@@ -57,7 +57,7 @@
android:drawablePadding="10dp"
android:paddingRight="28dp"
android:text="部分功能可能无法使用"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
@@ -67,7 +67,7 @@
android:drawableLeft="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="其它用户将无法通过搜索找到该账号"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
@@ -77,7 +77,7 @@
android:drawableLeft="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="限制使用钻石充值功能"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
@@ -87,7 +87,7 @@
android:drawableLeft="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="每天限玩保护"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</LinearLayout>
@@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="12sp" />
<TextView

10
app/src/main/res/layout/activity_patriarch_pwd.xml
View File

@@ -25,7 +25,7 @@
android:textSize="25sp"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_60"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:text="@string/text_pm_close_pwd"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
android:text="设置密码"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="18sp" />
<TextView
@@ -50,7 +50,7 @@
android:layout_marginTop="@dimen/dp_8"
android:gravity="center"
android:text="@string/text_pm_set_pwd_tips"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="11sp" />
<com.nnbc123.app.ui.login.ui.CodeEditText
@@ -58,7 +58,7 @@
android:inputType="numberPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_18"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
@@ -78,7 +78,7 @@
android:background="@drawable/bg_common_disable"
android:gravity="center"
android:text="下一步"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="15sp"
/>
</LinearLayout>

6
app/src/main/res/layout/activity_reset_login_pwd.xml
View File

@@ -41,7 +41,7 @@
android:inputType="number"
android:maxLength="11"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_15"
tools:ignore="SpUsage" />
@@ -66,7 +66,7 @@
android:hint="@string/hint_require_code"
android:inputType="number"
android:maxLength="16"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_14"
app:layout_constraintTop_toTopOf="parent"
@@ -105,7 +105,7 @@
android:maxLength="16"
app:hint="请输入密码(6-16个字符)"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:text_color="@color/text_normal_282828"
app:title_hint="确认密码" />
<View

36
app/src/main/res/layout/activity_room_setting.xml
View File

@@ -44,7 +44,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间名"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<TextView
@@ -59,7 +59,7 @@
android:gravity="center_vertical"
android:maxWidth="250dp"
android:maxLines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
tools:text="官方房官方房官方房官方房官方房官方房官方房官方房官方" />
@@ -84,7 +84,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间上锁"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -109,7 +109,7 @@
android:inputType="number"
android:maxLength="8"
android:singleLine="true"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14dp"
@@ -138,7 +138,7 @@
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15"
tools:text="123456" />
@@ -163,7 +163,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间分类"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<TextView
@@ -204,7 +204,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间标签"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<TextView
@@ -242,7 +242,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="管理员"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -273,7 +273,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="黑名单"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -304,7 +304,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="@string/room_bg_text"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -328,7 +328,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="高品质音效"
android:textColor="@color/text_title_white" />
android:textColor="@color/text_title_282828" />
<Switch
android:id="@+id/switch_audio"
@@ -358,7 +358,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="房间礼物特效"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -390,7 +390,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间公屏"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -423,7 +423,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_room_queuing_micro_mode"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -460,7 +460,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/text_room_pure_mode"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -473,7 +473,7 @@
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_12"
android:text="@string/tips_open_room_pure_mode"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@@ -523,7 +523,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/text_leave_mode"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -536,7 +536,7 @@
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_12"
android:text="@string/tips_leave_mode"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

10
app/src/main/res/layout/activity_room_title_edit.xml
View File

@@ -40,7 +40,7 @@
android:paddingStart="13dp"
android:paddingEnd="13dp"
android:singleLine="true"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="13sp" />
@@ -53,7 +53,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="15dp"
android:text="0/15"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="10dp" />
<EditText
@@ -69,7 +69,7 @@
android:hint="@string/label_hint_room_desc"
android:maxLength="300"
android:padding="13dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="13sp" />
@@ -82,7 +82,7 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="15dp"
android:text="0/300"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="10dp" />
<TextView
@@ -96,7 +96,7 @@
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="@string/text_ok"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp" />
</RelativeLayout>

2
app/src/main/res/layout/activity_search.xml
View File

@@ -51,7 +51,7 @@
android:maxLength="20"
android:maxLines="1"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />

4
app/src/main/res/layout/activity_search_hall.xml
View File

@@ -49,7 +49,7 @@
android:maxLength="20"
android:maxLines="1"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
@@ -72,7 +72,7 @@
android:gravity="center"
android:paddingEnd="16dp"
android:text="@string/search"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="16sp" />
</LinearLayout>

4
app/src/main/res/layout/activity_search_user.xml
View File

@@ -51,7 +51,7 @@
android:maxLength="20"
android:maxLines="1"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
@@ -106,7 +106,7 @@
android:gravity="center"
android:paddingEnd="@dimen/dp_15"
android:text="@string/label_clear"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

46
app/src/main/res/layout/activity_setting.xml
View File

@@ -45,7 +45,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_third"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_14" />
<TextView
@@ -56,7 +56,7 @@
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@+id/account_right"
android:text="@string/text_setting_wx"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp" />
<ImageView
@@ -93,7 +93,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_phone"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -112,7 +112,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/binder_right"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="123456" />
</RelativeLayout>
@@ -139,7 +139,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_alipay_account"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -160,7 +160,7 @@
android:layout_toStartOf="@id/iv_alipay_right"
android:layout_toEndOf="@id/label_alipay_binder"
android:gravity="end"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="未绑定" />
@@ -188,7 +188,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_login_password"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -223,7 +223,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_pay_password"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -243,7 +243,7 @@
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/iv_pay_pwd_arrow"
android:text="@string/text_modify"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp" />
</RelativeLayout>
@@ -264,7 +264,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/privacy_setting"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_14"
android:visibility="gone" />
@@ -285,7 +285,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/notice_setting"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_14" />
<View
@@ -305,7 +305,7 @@
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="@string/text_setting_black_management"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<View
@@ -327,7 +327,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_permission"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -358,7 +358,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_help"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -391,7 +391,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_feedback"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -423,7 +423,7 @@
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="@string/text_setting_community_norms"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp"
android:visibility="gone" />
@@ -450,7 +450,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_contact_us"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -485,7 +485,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_clear_cache"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -520,7 +520,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_about"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -555,7 +555,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_check_for_update"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -567,7 +567,7 @@
android:paddingStart="0dp"
android:paddingEnd="@dimen/dp_15"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage" />
</RelativeLayout>
@@ -593,7 +593,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_lab"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<ImageView
@@ -620,7 +620,7 @@
android:gravity="center"
android:onClick="@{click}"
android:text="@string/text_setting_logout"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />

4
app/src/main/res/layout/activity_show_bind_phone.xml
View File

@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:text="您当前绑定的手机号为"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/sp_14"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -57,7 +57,7 @@
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="更改手机号码"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_18"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

4
app/src/main/res/layout/activity_simple_web_view.xml
View File

@@ -40,7 +40,7 @@
android:id="@+id/tv_title"
android:layout_width="200dp"
android:layout_height="match_parent"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:gravity="center"
tools:text="这是标题"
android:layout_gravity="center"
@@ -62,7 +62,7 @@
tools:text="常见问题"
android:textSize="14sp"
android:visibility="gone"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</FrameLayout>

2
app/src/main/res/layout/activity_user_info.xml
View File

@@ -364,7 +364,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/user_info"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="16sp"
android:visibility="visible" />

24
app/src/main/res/layout/activity_user_info_modify.xml
View File

@@ -30,7 +30,7 @@
android:layout_centerVertical="true"
android:background="@null"
android:text="@string/label_user_info_avatar"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/font_normal" />
@@ -85,7 +85,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/label_user_info_nick"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -95,8 +95,8 @@
android:background="@null"
android:gravity="center_vertical|end"
android:hint="输入您的昵称"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_secondary_4f516a"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_secondary_878b9c"
android:textSize="@dimen/font_normal" />
</RelativeLayout>
@@ -120,7 +120,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/label_user_info_birth"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
@@ -131,8 +131,8 @@
android:layout_weight="1"
android:gravity="center_vertical|end"
android:hint="选择您的生日"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_secondary_4f516a"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_secondary_878b9c"
android:textSize="@dimen/font_normal" />
</LinearLayout>
@@ -157,7 +157,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/label_user_info_photo"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<FrameLayout
@@ -207,7 +207,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/label_user_info_audio_record"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -266,7 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_user_info_desc"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<LinearLayout
@@ -292,8 +292,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:hint="@string/label_hint_desc_setting"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_secondary_4f516a" />
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_secondary_878b9c" />
</LinearLayout>

12
app/src/main/res/layout/activity_verify_phone.xml
View File

@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="+86"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="14sp" />
<EditText
@@ -68,7 +68,7 @@
android:gravity="center_vertical"
android:inputType="phone"
android:maxLength="11"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
@@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="验证码:"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="14sp" />
<EditText
@@ -115,7 +115,7 @@
android:hint="请输入验证码"
android:inputType="number"
android:maxLength="5"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
@@ -147,7 +147,7 @@
android:background="@drawable/bg_common_confirm"
android:clickable="true"
android:text="下一步"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="18sp" />
<TextView
@@ -155,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="如果您的手机号已丢失\n请咨询客服，ID：88001"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="14sp" />
</LinearLayout>

4
app/src/main/res/layout/attention_item_new.xml
View File

@@ -45,7 +45,7 @@
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
app:layout_flexShrink="1"
tools:text="我的我的我的我的..." />
@@ -106,7 +106,7 @@
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp"
tools:text="1234568940" />

2
app/src/main/res/layout/dialog_bottom_auction.xml
View File

@@ -14,7 +14,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:text="本轮竞拍设置"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/font_normal" />
<LinearLayout

4
app/src/main/res/layout/dialog_bottom_auction_plus.xml
View File

@@ -41,7 +41,7 @@
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="'xxx'出价"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/font_larger" />
<TextView
@@ -78,7 +78,7 @@
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="您已出价"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/font_larger" />
<TextView

10
app/src/main/res/layout/dialog_charge.xml
View File

@@ -89,7 +89,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="支付方式"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_13" />
<LinearLayout
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:clickable="false"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:text="微信支付" />
@@ -154,7 +154,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:clickable="false"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
tools:text="支付宝支付" />
@@ -182,7 +182,7 @@
android:drawablePadding="4dp"
android:gravity="center"
android:text="展开更多支付方式"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_13" />
</LinearLayout>
@@ -218,7 +218,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/charge_agreement"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/sp_12" />
<TextView

2
app/src/main/res/layout/dialog_common_edit.xml
View File

@@ -69,5 +69,5 @@
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="确定"
android:textColor="@color/text_title_white" />
android:textColor="@color/text_title_282828" />
</RelativeLayout>

4
app/src/main/res/layout/dialog_mic_queue.xml
View File

@@ -23,7 +23,7 @@
android:ellipsize="marquee"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<View
@@ -77,7 +77,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12dp"
tools:text="@string/manager_no_mic_queue_tip" />

6
app/src/main/res/layout/dialog_pk_mic_queue.xml
View File

@@ -26,7 +26,7 @@
android:ellipsize="marquee"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
@@ -78,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12dp"
tools:text="@string/no_mic_queue_tip" />
@@ -140,7 +140,7 @@
android:layout_gravity="center"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="16sp"
android:background="@drawable/bg_common_disable"
android:text="@string/cancel_mic_queue"

2
app/src/main/res/layout/dialog_pk_select_people.xml
View File

@@ -20,7 +20,7 @@
android:gravity="center"
android:background="@drawable/bg_common_confirm"
android:text="@string/ok"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp" />
</LinearLayout>

4
app/src/main/res/layout/dialog_wish_list_create.xml
View File

@@ -110,7 +110,7 @@
android:layout_marginStart="13dp"
android:gravity="center"
android:includeFontPadding="true"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp"
tools:text="心心相映" />
@@ -162,7 +162,7 @@
android:gravity="center"
android:includeFontPadding="true"
android:text="普通礼物"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<View

6
app/src/main/res/layout/fans_list_item_new.xml
View File

@@ -47,7 +47,7 @@
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
tools:text="我的我的我的我的我的我的" />
@@ -107,7 +107,7 @@
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="1234568940" />
@@ -124,7 +124,7 @@
android:gravity="center"
android:scaleType="centerCrop"
android:text="@string/add_attention"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="12sp"
android:visibility="visible" />
</LinearLayout>

16
app/src/main/res/layout/fragment_add_user_info.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_100"
android:text="@string/add_info"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="@string/gender_cannot_modify"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +50,7 @@
android:layout_marginStart="23dp"
android:gravity="center_vertical"
android:text="昵称"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
app:layout_constraintStart_toStartOf="@id/view_nick_bg"
@@ -69,7 +69,7 @@
android:paddingStart="@dimen/dp_9"
android:singleLine="true"
android:text="@string/text_default_nick"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_14"
app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
app:layout_constraintEnd_toStartOf="@id/tv_random_nick"
@@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="邀请码"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_18"
app:layout_constraintStart_toStartOf="@id/view_code_bg"
app:layout_constraintEnd_toEndOf="@id/view_code_bg"
@@ -148,7 +148,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:text="请输入邀请码"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
app:layout_constraintStart_toStartOf="@id/view_code_bg"
@@ -167,7 +167,7 @@
android:maxLength="8"
android:paddingEnd="23dp"
android:singleLine="true"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_14"
app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
@@ -197,7 +197,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:text="@string/add_user_info_desc"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

10
app/src/main/res/layout/fragment_home.xml
View File

@@ -12,17 +12,17 @@
type="android.view.View.OnClickListener" />
</data>
<FrameLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFF4F4FA">
android:background="@color/bg_normal_1c1b22">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_me_page"
app:layout_constraintDimensionRatio="750:1334"
app:layout_constraintDimensionRatio="750:250"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -44,10 +44,10 @@
<com.nnbc123.library.widget.DrawableCenterTextView
android:id="@+id/tv_search"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="30dp"
android:layout_gravity="end"
android:layout_marginEnd="15dp"
android:layout_weight="1"
android:background="@drawable/shape_room_temp"
android:drawableStart="@mipmap/ic_search_main"
android:drawablePadding="6dp"
@@ -89,6 +89,6 @@
</LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

429
app/src/main/res/layout/fragment_me.xml
View File

@@ -35,7 +35,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/bg_me_page"
app:layout_constraintDimensionRatio="750:1334"
app:layout_constraintDimensionRatio="750:250"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -47,8 +47,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:onClick="@{click}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/me_item_setting">
<com.nnbc123.app.common.widget.CircleImageView
@@ -89,9 +89,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="30dp"
app:layout_constraintHorizontal_bias="0"
android:layout_marginEnd="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/iv_head_wear"
app:layout_constraintTop_toTopOf="@id/iv_head_wear">
@@ -101,10 +101,11 @@
android:layout_height="wrap_content"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="1"
android:maxLength="10"
android:layout_marginEnd="30dp"
android:maxLines="1"
android:text="@{userInfo.nick}"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_16"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
@@ -118,13 +119,12 @@
android:id="@+id/ll_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="3dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_user_name">
<TextView
android:id="@+id/tv_user_id"
android:layout_width="wrap_content"
@@ -132,7 +132,7 @@
android:drawablePadding="4dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage"
tools:text="ID:123456" />
@@ -146,6 +146,7 @@
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:src="@{userInfo.gender==1?@drawable/ic_gender_male:@drawable/ic_gender_female}"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/ll_id"
app:layout_constraintStart_toEndOf="@id/ll_id"
app:layout_constraintTop_toTopOf="@id/ll_id"
@@ -161,6 +162,7 @@
android:gravity="center"
android:textColor="@color/color_FFFFFF"
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/iv_sex"
app:layout_constraintStart_toEndOf="@id/iv_sex"
app:layout_constraintTop_toTopOf="@id/iv_sex"
@@ -217,6 +219,14 @@
</LinearLayout>
<ImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_me_arrow_userinfo"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -300,15 +310,15 @@
android:layout_weight="1"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical">
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.followNum)}"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_20"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
tools:text="999" />
@@ -316,8 +326,9 @@
android:id="@+id/tv_user_attention_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:text="@string/attention"
android:textColor="@color/color_999999"
android:textColor="@color/color_bdbfd0"
android:textSize="@dimen/sp_12" />
</LinearLayout>
@@ -329,7 +340,7 @@
android:layout_weight="1"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical">
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
@@ -337,8 +348,8 @@
android:gravity="center_vertical"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.fansNum)}"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_20"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
tools:text="999" />
@@ -346,26 +357,29 @@
android:id="@+id/tv_user_fan_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="@string/fan"
android:textColor="@color/color_999999"
android:textColor="@color/color_bdbfd0"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
<FrameLayout
android:id="@+id/tv_user_visitor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical">
android:orientation="horizontal">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
@@ -373,42 +387,45 @@
android:layout_gravity="center_horizontal"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.visitNum)}"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_20"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
tools:text="1" />
tools:text="2" />
<TextView
android:id="@+id/tv_red_dot"
android:id="@+id/tv_user_visitor_text"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_gravity="end"
android:layout_marginEnd="20dp"
android:background="@drawable/shap_red_point"
android:gravity="center"
android:includeFontPadding="false"
android:minWidth="15dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textColor="@color/white"
android:textSize="11dp"
android:visibility="gone"
tools:text="1"
tools:visibility="visible" />
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="访客"
android:textColor="@color/color_bdbfd0"
android:textSize="@dimen/sp_12" />
</FrameLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_user_visitor_text"
android:id="@+id/tv_red_dot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:maxLines="1"
android:text="访客"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12" />
android:layout_height="15dp"
android:layout_gravity="end"
android:layout_marginEnd="20dp"
android:layout_marginBottom="12dp"
android:background="@drawable/shap_red_point"
android:gravity="center"
android:includeFontPadding="false"
android:minWidth="15dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:textColor="@color/white"
android:textSize="11dp"
android:visibility="gone"
tools:text="1"
tools:visibility="visible" />
</LinearLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/tv_user_history"
@@ -417,7 +434,7 @@
android:layout_weight="1"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_room_history_num"
@@ -426,8 +443,8 @@
android:gravity="center_vertical"
android:maxLines="1"
android:text="@{String.valueOf(userInfo.inRoomNum)}"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_20"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
tools:text="999" />
@@ -435,6 +452,7 @@
android:id="@+id/tv_user_history_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="足迹"
@@ -443,164 +461,124 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<View
android:id="@+id/view_bg_entrance"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_white_8dp_round"
app:layout_constraintDimensionRatio="345:108"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_user_relation" />
<TextView
android:id="@+id/me_item_level"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="13dp"
android:layout_marginTop="2dp"
android:background="@drawable/bg_me_wallet_entrance"
android:gravity="center"
android:onClick="@{click}"
android:paddingTop="17dp"
android:text="我的等级"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/view_bg_entrance"
app:layout_constraintDimensionRatio="140:148"
app:layout_constraintEnd_toStartOf="@id/me_item_room"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/view_bg_entrance"
app:layout_constraintTop_toTopOf="@id/view_bg_entrance" />
<TextView
android:id="@+id/me_item_room"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="13dp"
android:background="@drawable/bg_me_room_entrance"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical"
android:paddingTop="17dp"
android:text="我的房间"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
app:layout_constraintDimensionRatio="140:148"
app:layout_constraintEnd_toStartOf="@id/me_item_wallet"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/me_item_level"
app:layout_constraintTop_toTopOf="@id/me_item_level" />
<TextView
android:id="@+id/me_item_wallet"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:layout_marginStart="13dp"
android:background="@drawable/bg_me_wallet_entrance"
android:gravity="center_vertical"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical"
app:layout_constraintDimensionRatio="328:128"
android:paddingTop="17dp"
android:text="钱包充值"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
app:layout_constraintDimensionRatio="140:148"
app:layout_constraintEnd_toStartOf="@id/me_item_vip"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_user_relation">
app:layout_constraintStart_toEndOf="@id/me_item_room"
app:layout_constraintTop_toTopOf="@id/me_item_level" />
<TextView
android:id="@+id/tv_diamond_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="0"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
tools:text="999" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="钻石充值"
android:textColor="@color/black_transparent_30"
android:textSize="@dimen/sp_10" />
</LinearLayout>
<LinearLayout
<TextView
android:id="@+id/me_item_vip"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_vip_me_entrance"
android:gravity="center_vertical"
android:layout_marginStart="13dp"
android:layout_marginEnd="13dp"
android:background="@drawable/bg_me_vip_entrance"
android:gravity="center"
android:onClick="@{click}"
android:orientation="vertical"
android:paddingStart="14dp"
app:layout_constraintDimensionRatio="328:128"
app:layout_constraintEnd_toEndOf="parent"
android:paddingTop="17dp"
android:text="特权贵族"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
app:layout_constraintDimensionRatio="140:148"
app:layout_constraintEnd_toEndOf="@id/view_bg_entrance"
app:layout_constraintStart_toEndOf="@id/me_item_wallet"
app:layout_constraintTop_toTopOf="@id/me_item_wallet">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginEnd="5dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@drawable/ic_user_charm_level" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_vip_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:maxLines="1"
android:text="贵族中心"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_vip_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:maxLines="1"
android:text="开通贵族立享各项特权"
android:textColor="@color/black_transparent_30"
android:textSize="@dimen/sp_10" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/fl_vip_seek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginEnd="14dp"
android:visibility="gone">
<ProgressBar
android:id="@+id/seek_bar_vip"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:max="100"
android:progress="50"
android:progressDrawable="@drawable/bg_me_vip_seek_bar"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/iv_auth_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_auth_text" />
<TextView
android:id="@+id/tv_next_vip_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="4dp"
android:includeFontPadding="false"
android:text="神皇"
android:textColor="#66333333"
android:textSize="8sp"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
app:layout_constraintTop_toTopOf="@id/me_item_level" />
<LinearLayout
android:id="@+id/ll_setting_entrance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/shape_white_8dp_round"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/me_item_wallet"
app:layout_constraintTop_toBottomOf="@id/view_bg_entrance"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:includeFontPadding="false"
android:text="功能"
android:textColor="@color/text_normal_282828"
android:textSize="15sp" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_entrance"
android:layout_width="match_parent"
@@ -619,58 +597,73 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_game"
android:id="@+id/ll_me_more"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_white_8dp_round"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_setting_entrance"
tools:visibility="visible">
app:layout_constraintTop_toBottomOf="@id/ll_setting_entrance">
<FrameLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp">
android:layout_marginTop="12dp"
android:includeFontPadding="false"
android:text="更多服务"
android:textColor="@color/text_normal_282828"
android:textSize="15sp" />
<View
android:layout_width="40dp"
android:layout_height="10dp"
android:layout_gravity="bottom|end"
android:layout_marginBottom="1dp"
android:background="@drawable/shape_ffd15a_to_ffc000" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="休闲游戏"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />
</FrameLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_game"
<TextView
android:id="@+id/tv_me_real_name"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="12dp" />
<com.nnbc123.app.home.widget.MePageIndicatorView
android:id="@+id/magic_indicator_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="7dp"
android:layout_marginStart="7dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="10dp"
android:drawableStart="@drawable/ic_me_real_name"
android:drawableEnd="@drawable/ic_me_arrow_more"
android:gravity="center_vertical"
android:onClick="@{click}"
android:text="实名认证"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_me_youth_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="10dp"
android:drawableStart="@drawable/ic_me_youth_mode"
android:drawableEnd="@drawable/ic_me_arrow_more"
android:gravity="center_vertical"
android:onClick="@{click}"
android:text="青少年模式"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_me_service"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_me_indicator_bg" />
android:drawableStart="@drawable/ic_me_service"
android:drawableEnd="@drawable/ic_me_arrow_more"
android:gravity="center_vertical"
android:onClick="@{click}"
android:text="客服中心"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</LinearLayout>
@@ -685,7 +678,7 @@
app:layout_constraintDimensionRatio="345:80"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_game"
app:layout_constraintTop_toBottomOf="@id/ll_me_more"
app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp" />

2
app/src/main/res/layout/fragment_network_error.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/network_error_reload"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/font_medium" />
</LinearLayout>

2
app/src/main/res/layout/fragment_no_data.xml
View File

@@ -19,7 +19,7 @@
android:layout_marginTop="15dp"
android:gravity="center"
android:text="@string/no_list_data"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp" />
</LinearLayout>

2
app/src/main/res/layout/fragment_no_data_large_iv.xml
View File

@@ -24,7 +24,7 @@
android:gravity="center"
android:text="@string/no_list_data"
android:layout_marginTop="15dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp" />
</LinearLayout>

2
app/src/main/res/layout/fragment_recent_contacts.xml
View File

@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="73dp"
android:gravity="center"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp"
tools:text="123" />
</LinearLayout>

10
app/src/main/res/layout/fragment_recent_list.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="消息"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="20sp" />
<ImageView
@@ -64,7 +64,7 @@
android:drawablePadding="8dp"
android:gravity="center"
android:text="官方公告"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -102,7 +102,7 @@
android:drawablePadding="8dp"
android:gravity="center"
android:text="活动通知"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -139,7 +139,7 @@
android:drawablePadding="8dp"
android:gravity="center"
android:text="订阅提醒"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<View
@@ -173,7 +173,7 @@
android:drawablePadding="8dp"
android:gravity="center"
android:text="发现萌新"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<View

2
app/src/main/res/layout/fragment_recent_list_room.xml
View File

@@ -36,7 +36,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_15"
android:text="@string/find_new"
android:gravity="center_vertical"

12
app/src/main/res/layout/fragment_userinfo_userinfo.xml
View File

@@ -61,7 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="公会·房间"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:visibility="visible" />
@@ -100,7 +100,7 @@
android:includeFontPadding="false"
android:lines="1"
android:maxLength="9"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_12"
tools:text="忘忧忘忧忘忧忘忧阁忘忧阁阁阁忘忧阁阁" />
@@ -135,7 +135,7 @@
android:layout_marginTop="6dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_11"
android:visibility="gone"
tools:text="公会数量：123" />
@@ -204,7 +204,7 @@
android:includeFontPadding="false"
android:lines="1"
android:maxLength="9"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textColorHint="@color/color_999999"
android:textSize="@dimen/dp_12" />
@@ -215,7 +215,7 @@
android:layout_marginTop="@dimen/dp_5"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_11"
android:visibility="gone"
tools:text="公会ID：123456" />
@@ -300,7 +300,7 @@
android:paddingEnd="20dp"
android:paddingBottom="10dp"
android:text="礼物墙"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
android:textStyle="bold" />

2
app/src/main/res/layout/frg_no_data_large_iv_transparent.xml
View File

@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/no_list_data"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="13sp" />
</LinearLayout>

2
app/src/main/res/layout/im_customer_msg_text.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/tv_msg"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp"
android:maxWidth="215dp"
tools:text="恭喜您，获得抽奖机会，点我抽奖>>" />

6
app/src/main/res/layout/item_car_garage_normal.xml
View File

@@ -46,7 +46,7 @@
android:layout_toEndOf="@+id/ll_car_cover"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="10dp"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:singleLine="true"
android:drawableStart="@{carInfo.isGive ? @drawable/ic_send_tag : null}"
android:drawablePadding="5dp"
@@ -62,7 +62,7 @@
android:gravity="center"
android:textSize="14sp"
android:visibility="gone"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
tools:visibility="visible"
android:layout_marginEnd="@dimen/dp_15"
android:layout_alignTop="@id/tv_car_name"
@@ -82,7 +82,7 @@
android:layout_marginTop="24dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="- 1567天 -" />

4
app/src/main/res/layout/item_friend_black_list_manage.xml
View File

@@ -12,7 +12,7 @@
android:background="#F95654"
android:gravity="center"
android:text="移除"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp" />
@@ -42,7 +42,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@id/iv_avatar"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp"
tools:text="单刀也学士" />

4
app/src/main/res/layout/item_home_dynamic.xml
View File

@@ -69,7 +69,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="15sp"
android:lines="1"
android:layout_marginStart="@dimen/dp_15"
@@ -99,7 +99,7 @@
android:layout_weight="1"
android:layout_gravity="bottom"
android:gravity="center_vertical"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_15"
tools:text="0" />
</LinearLayout>

2
app/src/main/res/layout/item_me_center.xml
View File

@@ -38,7 +38,7 @@
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/color_666666"
android:textColor="@color/text_normal_282828"
android:textSize="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/item_mic_queue_list.xml
View File

@@ -83,7 +83,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="15sp"
tools:text="我的" />

8
app/src/main/res/layout/item_my_head_wear.xml
View File

@@ -50,7 +50,7 @@
android:drawableStart="@{headWearInfo.comeFrom==1?null:@drawable/ic_send_tag}"
android:drawablePadding="@dimen/dp_5"
android:text="@{headWearInfo.headwearName}"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
tools:text="神豪座驾" />
@@ -64,12 +64,12 @@
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
android:gravity="center"
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_white}"
android:textColor="@{headWearInfo.used ? @color/color_4C5AF1 : @color/text_title_282828}"
android:textSize="14sp"
android:visibility="gone"
tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use"
tools:textColor="@color/text_title_white"
tools:textColor="@color/text_title_282828"
tools:visibility="visible" />
@@ -83,7 +83,7 @@
android:drawablePadding="1dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="剩余666天" />

2
app/src/main/res/layout/item_pk_mic_queue_list.xml
View File

@@ -80,7 +80,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="15sp"
tools:text="我的" />

8
app/src/main/res/layout/item_record_for_pk.xml
View File

@@ -217,7 +217,7 @@
android:background="@drawable/bg_pk_record_loser"
android:gravity="center_horizontal"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="13sp"
tools:text="胜利" />
@@ -235,7 +235,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="13sp"
tools:text="@string/vote_type_gift_value" />
@@ -246,7 +246,7 @@
android:layout_marginTop="5dp"
android:gravity="center"
android:lines="2"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="12sp"
tools:text="2018-12-12\n21:28:32" />
@@ -276,7 +276,7 @@
android:background="@drawable/bg_pk_record_loser"
android:gravity="center_horizontal"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="13sp"
tools:text="胜利" />

4
app/src/main/res/layout/item_system_notice.xml
View File

@@ -16,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="名称"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp" />
<TextView
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
tools:text="描述"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="12sp" />
</LinearLayout>

2
app/src/main/res/layout/item_wish_list_history_time.xml
View File

@@ -14,7 +14,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView

2
app/src/main/res/layout/item_wish_list_text.xml
View File

@@ -9,7 +9,7 @@
android:paddingStart="13dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="14sp"
tools:text="每整点半小时内，机会登上房间首页的官方推荐哦~" />

2
app/src/main/res/layout/layout_edit_eyes.xml
View File

@@ -28,7 +28,7 @@
android:gravity="start|center"
android:inputType="textPassword"
android:maxLength="16"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_14"
tools:ignore="SpUsage"

6
app/src/main/res/layout/layout_msg_view_holder_content.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="16dp" />
<ImageView
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="13dp" />
</LinearLayout>
@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="点击查看"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="15dp" />
<View

6
app/src/main/res/layout/layout_msg_view_holder_gift.xml
View File

@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_toRightOf="@id/avatar"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="15dp"
tools:text="礼物名称"/>
@@ -53,7 +53,7 @@
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="15dp"
tools:text="x1"/>
@@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
tools:text="赠给 xxx"/>
</LinearLayout>

2
app/src/main/res/layout/layout_msg_view_holder_hello.xml
View File

@@ -11,6 +11,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="恭喜您，获得抽奖机会，点我抽奖>>"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</LinearLayout>

2
app/src/main/res/layout/layout_msg_view_holder_in_app_sharing.xml
View File

@@ -42,7 +42,7 @@
tools:text="立即加入"
android:gravity="center"
android:textSize="@dimen/dp_16"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"

4
app/src/main/res/layout/layout_msg_view_holder_level.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="16dp"
tools:text="恭喜!您的等级已到达" />
@@ -55,7 +55,7 @@
android:drawableRight="@drawable/arrow_right"
android:gravity="center_vertical"
android:text="立即查看"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14dp" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/layout/layout_msg_view_holder_lottery.xml
View File

@@ -11,6 +11,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="恭喜您，获得抽奖机会，点我抽奖>>"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="14sp" />
</LinearLayout>

2
app/src/main/res/layout/layout_msg_view_holder_lucky_money_receive.xml
View File

@@ -16,7 +16,7 @@
android:gravity="center"
android:layout_gravity="center"
tools:text="你领取了一个红包"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage" />

2
app/src/main/res/layout/layout_msg_view_holder_match.xml
View File

@@ -6,6 +6,6 @@
android:layout_height="wrap_content"
android:maxWidth="215dp"
android:padding="@dimen/dp_5"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="14sp"
tools:text="恭喜您，获得抽奖机会，点我抽奖>>" />

4
app/src/main/res/layout/layout_msg_view_holder_online.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@id/avatar"
android:text="您关注的TA"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="16dp" />
<TextView
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="13dp"
tools:text="您关注的T您关注的TA您关注的TA您关注的TAA" />

2
app/src/main/res/layout/layout_msg_view_holder_red_packet.xml
View File

@@ -25,7 +25,7 @@
android:id="@+id/tip_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"

6
app/src/main/res/layout/layout_msg_view_holder_sign_in_notice.xml
View File

@@ -11,7 +11,7 @@
<TextView
android:id="@+id/tv_title"
tools:text="点我！点我！点我！"
android:textColor="@color/text_title_white"
android:textColor="@color/text_title_282828"
android:textSize="@dimen/sp_16"
android:paddingStart="@dimen/dp_9"
android:paddingEnd="@dimen/dp_9"
@@ -27,7 +27,7 @@
android:paddingStart="@dimen/dp_9"
android:paddingEnd="@dimen/dp_9"
android:gravity="center"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_secondary_878b9c"
android:textSize="@dimen/sp_14"
tools:text="提醒签到消息" />
@@ -39,7 +39,7 @@
<TextView
android:gravity="center"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_15"
android:text="@string/go_to_sign_in"
android:layout_width="match_parent"

2
app/src/main/res/layout/layout_recommend_topic_header.xml
View File

@@ -12,7 +12,7 @@
android:layout_marginEnd="@dimen/dp_15"
android:drawableEnd="@drawable/arrow_right_more_room"
android:text="@string/recommend_topic"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/list_item_charge.xml
View File

@@ -36,7 +36,7 @@
android:layout_marginStart="@dimen/dp_5"
android:gravity="center_vertical"
android:text="@string/diamond"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_normal_282828"
android:textSize="@dimen/dp_11"
android:visibility="gone" />

Some files were not shown because too many files have changed in this diff Show More