发布 1.0.3 稳定版本

fuguiniao · Aug 24, 2017 · 107a60e · 107a60e
1 parent 06c5ac6
commit 107a60e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/com/scwang/refreshlayout/activity/practice/WeiboPracticeActivity.java b/app/src/main/java/com/scwang/refreshlayout/activity/practice/WeiboPracticeActivity.java
@@ -6,6 +6,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.Toast;
 
 import com.scwang.refreshlayout.R;
 import com.scwang.refreshlayout.util.StatusBarUtil;
@@ -44,6 +45,19 @@ public void onClick(View v) {
         final NestedScrollView scrollView = (NestedScrollView)findViewById(R.id.scrollView);
         final RefreshLayout refreshLayout = (RefreshLayout)findViewById(R.id.refreshLayout);
 
+        findViewById(R.id.attention).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Toast.makeText(view.getContext(),"点击了关注",Toast.LENGTH_SHORT).show();
+            }
+        });
+        findViewById(R.id.leaveword).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Toast.makeText(view.getContext(),"点击了留言",Toast.LENGTH_SHORT).show();
+            }
+        });
+
         refreshLayout.setOnMultiPurposeListener(new SimpleMultiPurposeListener() {
             @Override
             public void onHeaderPulling(RefreshHeader header, float percent, int offset, int bottomHeight, int extendHeight) {

diff --git a/app/src/main/res/layout/activity_style_classics.xml b/app/src/main/res/layout/activity_style_classics.xml
@@ -29,7 +29,7 @@
             app:srlDrawableArrowSize="20dp"
             app:srlDrawableProgressSize="20dp"
             app:srlDrawableMarginRight="20dp"
-            app:srlDrawableProgress="@drawable/ic_index_dashboard"/>
+            app:srlDrawableProgress="@drawable/ic_progress_hojder"/>
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"

diff --git a/art/app-debug.apk b/art/app-debug.apk
diff --git a/refresh-layout/src/main/java/com/scwang/smartrefresh/layout/SmartRefreshLayout.java b/refresh-layout/src/main/java/com/scwang/smartrefresh/layout/SmartRefreshLayout.java
@@ -277,8 +277,8 @@ private void initView(Context context, AttributeSet attrs) {
         mHeaderHeightStatus = ta.hasValue(R.styleable.SmartRefreshLayout_srlHeaderHeight) ? DimensionStatus.XmlLayoutUnNotify : mHeaderHeightStatus;
         mFooterHeightStatus = ta.hasValue(R.styleable.SmartRefreshLayout_srlFooterHeight) ? DimensionStatus.XmlLayoutUnNotify : mFooterHeightStatus;
 
-        mFooterExtendHeight = (int) Math.max((mFooterHeight * (mHeaderMaxDragRate - 1)), 0);
         mHeaderExtendHeight = (int) Math.max((mHeaderHeight * (mHeaderMaxDragRate - 1)), 0);
+        mFooterExtendHeight = (int) Math.max((mFooterHeight * (mFooterMaxDragRate - 1)), 0);
 
         int accentColor = ta.getColor(R.styleable.SmartRefreshLayout_srlAccentColor, 0);
         int primaryColor = ta.getColor(R.styleable.SmartRefreshLayout_srlPrimaryColor, 0);