Merge remote-tracking branch 'upstream/master'

# Conflicts: # .idea/misc.xml # library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
CymChad · Jun 19, 2016 · 13dc394 · 13dc394
2 parents 36384aa + 30085ca
commit 13dc394
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 154 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/EmptyViewUseActivity.java
@@ -24,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initAdapter() {
-        mQuickAdapter = new QuickAdapter(this, 0);
+        mQuickAdapter = new QuickAdapter(0);
         View emptyView = getLayoutInflater().inflate(R.layout.empty_view, (ViewGroup) mRecyclerView.getParent(), false);
         mQuickAdapter.setEmptyView(emptyView);
         View view = getLayoutInflater().inflate(R.layout.head_view, (ViewGroup) mRecyclerView.getParent(), false);

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/HeaderAndFooterUseActivity.java
@@ -47,7 +47,7 @@ public void onClick(View v) {
     }
 
     private void initAdapter() {
-        mQuickAdapter = new QuickAdapter(HeaderAndFooterUseActivity.this, PAGE_SIZE);
+        mQuickAdapter = new QuickAdapter(PAGE_SIZE);
         mQuickAdapter.openLoadAnimation();
         mRecyclerView.setAdapter(mQuickAdapter);
         mQuickAdapter.setOnRecyclerViewItemClickListener(new BaseQuickAdapter.OnRecyclerViewItemClickListener() {

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java
@@ -99,7 +99,7 @@ public void run() {
     }
 
     private void initAdapter() {
-        mQuickAdapter = new QuickAdapter(PullToRefreshUseActivity.this, PAGE_SIZE);
+        mQuickAdapter = new QuickAdapter(PAGE_SIZE);
         mQuickAdapter.openLoadAnimation();
         mRecyclerView.setAdapter(mQuickAdapter);
         mCurrentCounter = mQuickAdapter.getData().size();

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/MultipleItemAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/MultipleItemAdapter.java
@@ -52,7 +52,7 @@ protected void convert(BaseViewHolder helper, String item) {
 
     public class TextViewHolder extends BaseViewHolder {
         public TextViewHolder(View itemView) {
-            super(itemView.getContext(), itemView);
+            super(itemView);
         }
     }
 

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java
@@ -1,6 +1,5 @@
 package com.chad.baserecyclerviewadapterhelper.adapter;
 
-import android.content.Context;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
@@ -19,7 +18,7 @@ public QuickAdapter() {
         super( R.layout.tweet, DataServer.getSampleData(100));
     }
 
-    public QuickAdapter(Context context, int dataSize) {
+    public QuickAdapter(int dataSize) {
         super( R.layout.tweet, DataServer.getSampleData(dataSize));
     }
 
@@ -32,6 +31,7 @@ protected void convert(BaseViewHolder helper, Status item) {
                 .setOnClickListener(R.id.tweetAvatar, new OnItemChildClickListener())
                 .setOnClickListener(R.id.tweetName, new OnItemChildClickListener())
                 .linkify(R.id.tweetText);
+
         Glide.with(mContext).load(item.getUserAvatar()).crossFade().placeholder(R.mipmap.def_head).transform(new GlideCircleTransform(mContext)).into((ImageView) helper.getView(R.id.tweetAvatar));
     }
 

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
@@ -456,13 +456,13 @@ public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
                 initItemClickListener(baseViewHolder);
                 break;
             case HEADER_VIEW:
-                baseViewHolder = new BaseViewHolder(mContext, mHeaderView);
+                baseViewHolder = new BaseViewHolder(mHeaderView);
                 break;
             case EMPTY_VIEW:
-                baseViewHolder = new BaseViewHolder(mContext, mEmptyView);
+                baseViewHolder = new BaseViewHolder(mEmptyView);
                 break;
             case FOOTER_VIEW:
-                baseViewHolder = new BaseViewHolder(mContext, mFooterView);
+                baseViewHolder = new BaseViewHolder(mFooterView);
                 break;
             default:
                 baseViewHolder = onCreateDefViewHolder(parent, viewType);
@@ -472,11 +472,12 @@ public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     }
 
+
     private BaseViewHolder getLoadingView(ViewGroup parent) {
         if (mLoadingView == null) {
             return createBaseViewHolder(parent, R.layout.def_loading);
         }
-        return new BaseViewHolder(mContext, mLoadingView);
+        return new BaseViewHolder(mLoadingView);
     }
 
     @Override
@@ -526,9 +527,9 @@ protected BaseViewHolder onCreateDefViewHolder(ViewGroup parent, int viewType) {
 
     protected BaseViewHolder createBaseViewHolder(ViewGroup parent, int layoutResId) {
         if (mContentView == null) {
-            return new BaseViewHolder(mContext, getItemView(layoutResId, parent));
+            return new BaseViewHolder(getItemView(layoutResId, parent));
         }
-        return new BaseViewHolder(mContext, mContentView);
+        return new BaseViewHolder(mContentView);
     }
 
 

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseSectionQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseSectionQuickAdapter.java
@@ -36,7 +36,7 @@ protected int getDefItemViewType(int position) {
     @Override
     protected BaseViewHolder onCreateDefViewHolder(ViewGroup parent, int viewType) {
         if (viewType == SECTION_HEADER_VIEW)
-            return new BaseViewHolder(mContext, getItemView(mSectionHeadResId, parent));
+            return new BaseViewHolder(getItemView(mSectionHeadResId, parent));
 
         return super.onCreateDefViewHolder(parent, viewType);
     }

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java b/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java
@@ -1,6 +1,5 @@
 package com.chad.library.adapter.base;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Paint;
 import android.graphics.Typeface;
@@ -31,7 +30,6 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {
      */
     private final SparseArray<View> views;
 
-    private final Context context;
 
     public View convertView;
 
@@ -41,9 +39,8 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {
     Object associatedObject;
 
 
-    protected BaseViewHolder(Context context, View view) {
+    protected BaseViewHolder(View view) {
         super(view);
-        this.context = context;
         this.views = new SparseArray<View>();
         convertView = view;
 
@@ -119,18 +116,6 @@ public BaseViewHolder setTextColor(int viewId, int textColor) {
         return this;
     }
 
-    /**
-     * Will set text color of a TextView.
-     *
-     * @param viewId       The view id.
-     * @param textColorRes The text color resource id.
-     * @return The BaseViewHolder for chaining.
-     */
-    public BaseViewHolder setTextColorRes(int viewId, int textColorRes) {
-        TextView view = getView(viewId);
-        view.setTextColor(context.getResources().getColor(textColorRes));
-        return this;
-    }
 
     /**
      * Will set the image of an ImageView from a drawable.