个人主页UI修改
This commit is contained in:
@@ -16,6 +16,7 @@ import androidx.core.widget.NestedScrollView;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.netease.nim.uikit.StatusBarUtil;
|
||||
import com.yizhuan.erban.ui.widget.rollviewpager.hintview.TextHintView;
|
||||
import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
|
||||
import com.netease.nim.uikit.support.glide.GlideApp;
|
||||
@@ -57,7 +58,6 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
|
||||
import com.yizhuan.xchat_android_core.praise.PraiseModel;
|
||||
import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent;
|
||||
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;
|
||||
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
|
||||
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
|
||||
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
|
||||
import com.yizhuan.xchat_android_core.user.UserInfoUiMgr;
|
||||
@@ -77,6 +77,7 @@ import com.yizhuan.xchat_android_library.utils.SizeUtils;
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
import org.greenrobot.eventbus.ThreadMode;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
@@ -93,9 +94,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
|
||||
public static final int REQUEST_CODE_UPDATE_VOICE = 1;
|
||||
|
||||
private int TAB_SIZE = 1;
|
||||
private int TAB_DYNAMIC = 0;
|
||||
|
||||
public interface IdentityState {
|
||||
int NON = 0; // 无法识别
|
||||
int OWN = 1; // 自己
|
||||
@@ -111,9 +109,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
Drawable mAttenedDrawable;
|
||||
|
||||
private boolean mIslike = false;
|
||||
private RoomInfo mRoomInfo = null;
|
||||
private int flag = 0;
|
||||
private boolean isNoble;
|
||||
private LinearLayout bottomViewLayout = null;
|
||||
private TextView sendMsgLayout;
|
||||
private TextView attentionLayout;
|
||||
@@ -123,21 +119,24 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
|
||||
private long mRoomUid;
|
||||
|
||||
private GiftAdapter giftAdapter;
|
||||
private UserInfoDynamicAdapter dynamicAdapter;
|
||||
private UserInfoPhotoAdapter bannerAdapter;
|
||||
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
@Override
|
||||
protected void init() {
|
||||
mActivity = this;
|
||||
userId = getIntent().getLongExtra("userId", 0);
|
||||
UserInfoUiMgr.get().setUid(userId);
|
||||
|
||||
onFindViews();
|
||||
onSetListener();
|
||||
EventBus.getDefault().register(this);
|
||||
getUserInfo();
|
||||
initAttentionView();
|
||||
initNestScrollView();
|
||||
setEditButton(identityState, true);
|
||||
setBackBottom(true);
|
||||
setEditButton(identityState);
|
||||
setTitleVisible(false);
|
||||
|
||||
}
|
||||
@@ -227,10 +226,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
});
|
||||
}
|
||||
|
||||
private void setBackBottom(boolean isExpanded) {
|
||||
mBinding.ivUserBack.setImageResource(isExpanded ? R.drawable.icon_user_back : R.drawable.icon_user_back_black);
|
||||
}
|
||||
|
||||
private void setTitleVisible(boolean visible) {
|
||||
mBinding.tvUserInfoTitle.setVisibility(visible ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
@@ -404,32 +399,33 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
* @param list
|
||||
*/
|
||||
private void initGiftList(List<UserDetailInfo.DataBean.UserGiftWallBean> list) {
|
||||
int normalDividerSize = SizeUtils.dp2px(this, 5);
|
||||
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
|
||||
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
|
||||
mBinding.rvGift.setLayoutManager(layoutManager);
|
||||
mBinding.rvGift.addItemDecoration(new RecyclerView.ItemDecoration() {
|
||||
|
||||
@Override
|
||||
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
|
||||
super.getItemOffsets(outRect, view, parent, state);
|
||||
int position = parent.getChildLayoutPosition(view);
|
||||
int right = normalDividerSize;
|
||||
|
||||
outRect.set(0, 0, right, 0);
|
||||
}
|
||||
});
|
||||
|
||||
if (ListUtils.isListEmpty(list)) {
|
||||
list = new ArrayList<>();
|
||||
UserDetailInfo.DataBean.UserGiftWallBean giftBean = new UserDetailInfo.DataBean.UserGiftWallBean();
|
||||
giftBean.setItemType(0);
|
||||
list.add(giftBean);
|
||||
}
|
||||
if (giftAdapter == null) {
|
||||
final int normalDividerSize = SizeUtils.dp2px(this, 5);
|
||||
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
|
||||
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
|
||||
mBinding.rvGift.setLayoutManager(layoutManager);
|
||||
mBinding.rvGift.addItemDecoration(new RecyclerView.ItemDecoration() {
|
||||
|
||||
GiftAdapter giftAdapter = new GiftAdapter(this, list);
|
||||
@Override
|
||||
public void getItemOffsets(@NotNull Rect outRect, @NotNull View view, @NotNull RecyclerView parent, @NotNull RecyclerView.State state) {
|
||||
super.getItemOffsets(outRect, view, parent, state);
|
||||
outRect.set(0, 0, normalDividerSize, 0);
|
||||
}
|
||||
});
|
||||
giftAdapter = new GiftAdapter(this, list);
|
||||
|
||||
giftAdapter.setEnableLoadMore(false);
|
||||
mBinding.rvGift.setAdapter(giftAdapter);
|
||||
} else {
|
||||
giftAdapter.setNewData(list);
|
||||
}
|
||||
|
||||
giftAdapter.setEnableLoadMore(false);
|
||||
mBinding.rvGift.setAdapter(giftAdapter);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -438,39 +434,44 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
* @param list
|
||||
*/
|
||||
private void initDynamicList(List<WorldDynamicBean> list) {
|
||||
mBinding.rvDynamic.setLayoutManager(new LinearLayoutManager(this));
|
||||
UserInfoDynamicAdapter dynamicAdapter = new UserInfoDynamicAdapter(this);
|
||||
dynamicAdapter.setNewData(list);
|
||||
dynamicAdapter.setEnableLoadMore(false);
|
||||
dynamicAdapter.setOnItemChildClickListener((baseQuickAdapter, view, pos) -> {
|
||||
WorldDynamicBean bean = dynamicAdapter.getItem(pos);
|
||||
if (bean == null) {
|
||||
return;
|
||||
}
|
||||
if (view.getId() == R.id.iv_more) {
|
||||
List<ButtonItem> list_adapter = new ArrayList<>();
|
||||
if (!UserModel.get().isMyseft(bean.getUid())) {
|
||||
ButtonItem item = new ButtonItem("举报", () -> {
|
||||
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_REPORT_MOMENTS,
|
||||
"举报动态-区分-动态广场");
|
||||
UIHelper.showReportPage(this, bean.getUid(),
|
||||
XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE);
|
||||
});
|
||||
list_adapter.add(item);
|
||||
if (dynamicAdapter == null) {
|
||||
mBinding.rvDynamic.setLayoutManager(new LinearLayoutManager(this));
|
||||
dynamicAdapter = new UserInfoDynamicAdapter(this);
|
||||
dynamicAdapter.setNewData(list);
|
||||
dynamicAdapter.setEnableLoadMore(false);
|
||||
dynamicAdapter.setOnItemChildClickListener((baseQuickAdapter, view, pos) -> {
|
||||
WorldDynamicBean bean = dynamicAdapter.getItem(pos);
|
||||
if (bean == null) {
|
||||
return;
|
||||
}
|
||||
if (UserModel.get().isMyseft(bean.getUid()) ||
|
||||
isThisWorldOwner(bean)) {
|
||||
ButtonItem item = new ButtonItem("删除", () -> deleteDynamic(pos, dynamicAdapter));
|
||||
list_adapter.add(item);
|
||||
if (view.getId() == R.id.iv_more) {
|
||||
List<ButtonItem> list_adapter = new ArrayList<>();
|
||||
if (!UserModel.get().isMyseft(bean.getUid())) {
|
||||
ButtonItem item = new ButtonItem("举报", () -> {
|
||||
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_REPORT_MOMENTS,
|
||||
"举报动态-区分-动态广场");
|
||||
UIHelper.showReportPage(this, bean.getUid(),
|
||||
XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE);
|
||||
});
|
||||
list_adapter.add(item);
|
||||
}
|
||||
if (UserModel.get().isMyseft(bean.getUid()) ||
|
||||
isThisWorldOwner(bean)) {
|
||||
ButtonItem item = new ButtonItem("删除", () -> deleteDynamic(pos, dynamicAdapter));
|
||||
list_adapter.add(item);
|
||||
}
|
||||
getDialogManager().showCommonPopupDialog(list_adapter, "取消");
|
||||
} else if (view.getId() == R.id.ll_share) {
|
||||
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_SHARE_MOMENTS,
|
||||
"分享动态-区分-动态广场");
|
||||
new ShareDynamicHelper(this).share(bean);
|
||||
}
|
||||
getDialogManager().showCommonPopupDialog(list_adapter, "取消");
|
||||
} else if (view.getId() == R.id.ll_share) {
|
||||
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_SHARE_MOMENTS,
|
||||
"分享动态-区分-动态广场");
|
||||
new ShareDynamicHelper(this).share(bean);
|
||||
}
|
||||
});
|
||||
mBinding.rvDynamic.setAdapter(dynamicAdapter);
|
||||
});
|
||||
mBinding.rvDynamic.setAdapter(dynamicAdapter);
|
||||
} else {
|
||||
dynamicAdapter.setNewData(list);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -480,16 +481,20 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
if (ListUtils.isListEmpty(list)) {
|
||||
return;
|
||||
}
|
||||
if (bannerAdapter == null) {
|
||||
TextHintView hintView = new TextHintView(this);
|
||||
hintView.setBackground(getResources().getDrawable(R.drawable.bg_userinfo_photo_hintview));
|
||||
hintView.setTextSize(SizeUtils.dp2px(this, 4));
|
||||
hintView.setTextColor(getResources().getColor(R.color.text_normal_c6c6e9));
|
||||
mBinding.rollView.setHintView(hintView);
|
||||
bannerAdapter = new UserInfoPhotoAdapter(list, this);
|
||||
mBinding.rollView.setAdapter(bannerAdapter);
|
||||
//设置透明度
|
||||
mBinding.rollView.setAnimationDurtion(500);
|
||||
} else {
|
||||
bannerAdapter.setData(list);
|
||||
}
|
||||
|
||||
TextHintView hintView = new TextHintView(this);
|
||||
hintView.setBackground(getResources().getDrawable(R.drawable.bg_userinfo_photo_hintview));
|
||||
hintView.setTextSize(SizeUtils.dp2px(this, 4));
|
||||
hintView.setTextColor(getResources().getColor(R.color.blue));
|
||||
mBinding.rollView.setHintView(hintView);
|
||||
UserInfoPhotoAdapter bannerAdapter = new UserInfoPhotoAdapter(list, this);
|
||||
mBinding.rollView.setAdapter(bannerAdapter);
|
||||
//设置透明度
|
||||
mBinding.rollView.setAnimationDurtion(500);
|
||||
bannerAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
@@ -521,29 +526,24 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
if (flag == 0 && oldScrollY > SizeUtils.dp2px(this, 200)) {
|
||||
//展开
|
||||
flag = 1;
|
||||
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back_black);
|
||||
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.white));
|
||||
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.bg_normal_1c1b22));
|
||||
setTitleVisible(true);
|
||||
setEditButton(identityState, true);
|
||||
} else if (flag == 1 && oldScrollY <= 200) {
|
||||
//合起来
|
||||
flag = 0;
|
||||
mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back);
|
||||
mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.transparent));
|
||||
setTitleVisible(false);
|
||||
setEditButton(identityState, false);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setEditButton(int identityState, boolean isExpanded) {
|
||||
private void setEditButton(int identityState) {
|
||||
if (identityState == IdentityState.OWN) {
|
||||
mBinding.ivEdit.setVisibility(View.GONE);
|
||||
mBinding.tvEdit.setVisibility(View.VISIBLE);
|
||||
} else if (identityState == IdentityState.OTHER) {
|
||||
mBinding.ivEdit.setVisibility(View.VISIBLE);
|
||||
mBinding.tvEdit.setVisibility(View.GONE);
|
||||
mBinding.ivEdit.setImageResource(isExpanded ? R.drawable.icon_home_page_more : R.drawable.icon_home_page_more_black);
|
||||
} else {
|
||||
mBinding.ivEdit.setVisibility(View.GONE);
|
||||
mBinding.tvEdit.setVisibility(View.GONE);
|
||||
@@ -804,4 +804,14 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean needSteepStateBar() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setStatusBar() {
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1,6 +1,5 @@
|
||||
package com.yizhuan.erban.ui.user.adapter;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -8,17 +7,10 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.erban.UIHelper;
|
||||
import com.yizhuan.erban.ui.setting.SettingActivity;
|
||||
import com.yizhuan.erban.ui.user.ShowPhotoActivity;
|
||||
import com.yizhuan.erban.ui.user.UserPhotoAdapter;
|
||||
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
|
||||
import com.yizhuan.erban.utils.CommonJumpHelper;
|
||||
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
|
||||
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
|
||||
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
|
||||
import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
|
||||
import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;
|
||||
import com.yizhuan.xchat_android_core.user.bean.UserPhoto;
|
||||
|
||||
|
@@ -11,8 +11,7 @@
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/bg_normal_1c1b22"
|
||||
android:fitsSystemWindows="true">
|
||||
android:background="@color/bg_normal_1c1b22">
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/scroll_view"
|
||||
@@ -57,7 +56,7 @@
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="-50dp"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:background="@drawable/bg_corner_shadow_12"
|
||||
android:background="@drawable/bg_2a2a39_0_15"
|
||||
android:padding="@dimen/dp_15">
|
||||
|
||||
<TextView
|
||||
@@ -71,7 +70,7 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLength="20"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="15dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -100,8 +99,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/dp_20"
|
||||
android:layout_marginEnd="@dimen/dp_3"
|
||||
android:visibility="visible"
|
||||
android:adjustViewBounds="true"
|
||||
android:visibility="visible"
|
||||
tools:src="@mipmap/ic_user_level" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
@@ -109,8 +108,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/dp_20"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:visibility="visible"
|
||||
android:adjustViewBounds="true"
|
||||
android:visibility="visible"
|
||||
tools:src="@drawable/ic_user_charm_level" />
|
||||
|
||||
|
||||
@@ -192,7 +191,7 @@
|
||||
android:gravity="center_vertical"
|
||||
android:includeFontPadding="false"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
android:textSize="11dp"
|
||||
tools:text="ID:7958626" />
|
||||
|
||||
@@ -207,7 +206,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="13dp"
|
||||
tools:text="19" />
|
||||
|
||||
@@ -219,7 +218,7 @@
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/fan"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
android:textSize="11dp" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -234,7 +233,7 @@
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:paddingBottom="@dimen/dp_2"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
app:layout_constraintTop_toBottomOf="@id/ll_id"
|
||||
tools:text="喜欢我就关注我" />
|
||||
@@ -247,7 +246,7 @@
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_13"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:background="@drawable/bg_corner_shadow_12"
|
||||
android:background="@drawable/bg_2a2a39_0_15"
|
||||
android:orientation="vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingTop="1dp"
|
||||
@@ -260,12 +259,12 @@
|
||||
android:id="@+id/tv_hall_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableEnd="@drawable/arrow_right_2"
|
||||
android:drawableEnd="@drawable/arrow_right_white"
|
||||
android:paddingStart="@dimen/dp_15"
|
||||
android:paddingTop="@dimen/dp_15"
|
||||
android:paddingEnd="@dimen/dp_15"
|
||||
android:text="公会"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/sp_13" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -304,7 +303,7 @@
|
||||
android:ellipsize="end"
|
||||
android:includeFontPadding="false"
|
||||
android:lines="1"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/dp_13"
|
||||
tools:text="忘忧忘忧阁忘忧阁阁" />
|
||||
|
||||
@@ -315,7 +314,7 @@
|
||||
android:layout_marginTop="@dimen/dp_3"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:textColor="#9a9a9a"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
tools:text="公会ID:123456" />
|
||||
|
||||
@@ -325,7 +324,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:textColor="#9a9a9a"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
tools:text="公会人数:123" />
|
||||
|
||||
@@ -335,7 +334,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:textColor="#9a9a9a"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
tools:text="公会数量:123" />
|
||||
|
||||
@@ -346,7 +345,7 @@
|
||||
android:id="@+id/view_line"
|
||||
android:layout_width="1px"
|
||||
android:layout_height="60dp"
|
||||
android:background="@color/color_ebebeb"
|
||||
android:background="@color/line_color_353548"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -386,7 +385,7 @@
|
||||
android:ellipsize="end"
|
||||
android:includeFontPadding="false"
|
||||
android:lines="1"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/dp_13"
|
||||
tools:text="忘忘忧阁忘忧阁忧阁" />
|
||||
|
||||
@@ -397,7 +396,7 @@
|
||||
android:layout_marginTop="@dimen/dp_5"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:textColor="#9a9a9a"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
tools:text="公会ID:123456" />
|
||||
|
||||
@@ -407,7 +406,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:textColor="#9a9a9a"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
tools:text="公会人数:123" />
|
||||
|
||||
@@ -440,7 +439,7 @@
|
||||
android:background="@drawable/bg_common_confirm_normal_22r"
|
||||
android:gravity="center"
|
||||
android:text="申请加入"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
@@ -454,17 +453,17 @@
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_13"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:background="@drawable/bg_corner_shadow_12"
|
||||
android:background="@drawable/bg_2a2a39_0_15"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_gift_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableEnd="@drawable/arrow_right_2"
|
||||
android:drawableEnd="@drawable/arrow_right_white"
|
||||
android:padding="@dimen/dp_15"
|
||||
android:text="礼物"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/sp_13" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
@@ -489,8 +488,8 @@
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginBottom="50dp"
|
||||
android:background="@drawable/bg_corner_shadow_12"
|
||||
android:layout_marginBottom="70dp"
|
||||
android:background="@drawable/bg_2a2a39_0_15"
|
||||
android:orientation="vertical"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingTop="1dp"
|
||||
@@ -504,7 +503,7 @@
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:text="动态"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/sp_13" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
@@ -530,7 +529,8 @@
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/tb_user_info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:layout_height="75dp"
|
||||
android:paddingTop="25dp"
|
||||
android:visibility="visible"
|
||||
app:contentInsetStart="0dp"
|
||||
app:layout_collapseMode="pin">
|
||||
@@ -543,10 +543,11 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_user_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:scaleType="center"
|
||||
android:layout_centerVertical="true"
|
||||
android:src="@drawable/icon_user_back" />
|
||||
android:src="@drawable/arrow_left_white" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_user_info_title"
|
||||
@@ -555,7 +556,7 @@
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:text="@string/user_info"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="16sp"
|
||||
android:visibility="visible" />
|
||||
|
||||
@@ -574,7 +575,7 @@
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:text="编辑"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/sp_13"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
@@ -25,11 +25,11 @@
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
tools:text="x20"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_10"
|
||||
android:gravity="center"
|
||||
android:layout_marginTop="-5dp"
|
||||
android:background="@drawable/bg_user_gift_count"
|
||||
android:background="@drawable/shape_bg_mini_world_name"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
@@ -14,7 +14,7 @@
|
||||
android:gravity="center"
|
||||
android:includeFontPadding="false"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:textSize="@dimen/dp_11"
|
||||
@@ -41,7 +41,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:lineSpacingExtra="4dp"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -94,7 +94,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/bg_dynamic_topic"
|
||||
android:background="@drawable/shape_bg_mini_world_name"
|
||||
android:orientation="horizontal"
|
||||
android:paddingEnd="@dimen/dp_11"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -110,7 +110,7 @@
|
||||
android:paddingStart="@dimen/dp_10"
|
||||
android:maxWidth="150dp"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/color_7154EE"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:textSize="@dimen/sp_12"
|
||||
tools:text="话题名称话题名称话题名称" />
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
android:layout_marginStart="6.5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/sp_12"
|
||||
tools:text="0" />
|
||||
</LinearLayout>
|
||||
@@ -179,7 +179,7 @@
|
||||
android:layout_height="@dimen/dp_30"
|
||||
android:layout_marginStart="6.5dp"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:textSize="@dimen/sp_12"
|
||||
tools:text="0" />
|
||||
</LinearLayout>
|
||||
@@ -220,7 +220,7 @@
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:background="@color/line_color"
|
||||
android:background="@color/line_color_353548"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/rl_option" />
|
||||
|
Reference in New Issue
Block a user