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

动态部分UI

Browse Source
This commit is contained in:
oujunhui
2020-04-11 20:00:00 +08:00
parent be8394ba6e
commit 755a735d7d
32 changed files with 761 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -150,7 +150,7 @@ android {
}
debug {
buildConfigField "String", "BASE_URL", "\"http://192.168.1.105:8079/\""
buildConfigField "String", "BASE_URL", "\"http://120.79.211.243/\""//120.79.211.243 192.168.1.105:8079
// buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "\"https://preview.qxjiaoyou.com/\""

9
app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java
View File

@@ -40,11 +40,12 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true, 2);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_333333));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false, 2);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.white));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.white));
scaleTransitionPagerTitleView.setMinScale(0.8f);
scaleTransitionPagerTitleView.setTextSize(20);
scaleTransitionPagerTitleView.setTextSize(18);
// scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 36);
scaleTransitionPagerTitleView.setText(mTitleList.get(i));
scaleTransitionPagerTitleView.setOnClickListener(view -> {

BIN
app/src/main/res/drawable-xhdpi/ic_female.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 662 B

8
app/src/main/res/drawable/shap_bg_top_gradual.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="#6956F0"
android:endColor="#987EF7" />
</shape>

3
app/src/main/res/values/colors.xml
View File

@@ -115,7 +115,7 @@
<!--语音球-->
<color name="line_color">#F0F0F0</color>
<color name="line_color">#F4F4F4</color>
<color name="block_color">#F5F5F5</color>
<!--成员选择组件颜色-->
@@ -530,6 +530,7 @@
<color name="color_45F1E5">#45F1E5</color>
<color name="color_ABAAB2">#ABAAB2</color>
<color name="color_F770FF">#F770FF</color>
<color name="color_EFEBFF">#EFEBFF</color>
</resources>

1
app/src/main/res/values/strings.xml
View File

@@ -870,6 +870,7 @@
<string name="ranking">榜单</string>
<string name="str_send_code_success">验证码已发送至</string>
<string name="str_nick_title">昵称：</string>
<string name="recommend_topic">推荐话题</string>
</resources>

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentReplyAdapter.java
View File

@@ -42,7 +42,7 @@ public class CommentReplyAdapter extends BaseQuickAdapter<Reply, BaseViewHolder>
SpannableBuilder builder = new SpannableBuilder();
builder.append("@" + item.getToNick(),
new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_34A7FF)))
new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_7154EE)))
.append(" " + item.getContent(),
new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_333333)));

233
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -116,16 +116,25 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
RecyclerView rvImage;
ExpandableTextView etvContent;
TextView tvCommentCount;
@BindView(R.id.tv_flag_mini_world)
ConstraintLayout clOption;
ImageView ivLikePic;
TextView tvLikeCount;
ImageView ivCommentPic;
ImageView ivSharePic;
TextView tvCommentCountOption;
// @BindView(R.id.tv_flag_mini_world)
TextView tvFlagMiniWorld;
@BindView(R.id.layout_root_mini_world)
// @BindView(R.id.layout_root_mini_world)
ConstraintLayout layoutRootMiniWorld;
@BindView(R.id.tv_mini_world_name)
// @BindView(R.id.tv_mini_world_name)
TextView tvMiniWorldName;
private View viewLineDetailHeader;
@BindView(R.id.cl_option)
ConstraintLayout clOption;
@BindView(R.id.ll_reply)
LinearLayout llReply;
@BindView(R.id.iv_emoji)
@@ -135,17 +144,18 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
@BindView(R.id.tv_send)
TextView tvSend;
@BindView(R.id.iv_like_pic)
ImageView ivLikePic;
@BindView(R.id.tv_like_count)
TextView tvLikeCount;
@BindView(R.id.iv_comment_pic)
ImageView ivCommentPic;
@BindView(R.id.iv_share_pic)
ImageView ivSharePic;
// @BindView(R.id.cl_option)
// ConstraintLayout clOption;
// @BindView(R.id.iv_like_pic)
// ImageView ivLikePic;
// @BindView(R.id.tv_like_count)
// TextView tvLikeCount;
//
// @BindView(R.id.iv_comment_pic)
// ImageView ivCommentPic;
//
// @BindView(R.id.iv_share_pic)
// ImageView ivSharePic;
@BindView(R.id.emoticon_picker_view)
EmoticonPickerView emoticonPickerView;
@@ -339,7 +349,16 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
etvContent = mHeaderView.findViewById(R.id.etv_content);
rvImage = mHeaderView.findViewById(R.id.rv_image);
tvCommentCount = mHeaderView.findViewById(R.id.tv_comment_count);
clOption = mHeaderView.findViewById(R.id.cl_option);
ivLikePic = mHeaderView.findViewById(R.id.iv_like_pic);
tvLikeCount = mHeaderView.findViewById(R.id.tv_like_count);
ivCommentPic = mHeaderView.findViewById(R.id.iv_comment_pic);
ivSharePic = mHeaderView.findViewById(R.id.iv_share_pic);
tvCommentCountOption = mHeaderView.findViewById(R.id.tv_comment_count_option);
viewLineDetailHeader = mHeaderView.findViewById(R.id.view_line_detail_header);
tvFlagMiniWorld = mHeaderView.findViewById(R.id.tv_flag_mini_world);
layoutRootMiniWorld = mHeaderView.findViewById(R.id.layout_root_mini_world);
tvMiniWorldName = mHeaderView.findViewById(R.id.tv_mini_world_name);
viewLineDetailHeader.setVisibility(View.VISIBLE);
inOfficialMask = mHeaderView.findViewById(R.id.in_official_mask);
@@ -731,23 +750,9 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
ImageLoadUtilsV2.loadAvatar(ivAvatar, bean.getAvatar());
widgetNickDetail.setData(bean);
//更多
ivMore.setOnClickListener(v -> {
List<ButtonItem> list = new ArrayList<>();
if (!UserModel.get().isMyseft(bean.getUid())) {
ButtonItem item = new ButtonItem("举报", () -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_REPORT_MOMENTS,
"举报动态-区分-动态详情");
UIHelper.showReportPage(context, bean.getUid(),
XChatConstants.REPORT_TYPE_WORLDDYNAMIC);
});
list.add(item);
}
if (UserModel.get().isMyseft(bean.getUid()) ||
isThisWorldOwner(bean)) {
ButtonItem item = new ButtonItem("删除", () -> deleteDynamic(bean));
list.add(item);
}
getDialogManager().showCommonPopupDialog(list, "取消");
header_more();
});
UserInfo.NamePlate namePlate = info.getNameplate();
@@ -773,11 +778,11 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
setLikeCount(false);
if (ListUtils.isListEmpty(bean.getDynamicResList())) {
resetTvCommentCountTop(22);
} else {
resetTvCommentCountTop(15);
}
// if (ListUtils.isListEmpty(bean.getDynamicResList())) {
// resetTvCommentCountTop(22);
// } else {
// resetTvCommentCountTop(15);
// }
updateCommentCount();
//头饰 贵族头饰
@@ -802,19 +807,88 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
//小世界显示
layoutRootMiniWorld.setVisibility(bean.getWorldId() > 0 ? View.VISIBLE : View.GONE);
if (!TextUtils.isEmpty(bean.getWorldName())) {
tvMiniWorldName.setText(bean.getWorldName());
tvMiniWorldName.setText("#" + bean.getWorldName());
}
tvFlagMiniWorld.setVisibility(bean.isInWorld() ? View.GONE : View.VISIBLE);
layoutRootMiniWorld.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_VIEW_WORLD_PAGE,
"进入小世界客态页:动态详情");
MiniWorldGuestPageActivity.start(context, String.valueOf(bean.getWorldId()));
}
layoutRootMiniWorld.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_VIEW_WORLD_PAGE,
"进入小世界客态页:动态详情");
MiniWorldGuestPageActivity.start(context, String.valueOf(bean.getWorldId()));
});
//点赞
ivLikePic.setOnClickListener(v -> {
header_like();
});
//评论
ivCommentPic.setOnClickListener(v -> {
showToCommentDynamicLayout();
});
//分享动态
ivSharePic.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_SHARE_MOMENTS,
"分享动态-区分-动态详情");
new ShareDynamicHelper(DynamicDetailActivity.this)
.share(bean, worldId);
});
}
/**
*header - 更多
*/
private void header_more() {
List<ButtonItem> list = new ArrayList<>();
if (!UserModel.get().isMyseft(bean.getUid())) {
ButtonItem item = new ButtonItem("举报", () -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_REPORT_MOMENTS,
"举报动态-区分-动态详情");
UIHelper.showReportPage(context, bean.getUid(),
XChatConstants.REPORT_TYPE_WORLDDYNAMIC);
});
list.add(item);
}
if (UserModel.get().isMyseft(bean.getUid()) ||
isThisWorldOwner(bean)) {
ButtonItem item = new ButtonItem("删除", () -> deleteDynamic(bean));
list.add(item);
}
getDialogManager().showCommonPopupDialog(list, "取消");
}
/**
*header - 点赞
*/
private void header_like(){
ivLikePic.setEnabled(false);
int status = bean.isLike() ? 0 : 1;
DynamicModel.get().like(worldId, dynamicId, bean.getUid(), status, 3)
.compose(RxHelper.bindContext(context))
.subscribe(new DontWarnObserver<String>() {
@Override
public void accept(String s, String error) {
super.accept(s, error);
ivLikePic.setEnabled(true);
if (error != null) {
SingleToastUtil.showToast(error);
} else {
if (bean == null) {
return;
}
if (status == 1) {
bean.setLikeCount(bean.getLikeCount() + 1);
} else {
bean.setLikeCount(bean.getLikeCount() - 1);
}
bean.setLike(status == 1);
setLikeCount(true);
}
}
});
}
private void deleteDynamic(WorldDynamicBean bean) {
@@ -908,15 +982,15 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
tvLikeCount.setText(likeCountStr);
if (bean.isLike()) {
if (isAnim) {
AnimationDrawable drawable = (AnimationDrawable) context.getResources()
.getDrawable(R.drawable.anim_list_dy_like);
ivLikePic.setImageDrawable(drawable);
drawable.stop();
drawable.start();
} else {
ivLikePic.setImageResource(R.drawable.icon_dy_list_like_00013);
}
// if (isAnim) {
// AnimationDrawable drawable = (AnimationDrawable) context.getResources()
// .getDrawable(R.drawable.anim_list_dy_like);
// ivLikePic.setImageDrawable(drawable);
// drawable.stop();
// drawable.start();
// } else {
ivLikePic.setImageResource(R.drawable.icon_dy_list_like);
// }
} else {
ivLikePic.setImageResource(R.drawable.icon_dy_list_like_false);
}
@@ -934,55 +1008,22 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
if (bean.getCommentCount() >= 100000) {
commentCountStr = "99999+";
}
builder.append("所有评论(")
.append(commentCountStr,
new ForegroundColorSpan(getResources().getColor(R.color.color_333333)))
.append(")");
tvCommentCount.setText(builder.build());
// builder.append("所有评论(")
// .append(commentCountStr,
// new ForegroundColorSpan(getResources().getColor(R.color.color_333333)))
// .append(")");
String comment = "所有评论("+commentCountStr+")";
tvCommentCount.setText(comment);
tvCommentCountOption.setText(commentCountStr);
}
@OnClick({R.id.iv_like_pic, R.id.iv_comment_pic, R.id.iv_share_pic, R.id.tv_send, R.id.iv_emoji})
@OnClick({R.id.tv_send, R.id.iv_emoji})
public void onViewClicked(View view) {
if (bean == null) {
return;
}
switch (view.getId()) {
case R.id.iv_like_pic:
ivLikePic.setEnabled(false);
int status = bean.isLike() ? 0 : 1;
DynamicModel.get().like(worldId, dynamicId, bean.getUid(), status, 3)
.compose(RxHelper.bindContext(context))
.subscribe(new DontWarnObserver<String>() {
@Override
public void accept(String s, String error) {
super.accept(s, error);
ivLikePic.setEnabled(true);
if (error != null) {
SingleToastUtil.showToast(error);
} else {
if (bean == null) {
return;
}
if (status == 1) {
bean.setLikeCount(bean.getLikeCount() + 1);
} else {
bean.setLikeCount(bean.getLikeCount() - 1);
}
bean.setLike(status == 1);
setLikeCount(true);
}
}
});
break;
case R.id.iv_comment_pic:
showToCommentDynamicLayout();
break;
case R.id.iv_share_pic:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_SHARE_MOMENTS,
"分享动态-区分-动态详情");
new ShareDynamicHelper(DynamicDetailActivity.this)
.share(bean, worldId);
break;
case R.id.tv_send:
tvSend.setEnabled(false);
String content = etReply.getText().toString();

16
app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
View File

@@ -166,10 +166,13 @@ public class SquareDynamicFragment extends BaseFragment {
page = 1;
}
isLoading = true;
Single<WorldDynamicListResult> single;
Single<WorldDynamicListResult> single = null;
//推荐动态返回的是直接一个list，但是为了便于统一和关注动态列表的逻辑，我们包多一层
//返回WorldDynamicListResult
if (squareType == SquareFragment.TAB_TYPE_RECOMMEND) {
if (squareType == SquareFragment.TAB_TYPE_ATTENT) {
single = SquareModel.get().getFollowerDynamics(nextDynamicId,
CommunityConstant.DYNAMIC_PAGE_SIZE);
} else if (squareType == SquareFragment.TAB_TYPE_RECOMMEND){
single = SquareModel.get().getRecommendDynamics(page, CommunityConstant.DYNAMIC_PAGE_SIZE)
.map(list -> {
WorldDynamicListResult result = new WorldDynamicListResult();
@@ -177,9 +180,14 @@ public class SquareDynamicFragment extends BaseFragment {
return result;
});
} else {
single = SquareModel.get().getFollowerDynamics(nextDynamicId,
CommunityConstant.DYNAMIC_PAGE_SIZE);
single = SquareModel.get().getRecommendDynamics(page, CommunityConstant.DYNAMIC_PAGE_SIZE)
.map(list -> {
WorldDynamicListResult result = new WorldDynamicListResult();
result.setDynamicList(list);
return result;
});
}
single.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.subscribe(new DontWarnObserver<WorldDynamicListResult>() {
@Override

76
app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java
View File

@@ -7,6 +7,7 @@ import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.yizhuan.erban.R;
@@ -15,6 +16,7 @@ import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.common.widget.DragLayout;
import com.yizhuan.erban.community.publish.view.PublishActivity;
import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter;
import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
import com.yizhuan.erban.home.fragment.FindTabFragment;
import com.yizhuan.erban.home.view.IFindTabFragmentView;
import com.yizhuan.erban.ui.indicator_impl.IndicatorHelper;
@@ -35,16 +37,20 @@ import butterknife.Unbinder;
/**
* create by lvzebiao @2020/1/7
*/
public class SquareFragment extends BaseFragment implements TopMagicIndicatorAdapter.OnItemSelectListener{
public class SquareFragment extends BaseFragment implements TopMagicIndicatorAdapter.OnItemSelectListener, View.OnClickListener{
public static final String TAG = "SquareFragment";
/**
* 推荐
*/
public static final int TAB_TYPE_RECOMMEND = 0;
/**
* 关注
*/
public static final int TAB_TYPE_ATTENT = 1;
public static final int TAB_TYPE_ATTENT = 0;
/**
* 推荐
*/
public static final int TAB_TYPE_RECOMMEND = 1;
/**
* 最新
*/
public static final int TAB_TYPE_NEW = 2;
@BindView(R.id.magic_indicator)
MagicIndicator magicIndicator;
@@ -53,6 +59,10 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
Unbinder unbinder;
@BindView(R.id.tv_scroll_top)
TextView tvScrollTop;
@BindView(R.id.iv_square_publish)
DragLayout ivSquarePublish;
@BindView(R.id.fl_contact_list)
FrameLayout flContactList;
public static SquareFragment newInstance() {
return new SquareFragment();
@@ -61,15 +71,18 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
@Override
public void initiate() {
List<Integer> fragmentPos = new ArrayList<>();
fragmentPos.add(TAB_TYPE_RECOMMEND);
fragmentPos.add(TAB_TYPE_ATTENT);
fragmentPos.add(TAB_TYPE_RECOMMEND);
fragmentPos.add(TAB_TYPE_NEW);
List<String> tagList = new ArrayList<>();
List<Fragment> fragmentList = new ArrayList<>();
for (Integer integer : fragmentPos) {
if (integer == TAB_TYPE_RECOMMEND) {
if (integer == TAB_TYPE_ATTENT) {
tagList.add(getResources().getString(R.string.dys_tab_attent));
} else if (integer == TAB_TYPE_RECOMMEND) {
tagList.add(getResources().getString(R.string.dys_tab_recommend));
} else {
tagList.add(getResources().getString(R.string.dys_tab_attent));
tagList.add(getResources().getString(R.string.dys_tab_new));
}
fragmentList.add(SquareDynamicFragment.newInstance(integer));
}
@@ -80,8 +93,16 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
viewPager.addOnPageChangeListener(new OnPageSelectedListener() {
@Override
public void onPageSelected(int position) {
String tag = "";
if(position == 0){
tag = getResources().getString(R.string.dys_tab_attent);
}else if (position == 1){
tag = getResources().getString(R.string.dys_tab_recommend);
} else if (position == 2){
tag = getResources().getString(R.string.dys_tab_new);
}
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SQUARE_RECOMMEND_FOLLOW,
"切换推荐和关注tab-区分-" + ((position == 0) ? "推荐" : "关注"));
"切换推荐和关注tab-区分-" + tag);
}
});
@@ -90,11 +111,13 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
magicIndicatorAdapter.setOnItemSelectListener(this);
commonNavigator.setAdapter(magicIndicatorAdapter);
magicIndicator.setNavigator(commonNavigator);
//init indicator
ViewPagerHelper.bind(magicIndicator, viewPager);
ViewPagerHelper.bind(magicIndicator, viewPager);
viewPager.setCurrentItem(TAB_TYPE_RECOMMEND);
tvScrollTop.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -117,6 +140,20 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
viewPager.setCurrentItem(position);
}
@Override
public void onSetListener() {
super.onSetListener();
if (ivSquarePublish != null) {
ivSquarePublish.setOnClickListener(this);
}
if (flContactList != null) {
flContactList.setOnClickListener(this);
}
if (ivSquarePublish != null) {
ivSquarePublish.setOnClickListener(this);
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -131,4 +168,21 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda
super.onDestroyView();
unbinder.unbind();
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_square_publish:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_PUBLISH_MOMENTS_B,
"发布动态-广场");
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_PUBLISH_MOMENTS,
"发布动态-区分小世界-无小世界");
PublishActivity.start(getDialogManager());
break;
case R.id.fl_contact_list:
CommunityNoticeAct.start(mContext);
break;
}
}
}

22
app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
View File

@@ -198,7 +198,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
//小世界
helper.setGone(R.id.layout_root_mini_world, item.getWorldId() > 0);
helper.setText(R.id.tv_mini_world_name, item.getWorldName());
helper.setText(R.id.tv_mini_world_name,"#" + item.getWorldName());
helper.getView(R.id.layout_root_mini_world).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -240,17 +240,17 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
}
tvLike.setText(likeCountStr);
ImageView ivLikeAnim = helper.getView(R.id.iv_like_anim);
ImageView ivLikeAnim = helper.getView(R.id.iv_like_pic);
if (isLike) {
if (isAnim) {
AnimationDrawable drawable = (AnimationDrawable) context.getResources()
.getDrawable(R.drawable.anim_list_dy_like);
ivLikeAnim.setImageDrawable(drawable);
drawable.stop();
drawable.start();
} else {
ivLikeAnim.setImageResource(R.drawable.icon_dy_list_like_00013);
}
// if (isAnim) {
// AnimationDrawable drawable = (AnimationDrawable) context.getResources()
// .getDrawable(R.drawable.anim_list_dy_like);
// ivLikeAnim.setImageDrawable(drawable);
// drawable.stop();
// drawable.start();
// } else {
ivLikeAnim.setImageResource(R.drawable.icon_dy_list_like);
// }
} else {
ivLikeAnim.setImageResource(R.drawable.icon_dy_list_like_false);
}

41
app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
View File

@@ -33,10 +33,12 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout {
ImageView ivUserNobleLevel;
@BindView(R.id.iv_gender)
ImageView ivGender;
@BindView(R.id.tv_age)
TextView tvAge;
@BindView(R.id.ll_gender_age)
LinearLayout llGenderAge;
// @BindView(R.id.iv_gender)
// ImageView ivGender;
// @BindView(R.id.tv_age)
// TextView tvAge;
// @BindView(R.id.ll_gender_age)
// LinearLayout llGenderAge;
private Context context;
@@ -63,22 +65,25 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout {
tvNick.setText(RegexUtil.getPrintableString(info.getNick()));
int paddingH;
if (info.getAge() > 0) {
tvAge.setVisibility(VISIBLE);
tvAge.setText(String.valueOf(info.getAge()));
paddingH = UIUtil.dip2px(context, 5);
} else {
tvAge.setVisibility(GONE);
tvAge.setText("");
paddingH = 0;
}
llGenderAge.setPadding(paddingH, 0, paddingH, 0);
llGenderAge.setBackgroundResource(info.getGender() == 1 ?
R.drawable.shape_male_corner : R.drawable.shape_female_corner);
// if (info.getAge() > 0) {
// tvAge.setVisibility(VISIBLE);
// tvAge.setText(String.valueOf(info.getAge()));
// paddingH = UIUtil.dip2px(context, 5);
// } else {
// tvAge.setVisibility(GONE);
// tvAge.setText("");
// paddingH = 0;
// }
// llGenderAge.setPadding(paddingH, 0, paddingH, 0);
ivGender.setImageResource(info.getGender() == 1 ?
R.drawable.icon_dy_list_male : R.drawable.icon_dy_list_female);
R.drawable.shape_male_corner : R.drawable.ic_female);
// llGenderAge.setBackgroundResource(info.getGender() == 1 ?
// R.drawable.shape_male_corner : R.drawable.shape_female_corner);
//
// ivGender.setImageResource(info.getGender() == 1 ?
// R.drawable.icon_dy_list_male : R.drawable.icon_dy_list_female);
//官
ivUserOfficial.setVisibility(info.isOfficial() ? VISIBLE : GONE);
//新

BIN
app/src/module_community/res/drawable-xhdpi/ic_square_publish.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_item_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 250 B

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 666 B

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 793 B

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 787 B

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 466 B

After

Width:  |  Height:  |  Size: 680 B

2
app/src/module_community/res/drawable/shape_bg_square_list.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<corners android:radius="@dimen/dp_8" />
<corners android:radius="@dimen/dp_12" />
</shape>

7
app/src/module_community/res/drawable/shape_dy_publish_mini_type.xml
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_50" />
<solid android:color="@color/color_FF838D_tran_10" />
<corners android:topLeftRadius="@dimen/dp_20"
android:bottomLeftRadius="@dimen/dp_20"
android:topRightRadius="@dimen/dp_10"
android:bottomRightRadius="@dimen/dp_18"/>
<solid android:color="@color/color_EFEBFF" />
</shape>

149
app/src/module_community/res/layout/activity_dynamic_detail.xml
View File

@@ -12,61 +12,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
<android.support.constraint.ConstraintLayout
android:id="@+id/layout_root_mini_world"
android:layout_width="match_parent"
android:layout_height="45dp"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/title_bar"
tools:visibility="visible">
<LinearLayout
android:id="@+id/ll_miniworld"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:background="@drawable/shape_dy_publish_mini_type"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_mini_world_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableStart="@drawable/icon_dy_miniworld"
android:drawablePadding="6.5dp"
android:gravity="center"
android:maxWidth="150dp"
android:singleLine="true"
android:textColor="@color/color_FF838D"
android:textSize="@dimen/sp_12"
tools:text="小世界名称小世界名称小世界名称" />
</LinearLayout>
<TextView
android:id="@+id/tv_flag_mini_world"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="@dimen/dp_6"
android:gravity="center"
android:text="@string/dys_jump_mini_world"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/refresh_layout"
@@ -75,7 +21,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
app:layout_constraintBottom_toTopOf="@+id/view_line"
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world">
app:layout_constraintTop_toBottomOf="@id/title_bar">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list_comment"
@@ -94,98 +40,7 @@
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line_color"
app:layout_constraintBottom_toTopOf="@+id/cl_option" />
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_option"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_dy_detail_bottom_bar_height"
app:layout_constraintBottom_toTopOf="@+id/ll_reply">
<ImageView
android:id="@+id/iv_like_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_50"
android:layout_marginStart="26dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_dy_list_like_false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_comment_pic"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/v_tmp_like"
android:layout_width="22dp"
android:layout_height="22dp"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toEndOf="@id/iv_like_pic"
app:layout_constraintStart_toStartOf="@id/iv_like_pic"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
<TextView
android:id="@+id/tv_like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_5"
android:gravity="center_vertical"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_like"
app:layout_constraintTop_toTopOf="@id/iv_like_pic"
tools:text="0" />
<ImageView
android:id="@+id/iv_comment_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_50"
android:scaleType="fitCenter"
android:src="@drawable/icon_dy_detail_comment"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toStartOf="@+id/iv_share_pic"
app:layout_constraintStart_toEndOf="@id/iv_like_pic"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
<View
android:id="@+id/v_tmp_comment"
android:layout_width="22dp"
android:layout_height="22dp"
app:layout_constraintBottom_toBottomOf="@id/iv_comment_pic"
app:layout_constraintEnd_toEndOf="@id/iv_comment_pic"
app:layout_constraintStart_toStartOf="@id/iv_comment_pic"
app:layout_constraintTop_toTopOf="@id/iv_comment_pic" />
<TextView
android:id="@+id/tv_comment_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5.5dp"
android:gravity="center_vertical"
android:text="@string/dy_comment_text"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_comment_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_comment"
app:layout_constraintTop_toTopOf="@id/iv_comment_pic" />
<ImageView
android:id="@+id/iv_share_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_50"
android:layout_centerVertical="true"
android:layout_marginEnd="26dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_dy_detail_share"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_comment_pic"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
</android.support.constraint.ConstraintLayout>
app:layout_constraintBottom_toTopOf="@+id/ll_reply" />
<LinearLayout
android:id="@+id/ll_reply"

3
app/src/module_community/res/layout/dy_footer_loadmore.xml
View File

@@ -20,7 +20,8 @@
<TextView
android:text="正在加载更多..."
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textColor="@color/white"/>
</LinearLayout>

134
app/src/module_community/res/layout/fragment_square.xml
View File

@@ -1,32 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
xmlns:tools="http://schemas.android.com/tools"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/color_F9F9F9"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:paddingStart="11.5dp"
android:paddingEnd="11.5dp" />
<TextView
android:id="@+id/tv_scroll_top"
app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/magic_indicator"
app:layout_constraintBottom_toBottomOf="@id/magic_indicator"
android:layout_width="0dp"
android:layout_height="0dp" />
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
app:layout_constraintTop_toBottomOf="@id/magic_indicator"
app:layout_constraintBottom_toBottomOf="parent"
<ImageView
android:layout_width="match_parent"
android:layout_height="0dp" />
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content"
android:layout_height="48dp"
/>
<TextView
android:id="@+id/tv_scroll_top"
app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/magic_indicator"
app:layout_constraintBottom_toBottomOf="@id/magic_indicator"
android:layout_width="0dp"
android:layout_height="0dp" />
<FrameLayout
android:id="@+id/fl_contact_list"
android:layout_width="41dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" >
<ImageView
android:layout_width="21dp"
android:layout_height="21dp"
android:scaleType="center"
android:layout_gravity="center_vertical|start"
android:src="@drawable/ic_community_notice_rink" />
<com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView
android:id="@+id/msg_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:gravity="center"
android:visibility="invisible"
tools:text="123"
tools:visibility="visible" />
</FrameLayout>
<TextView
android:id="@+id/tv_title_topic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/arrow_right_white"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:text="@string/recommend_topic"
android:textColor="@color/white"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/magic_indicator"
/>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_topic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tv_title_topic"
/>
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
app:layout_constraintTop_toBottomOf="@id/rv_topic"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/transparent"
android:layout_width="match_parent"
android:layout_height="0dp" />
<com.yizhuan.erban.common.widget.DragLayout
android:id="@+id/iv_square_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginRight="@dimen/dp_15">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_square_publish"
/>
</com.yizhuan.erban.common.widget.DragLayout>
</android.support.constraint.ConstraintLayout>
</FrameLayout>

2
app/src/module_community/res/layout/fragment_square_dynamic.xml
View File

@@ -18,7 +18,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FAFAFA" />
android:background="@color/transparent" />
</android.support.v4.widget.SwipeRefreshLayout>
</com.yizhuan.erban.common.widget.StatusLayout>
</android.support.constraint.ConstraintLayout>

197
app/src/module_community/res/layout/head_dynamic_detail.xml
View File

@@ -79,18 +79,7 @@
<!--android:textSize="@dimen/dp_12"-->
<!--tools:text="刚刚" />-->
<ImageView
android:id="@+id/iv_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_14"
android:padding="@dimen/dp_6"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_item_more"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</android.support.constraint.ConstraintLayout>
@@ -146,28 +135,190 @@
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/etv_content" />
<TextView
android:id="@+id/tv_comment_count"
<android.support.constraint.ConstraintLayout
android:id="@+id/layout_root_mini_world"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:paddingBottom="@dimen/dp_4"
app:layout_constraintTop_toBottomOf="@id/rv_image"
tools:visibility="visible">
<LinearLayout
android:id="@+id/ll_miniworld"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:background="@drawable/shape_dy_publish_mini_type"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="@dimen/dp_11"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_mini_world_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawablePadding="6.5dp"
android:gravity="center"
android:maxWidth="150dp"
android:singleLine="true"
android:textColor="@color/color_7154EE"
android:textSize="@dimen/sp_12"
tools:text="小世界名称小世界名称小世界名称" />
</LinearLayout>
<TextView
android:id="@+id/tv_flag_mini_world"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="@dimen/dp_6"
android:gravity="center"
android:text="@string/dys_jump_mini_world"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24.5dp"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_image"
tools:text="250条评论" />
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"
app:layout_constraintStart_toStartOf="parent">
<ImageView
android:id="@+id/iv_like_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_30"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_like_false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_comment_pic"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/v_tmp_like"
android:layout_width="22dp"
android:layout_height="22dp"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toEndOf="@id/iv_like_pic"
app:layout_constraintStart_toStartOf="@id/iv_like_pic"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
<TextView
android:id="@+id/tv_like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_5"
android:gravity="center_vertical"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_like"
app:layout_constraintTop_toTopOf="@id/iv_like_pic"
tools:text="0" />
<ImageView
android:id="@+id/iv_comment_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_30"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_comment"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toStartOf="@+id/iv_share_pic"
app:layout_constraintStart_toEndOf="@id/iv_like_pic"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
<View
android:id="@+id/v_tmp_comment"
android:layout_width="22dp"
android:layout_height="22dp"
app:layout_constraintBottom_toBottomOf="@id/iv_comment_pic"
app:layout_constraintEnd_toEndOf="@id/iv_comment_pic"
app:layout_constraintStart_toStartOf="@id/iv_comment_pic"
app:layout_constraintTop_toTopOf="@id/iv_comment_pic" />
<TextView
android:id="@+id/tv_comment_count_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5.5dp"
android:gravity="center_vertical"
android:text="@string/dy_comment_text"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="@id/iv_comment_pic"
app:layout_constraintStart_toEndOf="@id/v_tmp_comment"
app:layout_constraintTop_toTopOf="@id/iv_comment_pic" />
<ImageView
android:id="@+id/iv_share_pic"
android:layout_width="@dimen/dp_dy_detail_option_btn_width"
android:layout_height="@dimen/dp_30"
android:layout_centerVertical="true"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_share"
app:layout_constraintBottom_toBottomOf="@id/iv_like_pic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_comment_count_option"
app:layout_constraintTop_toTopOf="@id/iv_like_pic" />
</android.support.constraint.ConstraintLayout>
<ImageView
android:id="@+id/iv_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:padding="@dimen/dp_6"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_item_more"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/cl_option"
app:layout_constraintBottom_toBottomOf="@id/cl_option"
tools:visibility="visible" />
<View
android:id="@+id/view_line_detail_header"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/line_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_comment_count" />
app:layout_constraintTop_toBottomOf="@id/cl_option" />
<TextView
android:id="@+id/tv_comment_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_13"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_line_detail_header"
tools:text="250条评论" />
</android.support.constraint.ConstraintLayout>

29
app/src/module_community/res/layout/item_dy_comment.xml
View File

@@ -7,8 +7,8 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintStart_toStartOf="parent"
@@ -18,14 +18,13 @@
android:id="@+id/tv_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_11"
android:layout_marginStart="@dimen/dp_20"
android:drawablePadding="@dimen/dp_5"
android:ellipsize="end"
android:maxWidth="180dp"
android:singleLine="true"
android:textColor="@color/color_666666"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toTopOf="@+id/tv_time"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_13"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar"
app:layout_constraintVertical_chainStyle="packed"
@@ -35,13 +34,13 @@
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="center"
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_12"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/tv_nick"
android:textSize="@dimen/sp_11"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toTopOf="@id/tv_nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
tools:text="刚刚" />
<com.netease.nim.uikit.business.session.widget.NimEmojiTextView
@@ -50,13 +49,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="@dimen/dp_29"
android:paddingTop="4dp"
android:paddingTop="8dp"
android:paddingBottom="@dimen/dp_13"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
app:layout_constraintTop_toBottomOf="@id/tv_nick" />
<View
android:id="@+id/line_reply_top"
@@ -65,8 +64,8 @@
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="75dp"
app:layout_constraintStart_toStartOf="@id/tv_content"
app:layout_constraintTop_toBottomOf="@id/tv_content" />
<android.support.v7.widget.RecyclerView

22
app/src/module_community/res/layout/item_dy_reply.xml
View File

@@ -8,8 +8,8 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_width="@dimen/dp_26"
android:layout_height="@dimen/dp_26"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
@@ -24,9 +24,8 @@
android:ellipsize="end"
android:maxWidth="180dp"
android:singleLine="true"
android:textColor="@color/color_666666"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toTopOf="@+id/tv_time"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_13"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar"
app:layout_constraintVertical_chainStyle="packed"
@@ -38,10 +37,11 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_12"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/tv_nick"
android:textSize="@dimen/sp_11"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_nick"
tools:text="刚刚" />
<com.netease.nim.uikit.business.session.widget.NimEmojiTextView
@@ -50,14 +50,14 @@
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:paddingTop="10dp"
android:paddingBottom="@dimen/dp_13"
android:paddingBottom="@dimen/sp_13"
tools:text="回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_15"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_29"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
app:layout_constraintTop_toBottomOf="@id/tv_nick" />
<View
android:id="@+id/view_line_reply"

250
app/src/module_community/res/layout/item_square_dynamic.xml
View File

@@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/shape_bg_square_list"
android:orientation="vertical">
@@ -42,18 +42,7 @@
app:layout_constraintStart_toEndOf="@id/iv_head_wear"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:padding="@dimen/dp_6"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_item_more"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
@@ -132,126 +121,27 @@
android:id="@+id/widget_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/etv_content"
tools:layout_height="100dp" />
<RelativeLayout
android:id="@+id/rl_option"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_6"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/widget_image">
<LinearLayout
android:id="@+id/ll_like"
android:layout_width="86dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp">
<ImageView
android:id="@+id/iv_like_pic"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:scaleType="centerInside" />
<TextView
android:id="@+id/tv_like"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="6.5dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
tools:text="0" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_comment"
android:layout_width="86dp"
android:layout_height="match_parent"
android:layout_toEndOf="@id/ll_like"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp">
<ImageView
android:id="@+id/iv_comment_pic"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_comment" />
<TextView
android:id="@+id/tv_comment"
android:layout_width="86dp"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="6.5dp"
android:gravity="center_vertical"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13"
tools:text="0" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_share"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_toEndOf="@id/ll_comment"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp">
<ImageView
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:src="@drawable/icon_dy_list_share"
android:textColor="@color/color_AFAFB3"
android:textSize="@dimen/sp_13" />
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/iv_like_anim"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="@dimen/dp_16"
android:scaleType="centerInside"
android:src="@drawable/anim_list_dy_like"
app:layout_constraintBottom_toBottomOf="@id/rl_option"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/rl_option" />
<View
android:layout_width="match_parent"
android:layout_height="5dp"
app:layout_constraintTop_toBottomOf="@id/iv_like_anim" />
<android.support.constraint.ConstraintLayout
android:id="@+id/layout_root_mini_world"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginStart="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_25"
android:layout_height="28dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="16.5dp"
android:layout_marginTop="@dimen/dp_5"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_like_anim">
app:layout_constraintTop_toBottomOf="@id/widget_image"
>
<LinearLayout
android:id="@+id/ll_miniworld"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_height="@dimen/dp_18"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_dy_publish_mini_type"
android:orientation="horizontal"
@@ -266,12 +156,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableStart="@drawable/icon_dy_miniworld"
android:drawablePadding="6.5dp"
android:gravity="center"
android:maxWidth="150dp"
android:singleLine="true"
android:textColor="@color/color_FF838D"
android:textColor="@color/color_7154EE"
android:textSize="@dimen/sp_12"
tools:text="小世界名称小世界名称小世界名称" />
@@ -293,5 +182,118 @@
</android.support.constraint.ConstraintLayout>
<RelativeLayout
android:id="@+id/rl_option"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"
>
<LinearLayout
android:id="@+id/ll_like"
android:layout_width="66dp"
android:layout_height="match_parent"
android:orientation="horizontal"
>
<ImageView
android:id="@+id/iv_like_pic"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_dy_list_like_false"
android:scaleType="centerInside" />
<TextView
android:id="@+id/tv_like"
android:layout_width="0dp"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="6.5dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
tools:text="0" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_comment"
android:layout_width="66dp"
android:layout_height="match_parent"
android:layout_toEndOf="@id/ll_like"
android:orientation="horizontal"
android:paddingEnd="0dp">
<ImageView
android:id="@+id/iv_comment_pic"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_comment" />
<TextView
android:id="@+id/tv_comment"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="6.5dp"
android:gravity="center_vertical"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
tools:text="0" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_share"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_toEndOf="@id/ll_comment"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp">
<ImageView
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_share"
/>
</LinearLayout>
<ImageView
android:id="@+id/iv_more"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_15"
android:padding="@dimen/dp_6"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_item_more"
android:layout_alignParentEnd="true"
tools:visibility="visible" />
</RelativeLayout>
<!-- <ImageView-->
<!-- android:id="@+id/iv_like_anim"-->
<!-- android:layout_width="50dp"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_marginStart="@dimen/dp_16"-->
<!-- android:scaleType="centerInside"-->
<!-- android:src="@drawable/anim_list_dy_like"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/rl_option"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@id/rl_option" />-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="5dp"-->
<!-- app:layout_constraintTop_toBottomOf="@id/iv_like_anim" />-->
</android.support.constraint.ConstraintLayout>

84
app/src/module_community/res/layout/layout_dy_nick_detail.xml
View File

@@ -19,49 +19,59 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="炮猫昵称" />
<LinearLayout
android:id="@+id/ll_gender_age"
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_gender_age"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_14"-->
<!-- android:gravity="center"-->
<!-- android:layout_marginStart="3.5dp"-->
<!-- android:background="@drawable/shape_male_corner"-->
<!-- android:minWidth="@dimen/dp_14"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingStart="@dimen/dp_5"-->
<!-- android:paddingEnd="@dimen/dp_5"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/tv_nick"-->
<!-- app:layout_constraintStart_toEndOf="@id/tv_nick"-->
<!-- app:layout_constraintTop_toTopOf="@id/tv_nick">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_gender"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/icon_dy_list_female" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_age"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="1.5dp"-->
<!-- android:gravity="center"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/dp_10"-->
<!-- tools:text="20" />-->
<!-- </LinearLayout>-->
<ImageView
android:id="@+id/iv_gender"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_14"
android:gravity="center"
android:layout_marginStart="3.5dp"
android:background="@drawable/shape_male_corner"
android:minWidth="@dimen/dp_14"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_5"
android:paddingEnd="@dimen/dp_5"
android:layout_height="wrap_content"
tools:src="@drawable/ic_female"
android:layout_marginStart="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/tv_nick"
app:layout_constraintTop_toTopOf="@id/tv_nick">
<ImageView
android:id="@+id/iv_gender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_dy_list_female" />
<TextView
android:id="@+id/tv_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1.5dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
tools:text="20" />
</LinearLayout>
app:layout_constraintTop_toTopOf="@id/tv_nick"
/>
<ImageView
android:id="@+id/iv_user_official"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_marginStart="@dimen/dp_5"
android:scaleType="centerInside"
android:src="@mipmap/ic_user_official_13dp"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/ll_gender_age"
app:layout_constraintTop_toTopOf="@id/tv_nick" />
app:layout_constraintTop_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toStartOf="@id/tv_nick"
android:layout_marginTop="@dimen/dp_5"
/>
<ImageView
android:id="@+id/iv_user_new"
@@ -70,9 +80,9 @@
android:layout_marginStart="5dp"
android:scaleType="centerInside"
android:src="@mipmap/ic_user_new_13dp"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/iv_user_official"
app:layout_constraintTop_toTopOf="@id/tv_nick" />
app:layout_constraintBottom_toBottomOf="@id/iv_user_official"
app:layout_constraintTop_toTopOf="@id/iv_user_official"/>
<ImageView
android:id="@+id/iv_user_noble_level"
@@ -80,8 +90,8 @@
android:layout_height="@dimen/dp_13"
android:layout_marginStart="@dimen/dp_5"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/iv_user_new"
app:layout_constraintTop_toTopOf="@id/tv_nick"
app:layout_constraintBottom_toBottomOf="@id/iv_user_official"
app:layout_constraintTop_toTopOf="@id/iv_user_official"
tools:src="@mipmap/ic_user_level_king" />
</android.support.constraint.ConstraintLayout>

2
app/src/module_community/res/values/dimens.xml
View File

@@ -2,7 +2,7 @@
<resources>
<dimen name="dp_dy_detail_bottom_bar_height">51.5dp</dimen>
<dimen name="dp_dy_detail_option_btn_width">90dp</dimen>
<dimen name="dp_dy_detail_option_btn_width">70dp</dimen>
<dimen name="dp_dy_copy_popup_drawable_padding">2.5dp</dimen>
<dimen name="dp_dy_copy_popup_padding_top">7dp</dimen>

1
app/src/module_community/res/values/strings.xml
View File

@@ -14,6 +14,7 @@
<string name="dy_comment_text">评论</string>
<string name="dys_tab_recommend">推荐</string>
<string name="dys_tab_attent">关注</string>
<string name="dys_tab_new">最新</string>
<string name="home_tab_dynamic">动态</string>
<string name="home_tab_caht">聊天交友</string>
<string name="dys_find_tab_square">广场</string>

2
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
View File

@@ -30,7 +30,7 @@ public class QuickLoginUiConfig {
int maskNumSize = 20;
int sloganToTop = maskNumToTop + maskNumSize + 16;
int sloganSize = 14;
int loginBtnToTop = sloganToTop + sloganSize + 86;
int loginBtnToTop = sloganToTop + sloganSize + 270;
int loginBtnHeight = 48;
int X_OFFSET = 0;