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:
huangjian
2020-12-11 18:35:33 +08:00
parent c287c03157
commit 96266568dd
12 changed files with 112 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java
View File

@@ -117,7 +117,7 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, B
etvContent.setText(formatText, mCollapsedStatus, helper.getAdapterPosition(), mCollapsedHeightStatus);
}
helper.setGone(R.id.ll_miniworld, item.getTag() != null);
helper.setGone(R.id.layout_root_mini_world, item.getTag() != null);
helper.setText(R.id.tv_mini_world_name,"#" + item.getTag());
//评论

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

@@ -1,31 +1,30 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="match_parent">
xmlns:app="http://schemas.android.com/apk/res-auto">
<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_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_15"
android:drawableEnd="@drawable/arrow_right_white"
android:text="@string/recommend_topic"
android:textColor="@color/white"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_topic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="0dp"
android:layout_marginTop="@dimen/dp_8"
android:paddingBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@id/tv_title_topic"
/>
app:layout_constraintTop_toBottomOf="@id/tv_title_topic" />
</androidx.constraintlayout.widget.ConstraintLayout>

BIN
app/src/main/res/mipmap-xhdpi/bg_home_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 211 KiB

18
app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java
View File

@@ -3,11 +3,15 @@ package com.yizhuan.erban.community.photo;
import android.content.Context;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.heytap.mcssdk.utils.LogUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -47,20 +51,16 @@ public class DynamicImageAdapter extends BaseQuickAdapter<DynamicMedia, BaseView
@Override
protected void convert(BaseViewHolder helper, DynamicMedia item) {
ImageView ivPhoto = helper.getView(R.id.riv_photo);
ViewGroup.LayoutParams layoutParams = ivPhoto.getLayoutParams();
helper.setGone(R.id.iv_gif_tag, item.isGif());
ViewGroup.LayoutParams layoutParams = ivPhoto.getLayoutParams();
if (helper.itemView instanceof ConstraintLayout && getData().size() > 1) {
ImageLoadUtilsV2.loadImage(ivPhoto, item.getResUrl(), imageWidth);
} else {
switch (getData().size()) {
case 1:
try {
layoutParams.height = singleImageHeight;
ivPhoto.setLayoutParams(layoutParams);
ImageLoadUtilsV2.loadImage(ivPhoto, item.getResUrl(), bigImageWidth);
} catch (Exception e) {
e.printStackTrace();
}
break;
case 2:
layoutParams.height = mTwoImageHeight;
@@ -75,4 +75,6 @@ public class DynamicImageAdapter extends BaseQuickAdapter<DynamicMedia, BaseView
break;
}
}
LogUtil.d("layoutParams=" +layoutParams.height);
}
}

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

@@ -146,7 +146,6 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
@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 bottom = SizeUtils.dp2px(getContext(), 10);
int top = SizeUtils.dp2px(getContext(), 5);

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

@@ -70,8 +70,6 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAd
@BindView(R.id.view_pager)
ViewPager viewPager;
Unbinder unbinder;
@BindView(R.id.tv_scroll_top)
TextView tvScrollTop;
@BindView(R.id.iv_square_publish)
DragLayout ivSquarePublish;
@BindView(R.id.fl_contact_list)
@@ -128,7 +126,7 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAd
CommonNavigator commonNavigator = new CommonNavigator(getContext());
TopMagicIndicatorAdapter magicIndicatorAdapter = new TopMagicIndicatorAdapter(getContext(), tagList);
magicIndicatorAdapter.setOnItemSelectListener(this);
commonNavigator.setTitleWrapContent(true);
commonNavigator.setAdapter(magicIndicatorAdapter);
magicIndicator.setNavigator(commonNavigator);

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

@@ -1,67 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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="match_parent"
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">
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="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"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
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" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:layout_height="20dp"
tools:layout_width="match_parent" />
<FrameLayout
android:id="@+id/fl_contact_list"
android:layout_width="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_height="48dp"
android:paddingStart="@dimen/dp_15"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" >
android:layout_centerVertical="true"
android:paddingStart="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@id/magic_indicator"
app:layout_constraintEnd_toEndOf="parent">
<ImageView
android:layout_width="21dp"
android:layout_height="21dp"
android:scaleType="center"
android:layout_marginEnd="@dimen/dp_15"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="center"
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_marginTop="5dp"
android:layout_marginStart="@dimen/dp_10"
android:gravity="center"
android:visibility="invisible"
@@ -71,30 +61,28 @@
</FrameLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
app:layout_constraintTop_toBottomOf="@id/magic_indicator"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/transparent"
android:layout_width="match_parent"
android:layout_height="0dp" />
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:background="@color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/magic_indicator" />
<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_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_square_publish"
/>
android:background="@drawable/ic_square_publish" />
</com.yizhuan.erban.common.widget.DragLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -99,8 +99,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/etv_content" />

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

@@ -12,8 +12,9 @@
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/riv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:scaleType="centerCrop"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent"
app:riv_corner_radius="@dimen/dp_8" />

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

@@ -9,8 +9,9 @@
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/riv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:scaleType="centerCrop"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent"
app:riv_corner_radius="@dimen/dp_8" />

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

@@ -4,22 +4,26 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_9"
android:layout_marginEnd="@dimen/dp_9"
android:background="@drawable/bg_corner_shadow_12"
android:orientation="vertical">
android:orientation="vertical"
android:paddingStart="@dimen/dp_2"
android:paddingTop="1dp"
android:paddingEnd="@dimen/dp_2"
android:paddingBottom="@dimen/dp_5">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_user_info"
android:layout_width="match_parent"
android:layout_height="59dp"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toTopOf="parent">
<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"
app:layout_constraintBottom_toBottomOf="@+id/iv_head_wear"
app:layout_constraintEnd_toEndOf="@+id/iv_head_wear"
app:layout_constraintStart_toStartOf="@+id/iv_head_wear"
@@ -38,32 +42,31 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintStart_toEndOf="@id/iv_head_wear"
app:layout_constraintTop_toTopOf="@id/iv_avatar"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"/>
app:layout_constraintTop_toTopOf="@id/iv_avatar" />
<ImageView
android:id="@+id/iv_in_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:src="@drawable/ic_dy_in_room"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/widget_nick_detail"
android:layout_marginEnd="@dimen/dp_20"
android:visibility="gone"
tools:visibility="visible"
/>
tools:visibility="visible" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_20"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/widget_nick_detail"
app:layout_constraintEnd_toEndOf="parent"
tools:text="刚刚" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -73,8 +76,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_20"
android:orientation="vertical"
app:animAlphaStart="1"
app:collapseIndicator="@string/collapse"
@@ -123,12 +126,10 @@
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="16.5dp"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_20"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/widget_image"
>
app:layout_constraintTop_toBottomOf="@id/widget_image">
<LinearLayout
android:id="@+id/ll_miniworld"
@@ -136,10 +137,10 @@
android:layout_height="@dimen/dp_18"
android:layout_gravity="center_vertical"
android:background="@drawable/bg_dynamic_topic"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="@dimen/dp_11"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -158,36 +159,34 @@
tools:text="话题名称话题名称话题名称" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:id="@+id/rl_option"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_20"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"
>
app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world">
<LinearLayout
android:id="@+id/ll_like"
android:layout_width="60dp"
android:layout_height="match_parent"
android:orientation="horizontal"
>
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_like_pic"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_dy_list_like_false"
android:scaleType="centerInside" />
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_like_false" />
<TextView
android:id="@+id/tv_like"
@@ -198,21 +197,22 @@
android:gravity="center_vertical"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
tools:text="0" />
tools:text="0123" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_comment"
android:layout_width="60dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
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_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_comment" />
@@ -231,49 +231,32 @@
<LinearLayout
android:id="@+id/ll_share"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/ll_comment"
android:paddingStart="@dimen/dp_5"
android:paddingEnd="0dp">
<ImageView
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:src="@drawable/icon_dy_list_share"
/>
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_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
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" />-->
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -9,7 +9,8 @@
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/riv_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="parent"
app:riv_corner_radius="@dimen/dp_8" />