diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java deleted file mode 100644 index 50a0820d6..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.yizhuan.erban.ui.widget.recyclerview.decoration; - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.view.View; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import io.reactivex.annotations.NonNull; - -/** - * Created by hzchenkang on 2016/12/2. - */ - -public class DividerItemDecoration extends RecyclerView.ItemDecoration { - private static final int[] ATTRS = new int[]{ - android.R.attr.listDivider - }; - - public static final int HORIZONTAL_LIST = LinearLayoutManager.HORIZONTAL; - - public static final int VERTICAL_LIST = LinearLayoutManager.VERTICAL; - - private Drawable mDivider; - - private int mOrientation; - - public DividerItemDecoration(Context context, int orientation) { - final TypedArray a = context.obtainStyledAttributes(ATTRS); - mDivider = a.getDrawable(0); - a.recycle(); - setOrientation(orientation); - } - - public void setOrientation(int orientation) { - if (orientation != HORIZONTAL_LIST && orientation != VERTICAL_LIST) { - throw new IllegalArgumentException("invalid orientation"); - } - mOrientation = orientation; - } - - public void setDrawable(@NonNull Drawable mDivider) { - this.mDivider = mDivider; - } - - @Override - public void onDraw(Canvas c, RecyclerView parent) { - - if (mOrientation == VERTICAL_LIST) { - drawVertical(c, parent); - } else { - drawHorizontal(c, parent); - } - } - - - protected boolean needDrawDecoration(RecyclerView parent, int position) { - return true; - } - - public void drawVertical(Canvas c, RecyclerView parent) { - final int left = parent.getPaddingLeft(); - final int right = parent.getWidth() - parent.getPaddingRight(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - if (!needDrawDecoration(parent, i)) { - continue; - } - final View child = parent.getChildAt(i); - RecyclerView v = new RecyclerView(parent.getContext()); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int top = child.getBottom() + params.bottomMargin; - final int bottom = top + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - public void drawHorizontal(Canvas c, RecyclerView parent) { - final int top = parent.getPaddingTop(); - final int bottom = parent.getHeight() - parent.getPaddingBottom(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - if (!needDrawDecoration(parent, i)) { - continue; - } - final View child = parent.getChildAt(i); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int left = child.getRight() + params.rightMargin; - final int right = left + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - @Override - public void getItemOffsets(Rect outRect, int itemPosition, RecyclerView parent) { - if (!needDrawDecoration(parent, itemPosition)) { - return; - } - if (mOrientation == VERTICAL_LIST) { - outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()); - } else { - outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0); - } - } -} diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecorationNIM.java similarity index 76% rename from nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java rename to nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecorationNIM.java index 831f877cb..ff4611e8e 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecorationNIM.java @@ -4,7 +4,7 @@ import android.content.Context; import androidx.recyclerview.widget.RecyclerView; -import com.netease.nim.uikit.common.ui.recyclerview.decoration.DividerItemDecoration; +import com.netease.nim.uikit.common.ui.recyclerview.decoration.NIMDividerItemDecoration; import java.util.HashSet; import java.util.List; @@ -14,12 +14,12 @@ import java.util.Set; * Created by hzchenkang on 2017/6/22. */ -public class AitContactDecoration extends DividerItemDecoration { +public class AitContactDecorationNIM extends NIMDividerItemDecoration { // 不需要分割线 private Set ignoreDecorations; - public AitContactDecoration(Context context, int orientation, List ignoreDecorations) { + public AitContactDecorationNIM(Context context, int orientation, List ignoreDecorations) { super(context, orientation); if (ignoreDecorations != null) { this.ignoreDecorations = new HashSet<>(ignoreDecorations); diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java index c100aaeef..8106907c0 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java @@ -85,7 +85,7 @@ public class AitContactSelectorActivity extends UI { List noDividerViewTypes = new ArrayList<>(1); noDividerViewTypes.add(ItemType.SIMPLE_LABEL); - recyclerView.addItemDecoration(new AitContactDecoration(this, LinearLayoutManager.VERTICAL, noDividerViewTypes)); + recyclerView.addItemDecoration(new AitContactDecorationNIM(this, LinearLayoutManager.VERTICAL, noDividerViewTypes)); recyclerView.addOnItemTouchListener(new OnItemClickListener() { diff --git a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java index e985667e4..72cfa8589 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.wrapper.NimToolBarOptions; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter; -import com.netease.nim.uikit.common.ui.recyclerview.decoration.DividerItemDecoration; +import com.netease.nim.uikit.common.ui.recyclerview.decoration.NIMDividerItemDecoration; import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; import com.netease.nim.uikit.common.ui.recyclerview.listener.OnItemClickListener; @@ -50,7 +50,7 @@ public abstract class ListActivityBase extends UI { // RecyclerView RecyclerView recyclerView = (RecyclerView) findViewById(R.id.data_list); recyclerView.setLayoutManager(new LinearLayoutManager(this)); - recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST)); + recyclerView.addItemDecoration(new NIMDividerItemDecoration(this, NIMDividerItemDecoration.VERTICAL_LIST)); recyclerView.addOnItemTouchListener(new OnItemClickListener() { @Override public void onItemClick(Adapter adapter, View view, int position) { diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/NIMDividerItemDecoration.java similarity index 96% rename from nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java rename to nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/NIMDividerItemDecoration.java index 9bb0e15f7..9d59ad69b 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/NIMDividerItemDecoration.java @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; * Created by hzchenkang on 2016/12/2. */ -public class DividerItemDecoration extends RecyclerView.ItemDecoration { +public class NIMDividerItemDecoration extends RecyclerView.ItemDecoration { private static final int[] ATTRS = new int[]{ android.R.attr.listDivider }; @@ -27,7 +27,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { private int mOrientation; - public DividerItemDecoration(Context context, int orientation) { + public NIMDividerItemDecoration(Context context, int orientation) { final TypedArray a = context.obtainStyledAttributes(ATTRS); mDivider = a.getDrawable(0); a.recycle();