Update sample

library/src/main/AndroidManifest.xml

@@ -1,5 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jp.co.recruit_lifestyle.android.widget"/>
+<manifest package="jp.co.recruit_lifestyle.android.widget"/>

library/src/main/java/jp/co/recruit_lifestyle/android/widget/BeerSwipeRefreshLayout.java

@@ -29,7 +29,6 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 
 /**
  * @author amyu_san
@@ -96,7 +95,7 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
     final int childRight = thisWidth - getPaddingRight();
     final int childBottom = thisHeight - getPaddingBottom();
     mTarget.layout(getPaddingLeft(), getPaddingTop(), childRight, childBottom);
-    mBeerView.layout(l, t, r, b);
+    mBeerView.layout(getPaddingLeft(), getPaddingTop() + 30, childRight, childBottom + 30);
     mBeerView.bringToFront();
   }
 
@@ -107,6 +106,7 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
     mTarget.measure(
         makeMeasureSpecExactly(getMeasuredWidth() - (getPaddingLeft() + getPaddingRight())),
         makeMeasureSpecExactly(getMeasuredHeight() - (getPaddingTop() + getPaddingBottom())));
+    mBeerView.measure(widthMeasureSpec, heightMeasureSpec);
   }
 
   @Override protected void onAttachedToWindow() {
@@ -122,9 +122,10 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
   @Override public boolean onInterceptTouchEvent(MotionEvent event) {
     ensureTarget();
 
-    if (!isEnabled() || canChildScrollUp() || isRefreshing()) {
+    if (!isEnabled()) {
       return false;
     }
+
     if (mBeerView.isReverseAnimationRunning() || mBeerView.isMax()) {
       return false;
     }
@@ -159,8 +160,7 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
         final float yDiff = currentY - mFirstTouchDownPointY;
 
         // State is changed to drag if over slop
-        if (yDiff > ViewConfiguration.get(getContext())
-            .getScaledTouchSlop() && !isRefreshing()) {
+        if (yDiff > ViewConfiguration.get(getContext()).getScaledTouchSlop()) {
           return true;
         }
 
@@ -175,9 +175,11 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
   }
 
   @Override public boolean onTouchEvent(@NonNull MotionEvent event) {
-    if (!isEnabled() || canChildScrollUp() /*|| isRefreshing()*/) {
+    if (!isEnabled()) {
       return false;
     }
+
+
     if (mBeerView.isReverseAnimationRunning() || mBeerView.isMax()) {
       return false;
     }
@@ -206,6 +208,7 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
           mBeerView.drawGlass(0);
           return false;
         } else {
+          mBeerView.setAlpha(1);
           setRefreshing(true, true);
         }
         float touchMoveDegree = Math.max(-(diffY - mFirstTouchDownPointY) / 3, -110);
@@ -233,9 +236,6 @@ public BeerSwipeRefreshLayout(Context context, AttributeSet attrs, int defStyleA
         if (!isRefreshing()) {
           mBeerView.startDisappearAnimator();
         }
-        if (touchMoveDegree > 0) {
-          return false;
-        }
 
         mBeerView.startReverseBottleAnimator(touchMoveDegree);
         break;
@@ -336,24 +336,6 @@ private void ensureTarget() {
     }
   }
 
-  public boolean canChildScrollUp() {
-    if (mTarget == null) {
-      return false;
-    }
-
-    if (android.os.Build.VERSION.SDK_INT < 14) {
-      if (mTarget instanceof AbsListView) {
-        final AbsListView absListView = (AbsListView) mTarget;
-        return absListView.getChildCount() > 0 && (absListView.getFirstVisiblePosition() > 0
-            || absListView.getChildAt(0).getTop() < absListView.getPaddingTop());
-      } else {
-        return mTarget.getScrollY() > 0;
-      }
-    } else {
-      return ViewCompat.canScrollVertically(mTarget, -1);
-    }
-  }
-
   public void setOnRefreshListener(OnRefreshListener listener) {
     mListener = listener;
   }

sample/src/main/java/jp/co/recruit_lifestyle/sample/MainActivity.java

@@ -3,9 +3,10 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.Toast;
 import java.util.ArrayList;
 import jp.co.recruit_lifestyle.android.widget.BeerSwipeRefreshLayout;
 
@@ -16,26 +17,27 @@ public class MainActivity extends AppCompatActivity {
   private BeerSwipeRefreshLayout mBeerSwipeRefreshLayout;
 
   @Override protected void onCreate(Bundle savedInstanceState) {
+    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
 
     initView();
     setSampleData();
-
-
   }
 
   private void initView() {
-    mBeerSwipeRefreshLayout = (BeerSwipeRefreshLayout) findViewById(R.id.main_beer_view);
+    mBeerSwipeRefreshLayout = (BeerSwipeRefreshLayout) findViewById(R.id.main_beer);
     mBeerSwipeRefreshLayout.setOnRefreshListener(new BeerSwipeRefreshLayout.OnRefreshListener() {
       @Override public void onRefresh() {
-        Toast.makeText(getApplicationContext(), "onRefresh", Toast.LENGTH_SHORT).show();
+        //Toast.makeText(getApplicationContext(), "onRefresh", Toast.LENGTH_SHORT).show();
         new Handler().postDelayed(new Runnable() {
           @Override public void run() {
             mBeerSwipeRefreshLayout.setRefreshing(false);
-            Toast.makeText(getApplicationContext(), "setRefreshing(false)", Toast.LENGTH_SHORT).show();
+            //Toast.makeText(getApplicationContext(), "setRefreshing(false)", Toast.LENGTH_SHORT).show();
           }
-        }, 10000);
+        }, 7000);
       }
     });
     mListview = (ListView) findViewById(R.id.main_list);
@@ -44,7 +46,7 @@ private void initView() {
   private void setSampleData() {
     ArrayList<String> sampleArrayStr = new ArrayList<>();
     for (int i = 0; i < 60; i++) {
-      sampleArrayStr.add("sample" + i);
+      sampleArrayStr.add("");
     }
     ArrayAdapter<String> adapter = new ArrayAdapter<>(getApplicationContext(), android.R.layout.simple_list_item_1, sampleArrayStr);
     mListview.setAdapter(adapter);

sample/src/main/res/layout/activity_main.xml

@@ -1,20 +1,41 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:orientation="vertical"
+    tools:context=".MainActivity"
+    >
 
-    <jp.co.recruit_lifestyle.android.widget.BeerSwipeRefreshLayout
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="25dip"
+      android:background="@color/primary_dark"
+      />
+
+  <android.support.v7.widget.Toolbar
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:minHeight="?attr/actionBarSize"
+      android:background="@color/primary"
+      android:id="@+id/toolbar"
+      />
+
+
+  <jp.co.recruit_lifestyle.android.widget.BeerSwipeRefreshLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_weight="1"
+      android:id="@+id/main_beer"
+      >
+
+    <ListView
+        android:id="@+id/main_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/main_beer_view"
-        >
+        />
 
-        <ListView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/main_list"
-            />
-    </jp.co.recruit_lifestyle.android.widget.BeerSwipeRefreshLayout>
+  </jp.co.recruit_lifestyle.android.widget.BeerSwipeRefreshLayout>
 
-</RelativeLayout>
+</LinearLayout>

sample/src/main/res/values-v21/styles.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="AppTheme"
+      parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="android:colorPrimary">@color/primary</item>
+    <item name="android:statusBarColor">@color/primary_dark</item>
+    <item name="android:navigationBarColor">@color/primary</item>
+  </style>
+</resources>

sample/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="primary">#FFC107</color>
+  <color name="primary_dark">#FFA000</color>
+</resources>