[Modify]点单ui修改
@@ -46,6 +46,8 @@ import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity;
|
||||
import com.nnbc123.app.ui.user.adapter.SelfPhotoAdapter;
|
||||
import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter;
|
||||
import com.nnbc123.app.ui.user.adapter.UserInfoPhotoAdapter;
|
||||
import com.nnbc123.app.ui.user.dialog.CreateGangUpDialog;
|
||||
import com.nnbc123.app.ui.user.view.UserGameBlackFragment;
|
||||
import com.nnbc123.app.ui.user.view.UserInfoDynamicFragment;
|
||||
import com.nnbc123.app.ui.user.view.UserInfoInfoFragment;
|
||||
import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel;
|
||||
@@ -63,7 +65,6 @@ import com.nnbc123.app.vip.VipHelper;
|
||||
import com.nnbc123.core.auth.AuthModel;
|
||||
import com.nnbc123.core.im.friend.IMFriendModel;
|
||||
import com.nnbc123.core.level.UserLevelVo;
|
||||
import com.nnbc123.core.module_hall.hall.bean.ClanInfo;
|
||||
import com.nnbc123.core.praise.PraiseModel;
|
||||
import com.nnbc123.core.praise.event.IsLikedEvent;
|
||||
import com.nnbc123.core.praise.event.PraiseEvent;
|
||||
@@ -168,6 +169,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
if (AuthModel.get().getCurrentUid() == userId) {
|
||||
identityState = OWN;
|
||||
mBinding.tvFansCount.setOnClickListener(this);
|
||||
mBinding.tvAttention.setVisibility(View.GONE);
|
||||
if (bottomViewLayout != null)
|
||||
bottomViewLayout.setVisibility(View.GONE);
|
||||
} else {
|
||||
@@ -177,6 +179,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
} else {
|
||||
identityState = IdentityState.OTHER;
|
||||
}
|
||||
mBinding.tvAttention.setVisibility(View.VISIBLE);
|
||||
mBinding.tvAttention.setOnClickListener(this);
|
||||
if (bottomViewLayout == null) {
|
||||
View view = mBinding.vsBottomLayout.getViewStub().inflate();
|
||||
bottomViewLayout = view.findViewById(R.id.bottom_view_layout);
|
||||
@@ -228,13 +232,15 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
}
|
||||
|
||||
private void initViewPager() {
|
||||
List<Fragment> fragmentList = new ArrayList<>(2);
|
||||
List<Fragment> fragmentList = new ArrayList<>(3);
|
||||
fragmentList.add(new UserInfoInfoFragment());
|
||||
fragmentList.add(new UserInfoDynamicFragment());
|
||||
fragmentList.add(new UserGameBlackFragment());
|
||||
pagerAdapter = new UserInfoPagerAdapter(getSupportFragmentManager(), fragmentList);
|
||||
final List<String> tagList = new ArrayList<>(2);
|
||||
final List<String> tagList = new ArrayList<>(3);
|
||||
tagList.add("资料");
|
||||
tagList.add("动态");
|
||||
tagList.add("游戏开黑");
|
||||
CommonNavigator commonNavigator = new CommonNavigator(context);
|
||||
commonNavigator.setTitleMargin(ScreenUtil.dip2px(6.0F));
|
||||
MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(context, tagList);
|
||||
@@ -526,8 +532,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
case R.id.attention_layout:
|
||||
case R.id.tv_attention:
|
||||
if (userInfo == null) {
|
||||
toast("用户信息为空。");
|
||||
return;
|
||||
@@ -556,6 +561,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
PraiseModel.get().praise(userInfo.getUid(), true).subscribe();
|
||||
}
|
||||
break;
|
||||
case R.id.attention_layout:
|
||||
new CreateGangUpDialog().show(this);
|
||||
break;
|
||||
case R.id.fl_avatar:
|
||||
if (userInfo == null) {
|
||||
toast("用户信息为空。");
|
||||
@@ -583,11 +591,12 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
|
||||
private void setLikedText(boolean isliked) {
|
||||
mIslike = isliked;
|
||||
attentionLayout.setBackgroundResource(isliked ? R.drawable.bg_common_cancel : R.drawable.bg_common_confirm);
|
||||
attentionLayout.setCompoundDrawablesRelativeWithIntrinsicBounds(
|
||||
mBinding.tvAttention.setBackgroundResource(isliked ? R.drawable.bg_cancel_attention : R.drawable.bg_attention);
|
||||
mBinding.tvAttention.setCompoundDrawablesRelativeWithIntrinsicBounds(
|
||||
isliked ? R.drawable.icon_new_attentioned : R.drawable.icon_new_attention,
|
||||
0, 0, 0);
|
||||
attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
|
||||
mBinding.tvAttention.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
|
||||
mBinding.tvAttention.setTextColor(isliked ? ContextCompat.getColor(this, R.color.color_662B2D33) : ContextCompat.getColor(this, R.color.color_2B2D33));
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
|
@@ -0,0 +1,23 @@
|
||||
package com.nnbc123.app.ui.user.adapter;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
||||
import com.chad.library.adapter.base.BaseViewHolder;
|
||||
import com.nnbc123.app.R;
|
||||
|
||||
/**
|
||||
* create by lvzebiao @2019/11/13
|
||||
*/
|
||||
public class UserGameBlackAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
|
||||
|
||||
public UserGameBlackAdapter(Context context) {
|
||||
super(R.layout.item_user_game_black);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void convert(BaseViewHolder helper, String item) {
|
||||
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,24 @@
|
||||
package com.nnbc123.app.ui.user.dialog
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.view.Gravity
|
||||
import android.view.WindowManager
|
||||
import com.nnbc123.app.base.BaseDialog
|
||||
import com.nnbc123.app.databinding.DialogCreateGangUpInviteBinding
|
||||
|
||||
/**
|
||||
* @author wushaocheng
|
||||
* @Description 开黑邀请
|
||||
* @Date 2023/08/22
|
||||
*/
|
||||
class CreateGangUpDialog : BaseDialog<DialogCreateGangUpInviteBinding>() {
|
||||
|
||||
override var width = WindowManager.LayoutParams.MATCH_PARENT
|
||||
override var gravity = Gravity.BOTTOM
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
override fun init() {
|
||||
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,42 @@
|
||||
package com.nnbc123.app.ui.user.view
|
||||
|
||||
import android.view.View
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.nnbc123.app.base.BaseViewBindingFragment
|
||||
import com.nnbc123.app.databinding.FragmentUserGameBlackBinding
|
||||
import com.nnbc123.app.ui.user.adapter.UserGameBlackAdapter
|
||||
import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel
|
||||
import com.nnbc123.core.community.bean.WorldDynamicBean
|
||||
import com.nnbc123.core.user.bean.UserDetailInfo
|
||||
|
||||
class UserGameBlackFragment : BaseViewBindingFragment<FragmentUserGameBlackBinding>() {
|
||||
private val vm by activityViewModels<UserInfoViewModel>()
|
||||
private var userGameBlackAdapter: UserGameBlackAdapter? = null
|
||||
override fun init() {
|
||||
vm.userInfoDetailData.observe(this, Observer { dataBean: UserDetailInfo.DataBean ->
|
||||
initDynamicList(dataBean.dynamicInfo)
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 动态列表
|
||||
*
|
||||
* @param list
|
||||
*/
|
||||
private fun initDynamicList(list: List<WorldDynamicBean>) {
|
||||
if (userGameBlackAdapter == null) {
|
||||
binding.rvDynamic.layoutManager = LinearLayoutManager(mContext)
|
||||
userGameBlackAdapter = UserGameBlackAdapter(mContext)
|
||||
userGameBlackAdapter?.setEnableLoadMore(false)
|
||||
userGameBlackAdapter?.setOnItemChildClickListener { _, view: View, pos: Int ->
|
||||
// val bean: WorldDynamicBean =
|
||||
// dynamicAdapter?.getItem(pos) ?: return@setOnItemChildClickListener
|
||||
}
|
||||
binding.rvDynamic.adapter = userGameBlackAdapter
|
||||
}
|
||||
// userGameBlackAdapter?.setNewData(list)
|
||||
}
|
||||
|
||||
}
|
BIN
app/src/main/res/drawable-xhdpi/ic_chat.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
app/src/main/res/drawable-xhdpi/ic_gang_up.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
app/src/main/res/drawable-xhdpi/ic_green.png
Normal file
After Width: | Height: | Size: 837 B |
BIN
app/src/main/res/drawable-xhdpi/ic_king.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
app/src/main/res/drawable-xhdpi/ic_sparring_partner.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
6
app/src/main/res/drawable/bg_attention.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/dp_6" />
|
||||
<solid android:color="@color/color_FFDA24" />
|
||||
</shape>
|
6
app/src/main/res/drawable/bg_cancel_attention.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/dp_6" />
|
||||
<solid android:color="#66FFDA24" />
|
||||
</shape>
|
7
app/src/main/res/drawable/bg_gang_up.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="@color/color_FFDA24" />
|
||||
<solid android:color="@color/color_white" />
|
||||
<corners android:radius="20dp" />
|
||||
</shape>
|
10
app/src/main/res/drawable/bg_gang_up_tip_left.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#eceef3"
|
||||
android:startColor="#E9EAEF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
</shape>
|
10
app/src/main/res/drawable/bg_gang_up_tip_right.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#eceef3"
|
||||
android:startColor="#E9EAEF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
</shape>
|
@@ -96,7 +96,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -160,14 +159,15 @@
|
||||
app:layout_constraintStart_toEndOf="@id/tv_nick"
|
||||
app:layout_constraintTop_toTopOf="@id/tv_nick"
|
||||
tools:text="金牛座" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_id"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_nick"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center">
|
||||
android:layout_marginTop="5dp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_nick">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_new_user"
|
||||
@@ -191,11 +191,11 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="3dp"
|
||||
android:drawableEnd="@drawable/ic_copy_id"
|
||||
android:drawablePadding="3dp"
|
||||
android:gravity="center_vertical"
|
||||
android:includeFontPadding="false"
|
||||
android:maxLines="1"
|
||||
android:drawablePadding="3dp"
|
||||
android:drawableEnd="@drawable/ic_copy_id"
|
||||
android:textColor="#BDBFD0"
|
||||
android:textSize="12dp"
|
||||
tools:text="ID:7958626" />
|
||||
@@ -217,8 +217,8 @@
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginEnd="@dimen/dp_4"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
app:drawableStartCompat="@drawable/ic_userinfo_hall" />
|
||||
app:drawableStartCompat="@drawable/ic_userinfo_hall"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_user_level"
|
||||
@@ -328,7 +328,6 @@
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -357,6 +356,25 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_attention"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:layout_marginTop="221dp"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:drawableStart="@drawable/icon_new_attention"
|
||||
android:drawablePadding="2dp"
|
||||
android:paddingStart="@dimen/dp_12"
|
||||
android:paddingTop="@dimen/dp_6"
|
||||
android:paddingEnd="@dimen/dp_14"
|
||||
android:paddingBottom="@dimen/dp_6"
|
||||
android:text="@string/attention"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:visibility="gone"
|
||||
android:background="@drawable/bg_attention"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
@@ -406,7 +424,6 @@
|
||||
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
|
||||
|
||||
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||
|
||||
<FrameLayout
|
||||
|
211
app/src/main/res/layout/dialog_create_gang_up_invite.xml
Normal file
@@ -0,0 +1,211 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@drawable/shape_white_bottom_20dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_16"
|
||||
android:text="@string/gang_up_invite"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/mRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="@dimen/dp_22"
|
||||
android:orientation="horizontal"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_duration"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_18"
|
||||
android:text="@string/Black_duration"
|
||||
android:textColor="@color/color_A2A7B8"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/mRecyclerView" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_reduce"
|
||||
android:layout_width="@dimen/dp_22"
|
||||
android:layout_height="@dimen/dp_22"
|
||||
android:gravity="center"
|
||||
android:text="-"
|
||||
android:textColor="@color/color_A2A7B8"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_duration"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_num"
|
||||
app:solid="@color/color_F5F5F5"
|
||||
app:start_bottom_corner="@dimen/dp_4"
|
||||
app:start_top_corner="@dimen/dp_4" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_num"
|
||||
android:layout_width="@dimen/dp_32"
|
||||
android:layout_height="@dimen/dp_22"
|
||||
android:gravity="center"
|
||||
android:text="1"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_add"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_add"
|
||||
app:solid="@color/color_FCFCFC" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_add"
|
||||
android:layout_width="@dimen/dp_22"
|
||||
android:layout_height="@dimen/dp_22"
|
||||
android:layout_marginEnd="@dimen/dp_20"
|
||||
android:gravity="center"
|
||||
android:text="+"
|
||||
android:textColor="@color/color_FFDA24"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_duration"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:right_bottom_corner="@dimen/dp_4"
|
||||
app:right_top_corner="@dimen/dp_4"
|
||||
app:solid="@color/color_F5F5F5" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_tip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/dp_28"
|
||||
android:layout_marginTop="@dimen/dp_18"
|
||||
android:background="@color/color_F8F8FA"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_duration">
|
||||
|
||||
<View
|
||||
android:layout_width="74dp"
|
||||
android:layout_height="@dimen/dp_2"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:background="@drawable/bg_gang_up_tip_left" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/ic_green"
|
||||
android:drawablePadding="@dimen/dp_4"
|
||||
android:text="绿色平台守护中心"
|
||||
android:textColor="@color/color_A2A7B8"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
|
||||
<View
|
||||
android:layout_width="74dp"
|
||||
android:layout_height="@dimen/dp_2"
|
||||
android:layout_marginStart="@dimen/dp_10"
|
||||
android:background="@drawable/bg_gang_up_tip_right" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_total"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:text="合计:"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ll_tip" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_total_num"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_8"
|
||||
android:textColor="@color/color_FFA024"
|
||||
android:textSize="@dimen/sp_20"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_total"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ll_tip"
|
||||
tools:text="200" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_4"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:text="钻石"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_total_num"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ll_tip" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_balance"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="@dimen/dp_6"
|
||||
android:layout_marginBottom="@dimen/dp_4"
|
||||
android:text="余额:"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_14"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_total"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_diamond"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableStart="@drawable/icon_diamond"
|
||||
android:drawablePadding="@dimen/dp_2"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_balance"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_balance"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_balance"
|
||||
tools:text="600" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="充值 >"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_balance"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_diamond"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_balance" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_invite"
|
||||
android:text="发起邀请"
|
||||
android:textSize="@dimen/sp_14"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:paddingStart="34dp"
|
||||
android:paddingEnd="34dp"
|
||||
android:paddingTop="@dimen/dp_10"
|
||||
android:paddingBottom="@dimen/dp_10"
|
||||
app:solid="@color/color_FFDA24"
|
||||
app:corner="@dimen/dp_20"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_total"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_balance"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
12
app/src/main/res/layout/fragment_user_game_black.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#F8F8FB">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rv_dynamic"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@@ -22,22 +22,30 @@
|
||||
|
||||
<com.nnbc123.app.common.widget.CircleImageView
|
||||
android:id="@+id/iv_avatar"
|
||||
android:layout_width="75dp"
|
||||
android:layout_height="75dp"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
android:src="@drawable/default_cover"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:src="@drawable/ic_sparring_partner"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
|
||||
app:layout_constraintStart_toStartOf="@+id/iv_avatar"
|
||||
app:layout_constraintEnd_toEndOf="@+id/iv_avatar"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/view_online"
|
||||
android:layout_width="14dp"
|
||||
android:layout_height="14dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="@dimen/dp_11"
|
||||
android:layout_height="@dimen/dp_11"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
android:background="@drawable/shape_home_online"
|
||||
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
|
||||
app:layout_constraintTop_toTopOf="@id/iv_avatar"
|
||||
app:layout_constraintEnd_toEndOf="@id/iv_avatar" />
|
||||
|
||||
<ImageView
|
||||
@@ -60,13 +68,13 @@
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="15sp"
|
||||
app:layout_constraintBottom_toTopOf="@id/ll_gender_age"
|
||||
app:layout_constraintEnd_toStartOf="@id/ll_online"
|
||||
app:layout_constraintEnd_toStartOf="@id/tv_game_type"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
|
||||
app:layout_constraintTop_toTopOf="@id/view_bg"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:layout_goneMarginStart="12dp"
|
||||
tools:text="余生点唱歌曲交友房间" />
|
||||
tools:text="余生点唱歌曲交友房间萨达萨达萨达" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_gender_age"
|
||||
@@ -85,6 +93,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:src="@drawable/ic_home_woman" />
|
||||
|
||||
<TextView
|
||||
@@ -93,7 +102,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="2dp"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="10sp"
|
||||
android:textSize="@dimen/sp_11"
|
||||
tools:text="22" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -106,7 +115,7 @@
|
||||
android:background="@drawable/shape_f6f7f9_corner"
|
||||
android:gravity="center"
|
||||
android:textColor="#ffb3b5c4"
|
||||
android:textSize="10dp"
|
||||
android:textSize="@dimen/sp_10"
|
||||
app:layout_constraintBottom_toBottomOf="@id/ll_gender_age"
|
||||
app:layout_constraintStart_toEndOf="@id/ll_gender_age"
|
||||
app:layout_constraintTop_toTopOf="@id/ll_gender_age"
|
||||
@@ -128,15 +137,36 @@
|
||||
app:layout_constraintStart_toEndOf="@id/iv_avatar"
|
||||
app:layout_constraintTop_toBottomOf="@id/ll_gender_age" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_game_type"
|
||||
android:text="王者荣耀|英雄联盟"
|
||||
android:textSize="@dimen/sp_10"
|
||||
android:textColor="@color/color_696D7A"
|
||||
android:drawableStart="@drawable/ic_king"
|
||||
android:drawablePadding="@dimen/dp_2"
|
||||
android:gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:paddingTop="@dimen/dp_3"
|
||||
android:paddingBottom="@dimen/dp_3"
|
||||
android:paddingStart="@dimen/dp_10"
|
||||
android:paddingEnd="@dimen/dp_8"
|
||||
app:layout_constraintTop_toTopOf="@id/tv_nickname"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
|
||||
app:layout_constraintEnd_toEndOf="@+id/view_bg"
|
||||
app:corner="@dimen/dp_10"
|
||||
app:solid="@color/color_F8F8FA"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_online"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:layout_marginBottom="@dimen/dp_14"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="@id/view_bg"
|
||||
app:layout_constraintEnd_toEndOf="@id/view_bg"
|
||||
app:layout_constraintTop_toTopOf="@id/view_bg">
|
||||
app:layout_constraintEnd_toEndOf="@id/view_bg">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_talk"
|
||||
|
@@ -13,25 +13,24 @@
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="36dp"
|
||||
android:background="@drawable/bg_common_confirm"
|
||||
android:drawableLeft="@drawable/icon_chat"
|
||||
android:drawablePadding="5dp"
|
||||
android:drawableStart="@drawable/icon_chat"
|
||||
android:drawablePadding="4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/send_msg"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="15sp" />
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_14" />
|
||||
|
||||
<com.nnbc123.library.widget.DrawableCenterTextView
|
||||
android:id="@+id/attention_layout"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="36dp"
|
||||
android:layout_marginStart="25dp"
|
||||
android:background="@drawable/bg_common_confirm"
|
||||
android:drawableStart="@drawable/icon_new_attention"
|
||||
android:drawablePadding="5dp"
|
||||
android:background="@drawable/bg_gang_up"
|
||||
android:drawableStart="@drawable/ic_gang_up"
|
||||
android:drawablePadding="4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/attention"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="15sp" />
|
||||
|
||||
android:text="@string/gang_up"
|
||||
android:textColor="@color/color_2B2D33"
|
||||
android:textSize="@dimen/sp_14" />
|
||||
|
||||
</LinearLayout>
|
@@ -609,6 +609,7 @@
|
||||
<color name="color_161958">#161958</color>
|
||||
<color name="color_bdbfd0">#BDBFD0</color>
|
||||
<color name="color_2B2D33">#2B2D33</color>
|
||||
<color name="color_662B2D33">#662B2D33</color>
|
||||
<color name="color_FFDA24">#FFDA24</color>
|
||||
<color name="color_696D7A">#696D7A</color>
|
||||
<color name="color_A2A7B8">#A2A7B8</color>
|
||||
@@ -618,5 +619,9 @@
|
||||
<color name="color_FA940A">#FA940A</color>
|
||||
<color name="color_167FE0">#167FE0</color>
|
||||
<color name="color_BA43E0">#BA43E0</color>
|
||||
<color name="color_FFECD2">#FFECD2</color>
|
||||
<color name="color_683F0B">#683F0B</color>
|
||||
<color name="color_FCFCFC">#FCFCFC</color>
|
||||
<color name="color_FFA024">#FFA024</color>
|
||||
|
||||
</resources>
|
||||
|
@@ -981,5 +981,8 @@
|
||||
<string name="Daily_statistics">按日统计</string>
|
||||
<string name="Weekly_statistics">每周统计</string>
|
||||
<string name="Monthly_statistics">每月统计</string>
|
||||
<string name="gang_up">找ta开黑</string>
|
||||
<string name="gang_up_invite">开黑邀请</string>
|
||||
<string name="Black_duration">开黑时长(局):</string>
|
||||
|
||||
</resources>
|
||||
|
BIN
app/src/module_community/res/drawable-xhdpi/bg_game_black.png
Normal file
After Width: | Height: | Size: 104 KiB |
BIN
app/src/module_community/res/drawable-xhdpi/bg_order.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
app/src/module_community/res/drawable-xhdpi/ic_king_mark.png
Normal file
After Width: | Height: | Size: 16 KiB |
119
app/src/module_community/res/layout/item_user_game_black.xml
Normal file
@@ -0,0 +1,119 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="88dp"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
android:background="@drawable/bg_game_black">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/iv_king_mark"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_18"
|
||||
android:src="@drawable/ic_king_mark"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:text="王者荣耀"
|
||||
android:textColor="@color/color_white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
app:layout_constraintStart_toEndOf="@+id/iv_king_mark"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:text="最强王者"
|
||||
android:textColor="@color/color_FFECD2"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_name"
|
||||
app:layout_constraintStart_toEndOf="@+id/tv_name"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_name" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_shunt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_4"
|
||||
android:paddingStart="@dimen/dp_6"
|
||||
android:paddingTop="@dimen/dp_2"
|
||||
android:paddingEnd="@dimen/dp_6"
|
||||
android:paddingBottom="@dimen/dp_2"
|
||||
android:text="最强分路:打野|中路"
|
||||
android:textColor="@color/color_FFFFFF"
|
||||
android:textSize="@dimen/sp_10"
|
||||
app:corner="@dimen/dp_4"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_name"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_name"
|
||||
app:solid="@color/white_transparent_10" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
android:id="@+id/tv_server_region"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_4"
|
||||
android:paddingStart="@dimen/dp_6"
|
||||
android:paddingTop="@dimen/dp_2"
|
||||
android:paddingEnd="@dimen/dp_6"
|
||||
android:paddingBottom="@dimen/dp_2"
|
||||
android:text="有号区服:手游q区"
|
||||
android:textColor="@color/color_FFFFFF"
|
||||
android:textSize="@dimen/sp_10"
|
||||
app:corner="@dimen/dp_4"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_name"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_shunt"
|
||||
app:solid="@color/white_transparent_10" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_diamond"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:drawableStart="@drawable/icon_diamond"
|
||||
android:drawablePadding="2dp"
|
||||
android:textColor="@color/color_white"
|
||||
android:textSize="@dimen/sp_16"
|
||||
android:layout_marginEnd="2dp"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_diamond_num"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="100" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_diamond_num"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="钻/局"
|
||||
android:textColor="@color/white_transparent_80"
|
||||
android:textSize="@dimen/sp_10"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_diamond"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_diamond" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:text="咨询下单"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:textColor="@color/color_683F0B"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/bg_order"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_14"
|
||||
android:layout_marginBottom="@dimen/dp_12"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|