refractor to allow building

AllanWang · Mar 13, 2017 · a9f9b55 · a9f9b55
1 parent bcb16bb
commit a9f9b55
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 132 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -78,26 +78,19 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />

diff --git a/swiperecyclerview/src/main/java/ca/allanwang/swiperecyclerview/library/SwipeRefreshBase.java b/swiperecyclerview/src/main/java/ca/allanwang/swiperecyclerview/library/SwipeRefreshBase.java
@@ -9,13 +9,14 @@
  * Created by Allan Wang on 2017-02-23.
  */
 
-class SwipeRefreshBase extends SwipeRefreshLayout {
+public class SwipeRefreshBase extends SwipeRefreshLayout {
 
     private ISwipeRefresh mISwipe;
 
     interface ISwipeRefresh {
         /**
          * Dictates whether touch should be received & consumed
+         *
          * @param ev MotionEvent triggered
          * @return true to consume, false otherwise
          */

diff --git a/...rview/src/main/java/ca/allanwang/swiperecyclerview/library/adapters/AnimationAdapter.java b/...rview/src/main/java/ca/allanwang/swiperecyclerview/library/adapters/AnimationAdapter.java
@@ -8,7 +8,7 @@
 import android.view.animation.LinearInterpolator;
 
 import ca.allanwang.swiperecyclerview.library.interfaces.IAdapterAnimator;
-import jp.wasabeef.recyclerview.internal.ViewHelper;
+import ca.allanwang.swiperecyclerview.library.wasabeef.internal.ViewHelper;
 
 /**
  * Created by Allan Wang on 2017-03-09.

diff --git a/...rview/src/main/java/ca/allanwang/swiperecyclerview/library/animators/SlidingAnimator.java b/...rview/src/main/java/ca/allanwang/swiperecyclerview/library/animators/SlidingAnimator.java
@@ -6,7 +6,8 @@
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 
-import jp.wasabeef.recyclerview.animators.BaseItemAnimator;
+import ca.allanwang.swiperecyclerview.library.wasabeef.animators.BaseItemAnimator;
+
 
 /**
  * Created by Allan Wang on 2017-03-09.
@@ -64,7 +65,7 @@ protected long getRemoveDelay(final RecyclerView.ViewHolder holder) {
 
     @Override
     protected long getAddDelay(final RecyclerView.ViewHolder holder) {
-        return Math.abs(holder.getAdapterPosition() * getAddDuration() / 10);
+        return Math.max(holder.getAdapterPosition() * getAddDuration() / 10, 0);
     }
 
     /**

diff --git a/...yclerview/animators/BaseItemAnimator.java → .../wasabeef/animators/BaseItemAnimator.java b/...yclerview/animators/BaseItemAnimator.java → .../wasabeef/animators/BaseItemAnimator.java
@@ -1,4 +1,4 @@
-package jp.wasabeef.recyclerview.animators;
+package ca.allanwang.swiperecyclerview.library.wasabeef.animators;
 /*
  * Copyright (C) 2015 Wasabeef
  * Copyright (C) 2014 The Android Open Source Project
@@ -29,8 +29,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jp.wasabeef.recyclerview.animators.holder.AnimateViewHolder;
-import jp.wasabeef.recyclerview.internal.ViewHelper;
+import ca.allanwang.swiperecyclerview.library.wasabeef.animators.holder.AnimateViewHolder;
+import ca.allanwang.swiperecyclerview.library.wasabeef.internal.ViewHelper;
 
 public abstract class BaseItemAnimator extends SimpleItemAnimator {
 

diff --git a/...w/animators/holder/AnimateViewHolder.java → ...f/animators/holder/AnimateViewHolder.java b/...w/animators/holder/AnimateViewHolder.java → ...f/animators/holder/AnimateViewHolder.java
@@ -1,4 +1,4 @@
-package jp.wasabeef.recyclerview.animators.holder;
+package ca.allanwang.swiperecyclerview.library.wasabeef.animators.holder;
 
 import android.support.v4.view.ViewPropertyAnimatorListener;
 import android.support.v7.widget.RecyclerView;

diff --git a/...eef/recyclerview/internal/ViewHelper.java → ...library/wasabeef/internal/ViewHelper.java b/...eef/recyclerview/internal/ViewHelper.java → ...library/wasabeef/internal/ViewHelper.java
@@ -1,4 +1,4 @@
-package jp.wasabeef.recyclerview.internal;
+package ca.allanwang.swiperecyclerview.library.wasabeef.internal;
 
 import android.support.v4.view.ViewCompat;
 import android.view.View;

diff --git a/swiperecyclerview/src/main/java/jp/wasabeef/recyclerview/adapters/AnimationAdapter.java b/swiperecyclerview/src/main/java/jp/wasabeef/recyclerview/adapters/AnimationAdapter.java
diff --git a/swiperecyclerview/swiperecyclerview.iml b/swiperecyclerview/swiperecyclerview.iml
@@ -63,20 +63,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />